@@ -53,21 +53,21 @@ |
||
53 | 53 | * |
54 | 54 | * @var string |
55 | 55 | */ |
56 | - protected $_create_table_if = FALSE; |
|
56 | + protected $_create_table_if = FALSE; |
|
57 | 57 | |
58 | 58 | /** |
59 | 59 | * DROP TABLE IF statement |
60 | 60 | * |
61 | 61 | * @var string |
62 | 62 | */ |
63 | - protected $_drop_table_if = FALSE; |
|
63 | + protected $_drop_table_if = FALSE; |
|
64 | 64 | |
65 | 65 | /** |
66 | 66 | * UNSIGNED support |
67 | 67 | * |
68 | 68 | * @var bool|array |
69 | 69 | */ |
70 | - protected $_unsigned = FALSE; |
|
70 | + protected $_unsigned = FALSE; |
|
71 | 71 | |
72 | 72 | // -------------------------------------------------------------------- |
73 | 73 |
@@ -130,12 +130,12 @@ discard block |
||
130 | 130 | $retval = array(); |
131 | 131 | for ($i = 0, $odbc_index = 1, $c = $this->num_fields(); $i < $c; $i++, $odbc_index++) |
132 | 132 | { |
133 | - $retval[$i] = new stdClass(); |
|
133 | + $retval[$i] = new stdClass(); |
|
134 | 134 | $retval[$i]->name = odbc_field_name($this->result_id, $odbc_index); |
135 | 135 | $retval[$i]->type = odbc_field_type($this->result_id, $odbc_index); |
136 | 136 | $retval[$i]->max_length = odbc_field_len($this->result_id, $odbc_index); |
137 | 137 | $retval[$i]->primary_key = 0; |
138 | - $retval[$i]->default = ''; |
|
138 | + $retval[$i]->default = ''; |
|
139 | 139 | } |
140 | 140 | |
141 | 141 | return $retval; |
@@ -226,7 +226,7 @@ discard block |
||
226 | 226 | $rs_assoc = array(); |
227 | 227 | foreach ($rs as $k => $v) |
228 | 228 | { |
229 | - $field_name = odbc_field_name($result, $k+1); |
|
229 | + $field_name = odbc_field_name($result, $k + 1); |
|
230 | 230 | $rs_assoc[$field_name] = $v; |
231 | 231 | } |
232 | 232 | |
@@ -259,7 +259,7 @@ discard block |
||
259 | 259 | $rs_object = new stdClass(); |
260 | 260 | foreach ($rs as $k => $v) |
261 | 261 | { |
262 | - $field_name = odbc_field_name($result, $k+1); |
|
262 | + $field_name = odbc_field_name($result, $k + 1); |
|
263 | 263 | $rs_object->$field_name = $v; |
264 | 264 | } |
265 | 265 |
@@ -53,13 +53,13 @@ |
||
53 | 53 | * |
54 | 54 | * @var string |
55 | 55 | */ |
56 | - protected $_create_table_if = FALSE; |
|
56 | + protected $_create_table_if = FALSE; |
|
57 | 57 | |
58 | 58 | /** |
59 | 59 | * DROP TABLE IF statement |
60 | 60 | * |
61 | 61 | * @var string |
62 | 62 | */ |
63 | - protected $_drop_table_if = FALSE; |
|
63 | + protected $_drop_table_if = FALSE; |
|
64 | 64 | |
65 | 65 | } |
@@ -131,7 +131,7 @@ |
||
131 | 131 | { |
132 | 132 | $field = $this->result_id->getColumnMeta($i); |
133 | 133 | |
134 | - $retval[$i] = new stdClass(); |
|
134 | + $retval[$i] = new stdClass(); |
|
135 | 135 | $retval[$i]->name = $field['name']; |
136 | 136 | $retval[$i]->type = $field['native_type']; |
137 | 137 | $retval[$i]->max_length = ($field['len'] > 0) ? $field['len'] : NULL; |
@@ -51,42 +51,42 @@ discard block |
||
51 | 51 | * |
52 | 52 | * @var string |
53 | 53 | */ |
54 | - protected $_create_database = 'CREATE SCHEMA %s'; |
|
54 | + protected $_create_database = 'CREATE SCHEMA %s'; |
|
55 | 55 | |
56 | 56 | /** |
57 | 57 | * DROP DATABASE statement |
58 | 58 | * |
59 | 59 | * @var string |
60 | 60 | */ |
61 | - protected $_drop_database = 'DROP SCHEMA %s'; |
|
61 | + protected $_drop_database = 'DROP SCHEMA %s'; |
|
62 | 62 | |
63 | 63 | /** |
64 | 64 | * CREATE TABLE IF statement |
65 | 65 | * |
66 | 66 | * @var string |
67 | 67 | */ |
68 | - protected $_create_table_if = 'CREATE TABLE IF NOT EXISTS'; |
|
68 | + protected $_create_table_if = 'CREATE TABLE IF NOT EXISTS'; |
|
69 | 69 | |
70 | 70 | /** |
71 | 71 | * RENAME TABLE statement |
72 | 72 | * |
73 | 73 | * @var string |
74 | 74 | */ |
75 | - protected $_rename_table = FALSE; |
|
75 | + protected $_rename_table = FALSE; |
|
76 | 76 | |
77 | 77 | /** |
78 | 78 | * DROP TABLE IF statement |
79 | 79 | * |
80 | 80 | * @var string |
81 | 81 | */ |
82 | - protected $_drop_table_if = 'DROP TABLE IF EXISTS'; |
|
82 | + protected $_drop_table_if = 'DROP TABLE IF EXISTS'; |
|
83 | 83 | |
84 | 84 | /** |
85 | 85 | * UNSIGNED support |
86 | 86 | * |
87 | 87 | * @var array |
88 | 88 | */ |
89 | - protected $_unsigned = array( |
|
89 | + protected $_unsigned = array( |
|
90 | 90 | 'INT16' => 'INT', |
91 | 91 | 'SMALLINT' => 'INT', |
92 | 92 | 'INT' => 'INT64', |
@@ -98,7 +98,7 @@ discard block |
||
98 | 98 | * |
99 | 99 | * @var string |
100 | 100 | */ |
101 | - protected $_default = FALSE; |
|
101 | + protected $_default = FALSE; |
|
102 | 102 | |
103 | 103 | // -------------------------------------------------------------------- |
104 | 104 |
@@ -153,16 +153,16 @@ |
||
153 | 153 | $retval = array(); |
154 | 154 | for ($i = 0, $c = count($query); $i < $c; $i++) |
155 | 155 | { |
156 | - $retval[$i] = new stdClass(); |
|
157 | - $retval[$i]->name = $query[$i]->Field; |
|
156 | + $retval[$i] = new stdClass(); |
|
157 | + $retval[$i]->name = $query[$i]->Field; |
|
158 | 158 | |
159 | 159 | sscanf($query[$i]->Type, '%[a-z](%d)', |
160 | 160 | $retval[$i]->type, |
161 | 161 | $retval[$i]->max_length |
162 | 162 | ); |
163 | 163 | |
164 | - $retval[$i]->default = $query[$i]->Default; |
|
165 | - $retval[$i]->primary_key = (int) ($query[$i]->Key === 'PRI'); |
|
164 | + $retval[$i]->default = $query[$i]->Default; |
|
165 | + $retval[$i]->primary_key = (int) ($query[$i]->Key === 'PRI'); |
|
166 | 166 | } |
167 | 167 | |
168 | 168 | return $retval; |
@@ -51,14 +51,14 @@ discard block |
||
51 | 51 | * |
52 | 52 | * @var string |
53 | 53 | */ |
54 | - protected $_create_database = FALSE; |
|
54 | + protected $_create_database = FALSE; |
|
55 | 55 | |
56 | 56 | /** |
57 | 57 | * DROP DATABASE statement |
58 | 58 | * |
59 | 59 | * @var string |
60 | 60 | */ |
61 | - protected $_drop_database = FALSE; |
|
61 | + protected $_drop_database = FALSE; |
|
62 | 62 | |
63 | 63 | /** |
64 | 64 | * CREATE TABLE keys flag |
@@ -68,21 +68,21 @@ discard block |
||
68 | 68 | * |
69 | 69 | * @var bool |
70 | 70 | */ |
71 | - protected $_create_table_keys = TRUE; |
|
71 | + protected $_create_table_keys = TRUE; |
|
72 | 72 | |
73 | 73 | /** |
74 | 74 | * DROP TABLE IF statement |
75 | 75 | * |
76 | 76 | * @var string |
77 | 77 | */ |
78 | - protected $_drop_table_if = 'DROP TABLE IF EXISTS'; |
|
78 | + protected $_drop_table_if = 'DROP TABLE IF EXISTS'; |
|
79 | 79 | |
80 | 80 | /** |
81 | 81 | * UNSIGNED support |
82 | 82 | * |
83 | 83 | * @var array |
84 | 84 | */ |
85 | - protected $_unsigned = array( |
|
85 | + protected $_unsigned = array( |
|
86 | 86 | 'SHORT' => 'INTEGER', |
87 | 87 | 'SMALLINT' => 'INTEGER', |
88 | 88 | 'INT' => 'BIGINT', |
@@ -51,14 +51,14 @@ discard block |
||
51 | 51 | * |
52 | 52 | * @var string |
53 | 53 | */ |
54 | - protected $_rename_table = FALSE; |
|
54 | + protected $_rename_table = FALSE; |
|
55 | 55 | |
56 | 56 | /** |
57 | 57 | * UNSIGNED support |
58 | 58 | * |
59 | 59 | * @var array |
60 | 60 | */ |
61 | - protected $_unsigned = array( |
|
61 | + protected $_unsigned = array( |
|
62 | 62 | 'SMALLINT' => 'INTEGER', |
63 | 63 | 'INTEGER' => 'INT64', |
64 | 64 | 'FLOAT' => 'DOUBLE PRECISION' |
@@ -69,7 +69,7 @@ discard block |
||
69 | 69 | * |
70 | 70 | * @var string |
71 | 71 | */ |
72 | - protected $_null = 'NULL'; |
|
72 | + protected $_null = 'NULL'; |
|
73 | 73 | |
74 | 74 | // -------------------------------------------------------------------- |
75 | 75 |
@@ -51,14 +51,14 @@ discard block |
||
51 | 51 | * |
52 | 52 | * @var string |
53 | 53 | */ |
54 | - protected $_rename_table = 'RENAME TABLE %s TO %s'; |
|
54 | + protected $_rename_table = 'RENAME TABLE %s TO %s'; |
|
55 | 55 | |
56 | 56 | /** |
57 | 57 | * UNSIGNED support |
58 | 58 | * |
59 | 59 | * @var array |
60 | 60 | */ |
61 | - protected $_unsigned = array( |
|
61 | + protected $_unsigned = array( |
|
62 | 62 | 'SMALLINT' => 'INTEGER', |
63 | 63 | 'INT' => 'BIGINT', |
64 | 64 | 'INTEGER' => 'BIGINT' |
@@ -69,7 +69,7 @@ discard block |
||
69 | 69 | * |
70 | 70 | * @var string |
71 | 71 | */ |
72 | - protected $_default = FALSE; |
|
72 | + protected $_default = FALSE; |
|
73 | 73 | |
74 | 74 | // -------------------------------------------------------------------- |
75 | 75 |