@@ -51,21 +51,21 @@ |
||
51 | 51 | * |
52 | 52 | * @var string |
53 | 53 | */ |
54 | - protected $_create_table_if = "IF NOT EXISTS (SELECT * FROM sysobjects WHERE ID = object_id(N'%s') AND OBJECTPROPERTY(id, N'IsUserTable') = 1)\nCREATE TABLE"; |
|
54 | + protected $_create_table_if = "IF NOT EXISTS (SELECT * FROM sysobjects WHERE ID = object_id(N'%s') AND OBJECTPROPERTY(id, N'IsUserTable') = 1)\nCREATE TABLE"; |
|
55 | 55 | |
56 | 56 | /** |
57 | 57 | * DROP TABLE IF statement |
58 | 58 | * |
59 | 59 | * @var string |
60 | 60 | */ |
61 | - protected $_drop_table_if = "IF EXISTS (SELECT * FROM sysobjects WHERE ID = object_id(N'%s') AND OBJECTPROPERTY(id, N'IsUserTable') = 1)\nDROP TABLE"; |
|
61 | + protected $_drop_table_if = "IF EXISTS (SELECT * FROM sysobjects WHERE ID = object_id(N'%s') AND OBJECTPROPERTY(id, N'IsUserTable') = 1)\nDROP TABLE"; |
|
62 | 62 | |
63 | 63 | /** |
64 | 64 | * UNSIGNED support |
65 | 65 | * |
66 | 66 | * @var array |
67 | 67 | */ |
68 | - protected $_unsigned = array( |
|
68 | + protected $_unsigned = array( |
|
69 | 69 | 'TINYINT' => 'SMALLINT', |
70 | 70 | 'SMALLINT' => 'INT', |
71 | 71 | 'INT' => 'BIGINT', |
@@ -53,7 +53,7 @@ discard block |
||
53 | 53 | * |
54 | 54 | * @var string |
55 | 55 | */ |
56 | - protected $_create_database = 'CREATE DATABASE %s CHARACTER SET %s COLLATE %s'; |
|
56 | + protected $_create_database = 'CREATE DATABASE %s CHARACTER SET %s COLLATE %s'; |
|
57 | 57 | |
58 | 58 | /** |
59 | 59 | * CREATE TABLE keys flag |
@@ -63,14 +63,14 @@ discard block |
||
63 | 63 | * |
64 | 64 | * @var bool |
65 | 65 | */ |
66 | - protected $_create_table_keys = TRUE; |
|
66 | + protected $_create_table_keys = TRUE; |
|
67 | 67 | |
68 | 68 | /** |
69 | 69 | * UNSIGNED support |
70 | 70 | * |
71 | 71 | * @var array |
72 | 72 | */ |
73 | - protected $_unsigned = array( |
|
73 | + protected $_unsigned = array( |
|
74 | 74 | 'TINYINT', |
75 | 75 | 'SMALLINT', |
76 | 76 | 'MEDIUMINT', |
@@ -162,14 +162,12 @@ discard block |
||
162 | 162 | $field[$i] = ($alter_type === 'ADD') |
163 | 163 | ? "\n\tADD ".$field[$i]['_literal'] |
164 | 164 | : "\n\tMODIFY ".$field[$i]['_literal']; |
165 | - } |
|
166 | - else |
|
165 | + } else |
|
167 | 166 | { |
168 | 167 | if ($alter_type === 'ADD') |
169 | 168 | { |
170 | 169 | $field[$i]['_literal'] = "\n\tADD "; |
171 | - } |
|
172 | - else |
|
170 | + } else |
|
173 | 171 | { |
174 | 172 | $field[$i]['_literal'] = empty($field[$i]['new_name']) ? "\n\tMODIFY " : "\n\tCHANGE "; |
175 | 173 | } |
@@ -235,8 +233,7 @@ discard block |
||
235 | 233 | continue; |
236 | 234 | } |
237 | 235 | } |
238 | - } |
|
239 | - elseif ( ! isset($this->fields[$this->keys[$i]])) |
|
236 | + } elseif ( ! isset($this->fields[$this->keys[$i]])) |
|
240 | 237 | { |
241 | 238 | unset($this->keys[$i]); |
242 | 239 | continue; |
@@ -53,21 +53,21 @@ discard block |
||
53 | 53 | * |
54 | 54 | * @var string |
55 | 55 | */ |
56 | - protected $_list_databases = 'SHOW DATABASES'; |
|
56 | + protected $_list_databases = 'SHOW DATABASES'; |
|
57 | 57 | |
58 | 58 | /** |
59 | 59 | * OPTIMIZE TABLE statement |
60 | 60 | * |
61 | 61 | * @var string |
62 | 62 | */ |
63 | - protected $_optimize_table = 'OPTIMIZE TABLE %s'; |
|
63 | + protected $_optimize_table = 'OPTIMIZE TABLE %s'; |
|
64 | 64 | |
65 | 65 | /** |
66 | 66 | * REPAIR TABLE statement |
67 | 67 | * |
68 | 68 | * @var string |
69 | 69 | */ |
70 | - protected $_repair_table = 'REPAIR TABLE %s'; |
|
70 | + protected $_repair_table = 'REPAIR TABLE %s'; |
|
71 | 71 | |
72 | 72 | // -------------------------------------------------------------------- |
73 | 73 | |
@@ -96,7 +96,7 @@ discard block |
||
96 | 96 | $output .= 'SET foreign_key_checks = 0;'.$newline; |
97 | 97 | } |
98 | 98 | |
99 | - foreach ( (array) $tables as $table) |
|
99 | + foreach ((array) $tables as $table) |
|
100 | 100 | { |
101 | 101 | // Is the table in the "ignore" list? |
102 | 102 | if (in_array($table, (array) $ignore, TRUE)) |
@@ -165,7 +165,7 @@ discard block |
||
165 | 165 | } |
166 | 166 | |
167 | 167 | // Trim off the end comma |
168 | - $field_str = preg_replace('/, $/' , '', $field_str); |
|
168 | + $field_str = preg_replace('/, $/', '', $field_str); |
|
169 | 169 | |
170 | 170 | // Build the insert string |
171 | 171 | foreach ($query->result_array() as $row) |
@@ -192,7 +192,7 @@ discard block |
||
192 | 192 | } |
193 | 193 | |
194 | 194 | // Remove the comma at the end of the string |
195 | - $val_str = preg_replace('/, $/' , '', $val_str); |
|
195 | + $val_str = preg_replace('/, $/', '', $val_str); |
|
196 | 196 | |
197 | 197 | // Build the INSERT string |
198 | 198 | $output .= 'INSERT INTO '.$this->db->protect_identifiers($table).' ('.$field_str.') VALUES ('.$val_str.');'.$newline; |
@@ -179,8 +179,7 @@ |
||
179 | 179 | if ($v === NULL) |
180 | 180 | { |
181 | 181 | $val_str .= 'NULL'; |
182 | - } |
|
183 | - else |
|
182 | + } else |
|
184 | 183 | { |
185 | 184 | // Escape the data if it's not an integer |
186 | 185 | $val_str .= ($is_int[$i] === FALSE) ? $this->db->escape($v) : $v; |
@@ -122,7 +122,7 @@ |
||
122 | 122 | $retval = array(); |
123 | 123 | for ($i = 0, $c = $this->num_fields(); $i < $c; $i++) |
124 | 124 | { |
125 | - $retval[$i] = new stdClass(); |
|
125 | + $retval[$i] = new stdClass(); |
|
126 | 126 | $retval[$i]->name = mysql_field_name($this->result_id, $i); |
127 | 127 | $retval[$i]->type = mysql_field_type($this->result_id, $i); |
128 | 128 | $retval[$i]->max_length = mysql_field_len($this->result_id, $i); |
@@ -51,21 +51,21 @@ |
||
51 | 51 | * |
52 | 52 | * @var string |
53 | 53 | */ |
54 | - protected $_create_table_if = "IF NOT EXISTS (SELECT * FROM sysobjects WHERE ID = object_id(N'%s') AND OBJECTPROPERTY(id, N'IsUserTable') = 1)\nCREATE TABLE"; |
|
54 | + protected $_create_table_if = "IF NOT EXISTS (SELECT * FROM sysobjects WHERE ID = object_id(N'%s') AND OBJECTPROPERTY(id, N'IsUserTable') = 1)\nCREATE TABLE"; |
|
55 | 55 | |
56 | 56 | /** |
57 | 57 | * DROP TABLE IF statement |
58 | 58 | * |
59 | 59 | * @var string |
60 | 60 | */ |
61 | - protected $_drop_table_if = "IF EXISTS (SELECT * FROM sysobjects WHERE ID = object_id(N'%s') AND OBJECTPROPERTY(id, N'IsUserTable') = 1)\nDROP TABLE"; |
|
61 | + protected $_drop_table_if = "IF EXISTS (SELECT * FROM sysobjects WHERE ID = object_id(N'%s') AND OBJECTPROPERTY(id, N'IsUserTable') = 1)\nDROP TABLE"; |
|
62 | 62 | |
63 | 63 | /** |
64 | 64 | * UNSIGNED support |
65 | 65 | * |
66 | 66 | * @var array |
67 | 67 | */ |
68 | - protected $_unsigned = array( |
|
68 | + protected $_unsigned = array( |
|
69 | 69 | 'TINYINT' => 'SMALLINT', |
70 | 70 | 'SMALLINT' => 'INT', |
71 | 71 | 'INT' => 'BIGINT', |
@@ -51,21 +51,21 @@ |
||
51 | 51 | * |
52 | 52 | * @var string |
53 | 53 | */ |
54 | - protected $_create_table_if = "IF NOT EXISTS (SELECT * FROM sysobjects WHERE ID = object_id(N'%s') AND OBJECTPROPERTY(id, N'IsUserTable') = 1)\nCREATE TABLE"; |
|
54 | + protected $_create_table_if = "IF NOT EXISTS (SELECT * FROM sysobjects WHERE ID = object_id(N'%s') AND OBJECTPROPERTY(id, N'IsUserTable') = 1)\nCREATE TABLE"; |
|
55 | 55 | |
56 | 56 | /** |
57 | 57 | * DROP TABLE IF statement |
58 | 58 | * |
59 | 59 | * @var string |
60 | 60 | */ |
61 | - protected $_drop_table_if = "IF EXISTS (SELECT * FROM sysobjects WHERE ID = object_id(N'%s') AND OBJECTPROPERTY(id, N'IsUserTable') = 1)\nDROP TABLE"; |
|
61 | + protected $_drop_table_if = "IF EXISTS (SELECT * FROM sysobjects WHERE ID = object_id(N'%s') AND OBJECTPROPERTY(id, N'IsUserTable') = 1)\nDROP TABLE"; |
|
62 | 62 | |
63 | 63 | /** |
64 | 64 | * UNSIGNED support |
65 | 65 | * |
66 | 66 | * @var array |
67 | 67 | */ |
68 | - protected $_unsigned = array( |
|
68 | + protected $_unsigned = array( |
|
69 | 69 | 'TINYINT' => 'SMALLINT', |
70 | 70 | 'SMALLINT' => 'INT', |
71 | 71 | 'INT' => 'BIGINT', |
@@ -274,11 +274,11 @@ |
||
274 | 274 | $retval = array(); |
275 | 275 | for ($i = 0, $c = count($query); $i < $c; $i++) |
276 | 276 | { |
277 | - $retval[$i] = new stdClass(); |
|
277 | + $retval[$i] = new stdClass(); |
|
278 | 278 | $retval[$i]->name = $query[$i]['name']; |
279 | 279 | $retval[$i]->type = $query[$i]['type']; |
280 | 280 | $retval[$i]->max_length = NULL; |
281 | - $retval[$i]->default = $query[$i]['dflt_value']; |
|
281 | + $retval[$i]->default = $query[$i]['dflt_value']; |
|
282 | 282 | $retval[$i]->primary_key = isset($query[$i]['pk']) ? (int) $query[$i]['pk'] : 0; |
283 | 283 | } |
284 | 284 |
@@ -266,8 +266,7 @@ |
||
266 | 266 | if ($reduce_linebreaks === TRUE) |
267 | 267 | { |
268 | 268 | $table['#<p>\n*</p>#'] = ''; |
269 | - } |
|
270 | - else |
|
269 | + } else |
|
271 | 270 | { |
272 | 271 | // If we have empty paragraph tags we add a non-breaking space |
273 | 272 | // otherwise most browsers won't treat them as true paragraphs |
@@ -100,13 +100,13 @@ |
||
100 | 100 | $retval = array(); |
101 | 101 | for ($i = 0, $c = $this->num_fields(); $i < $c; $i++) |
102 | 102 | { |
103 | - $retval[$i] = new stdClass(); |
|
103 | + $retval[$i] = new stdClass(); |
|
104 | 104 | $retval[$i]->name = $this->result_id->columnName($i); |
105 | 105 | |
106 | 106 | $type = $this->result_id->columnType($i); |
107 | 107 | $retval[$i]->type = isset($data_types[$type]) ? $data_types[$type] : $type; |
108 | 108 | |
109 | - $retval[$i]->max_length = NULL; |
|
109 | + $retval[$i]->max_length = NULL; |
|
110 | 110 | } |
111 | 111 | |
112 | 112 | return $retval; |