@@ -154,9 +154,9 @@ discard block |
||
154 | 154 | if (is_array($this->encrypt) && is_php('5.3.7')) |
155 | 155 | { |
156 | 156 | $ssl = array(); |
157 | - empty($this->encrypt['ssl_key']) OR $ssl[PDO::MYSQL_ATTR_SSL_KEY] = $this->encrypt['ssl_key']; |
|
158 | - empty($this->encrypt['ssl_cert']) OR $ssl[PDO::MYSQL_ATTR_SSL_CERT] = $this->encrypt['ssl_cert']; |
|
159 | - empty($this->encrypt['ssl_ca']) OR $ssl[PDO::MYSQL_ATTR_SSL_CA] = $this->encrypt['ssl_ca']; |
|
157 | + empty($this->encrypt['ssl_key']) OR $ssl[PDO::MYSQL_ATTR_SSL_KEY] = $this->encrypt['ssl_key']; |
|
158 | + empty($this->encrypt['ssl_cert']) OR $ssl[PDO::MYSQL_ATTR_SSL_CERT] = $this->encrypt['ssl_cert']; |
|
159 | + empty($this->encrypt['ssl_ca']) OR $ssl[PDO::MYSQL_ATTR_SSL_CA] = $this->encrypt['ssl_ca']; |
|
160 | 160 | empty($this->encrypt['ssl_capath']) OR $ssl[PDO::MYSQL_ATTR_SSL_CAPATH] = $this->encrypt['ssl_capath']; |
161 | 161 | empty($this->encrypt['ssl_cipher']) OR $ssl[PDO::MYSQL_ATTR_SSL_CIPHER] = $this->encrypt['ssl_cipher']; |
162 | 162 | |
@@ -261,16 +261,16 @@ discard block |
||
261 | 261 | $retval = array(); |
262 | 262 | for ($i = 0, $c = count($query); $i < $c; $i++) |
263 | 263 | { |
264 | - $retval[$i] = new stdClass(); |
|
265 | - $retval[$i]->name = $query[$i]->Field; |
|
264 | + $retval[$i] = new stdClass(); |
|
265 | + $retval[$i]->name = $query[$i]->Field; |
|
266 | 266 | |
267 | 267 | sscanf($query[$i]->Type, '%[a-z](%d)', |
268 | 268 | $retval[$i]->type, |
269 | 269 | $retval[$i]->max_length |
270 | 270 | ); |
271 | 271 | |
272 | - $retval[$i]->default = $query[$i]->Default; |
|
273 | - $retval[$i]->primary_key = (int) ($query[$i]->Key === 'PRI'); |
|
272 | + $retval[$i]->default = $query[$i]->Default; |
|
273 | + $retval[$i]->primary_key = (int) ($query[$i]->Key === 'PRI'); |
|
274 | 274 | } |
275 | 275 | |
276 | 276 | return $retval; |
@@ -51,14 +51,14 @@ discard block |
||
51 | 51 | * |
52 | 52 | * @var string |
53 | 53 | */ |
54 | - protected $_create_database = 'CREATE DATABASE %s CHARACTER SET %s COLLATE %s'; |
|
54 | + protected $_create_database = 'CREATE DATABASE %s CHARACTER SET %s COLLATE %s'; |
|
55 | 55 | |
56 | 56 | /** |
57 | 57 | * CREATE TABLE IF statement |
58 | 58 | * |
59 | 59 | * @var string |
60 | 60 | */ |
61 | - protected $_create_table_if = 'CREATE TABLE IF NOT EXISTS'; |
|
61 | + protected $_create_table_if = 'CREATE TABLE IF NOT EXISTS'; |
|
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 | 'TINYINT', |
87 | 87 | 'SMALLINT', |
88 | 88 | 'MEDIUMINT', |
@@ -209,7 +209,7 @@ discard block |
||
209 | 209 | $retval = array(); |
210 | 210 | for ($i = 0, $c = count($query); $i < $c; $i++) |
211 | 211 | { |
212 | - $retval[$i] = new stdClass(); |
|
212 | + $retval[$i] = new stdClass(); |
|
213 | 213 | $retval[$i]->name = $query[$i]->COLUMN_NAME; |
214 | 214 | $retval[$i]->type = $query[$i]->DATA_TYPE; |
215 | 215 | |
@@ -219,14 +219,14 @@ discard block |
||
219 | 219 | { |
220 | 220 | $length = $query[$i]->DATA_LENGTH; |
221 | 221 | } |
222 | - $retval[$i]->max_length = $length; |
|
222 | + $retval[$i]->max_length = $length; |
|
223 | 223 | |
224 | 224 | $default = $query[$i]->DATA_DEFAULT; |
225 | 225 | if ($default === NULL && $query[$i]->NULLABLE === 'N') |
226 | 226 | { |
227 | 227 | $default = ''; |
228 | 228 | } |
229 | - $retval[$i]->default = $query[$i]->COLUMN_DEFAULT; |
|
229 | + $retval[$i]->default = $query[$i]->COLUMN_DEFAULT; |
|
230 | 230 | } |
231 | 231 | |
232 | 232 | return $retval; |
@@ -269,7 +269,7 @@ discard block |
||
269 | 269 | { |
270 | 270 | if ($this->qb_limit) |
271 | 271 | { |
272 | - $this->where('rownum <= ',$this->qb_limit, FALSE); |
|
272 | + $this->where('rownum <= ', $this->qb_limit, FALSE); |
|
273 | 273 | $this->qb_limit = FALSE; |
274 | 274 | } |
275 | 275 | |
@@ -289,7 +289,7 @@ discard block |
||
289 | 289 | protected function _limit($sql) |
290 | 290 | { |
291 | 291 | return 'SELECT * FROM (SELECT inner_query.*, rownum rnum FROM ('.$sql.') inner_query WHERE rownum < '.($this->qb_offset + $this->qb_limit + 1).')' |
292 | - .($this->qb_offset ? ' WHERE rnum >= '.($this->qb_offset + 1): ''); |
|
292 | + .($this->qb_offset ? ' WHERE rnum >= '.($this->qb_offset + 1) : ''); |
|
293 | 293 | } |
294 | 294 | |
295 | 295 | } |
@@ -51,28 +51,28 @@ |
||
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 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 | * UNSIGNED support |
72 | 72 | * |
73 | 73 | * @var bool|array |
74 | 74 | */ |
75 | - protected $_unsigned = FALSE; |
|
75 | + protected $_unsigned = FALSE; |
|
76 | 76 | |
77 | 77 | // -------------------------------------------------------------------- |
78 | 78 |
@@ -260,7 +260,7 @@ |
||
260 | 260 | */ |
261 | 261 | protected function _limit($sql) |
262 | 262 | { |
263 | - return preg_replace('/(^\SELECT (DISTINCT)?)/i','\\1 TOP '.$this->qb_limit.' ', $sql); |
|
263 | + return preg_replace('/(^\SELECT (DISTINCT)?)/i', '\\1 TOP '.$this->qb_limit.' ', $sql); |
|
264 | 264 | } |
265 | 265 | |
266 | 266 | } |
@@ -51,7 +51,7 @@ |
||
51 | 51 | * |
52 | 52 | * @var bool|array |
53 | 53 | */ |
54 | - protected $_unsigned = FALSE; |
|
54 | + protected $_unsigned = FALSE; |
|
55 | 55 | |
56 | 56 | // -------------------------------------------------------------------- |
57 | 57 |
@@ -276,11 +276,11 @@ |
||
276 | 276 | $retval = array(); |
277 | 277 | for ($i = 0, $c = count($query); $i < $c; $i++) |
278 | 278 | { |
279 | - $retval[$i] = new stdClass(); |
|
279 | + $retval[$i] = new stdClass(); |
|
280 | 280 | $retval[$i]->name = $query[$i]->column_name; |
281 | 281 | $retval[$i]->type = $query[$i]->data_type; |
282 | - $retval[$i]->max_length = ($query[$i]->character_maximum_length > 0) ? $query[$i]->character_maximum_length : $query[$i]->numeric_precision; |
|
283 | - $retval[$i]->default = $query[$i]->column_default; |
|
282 | + $retval[$i]->max_length = ($query[$i]->character_maximum_length > 0) ? $query[$i]->character_maximum_length : $query[$i]->numeric_precision; |
|
283 | + $retval[$i]->default = $query[$i]->column_default; |
|
284 | 284 | } |
285 | 285 | |
286 | 286 | return $retval; |
@@ -51,14 +51,14 @@ |
||
51 | 51 | * |
52 | 52 | * @var string |
53 | 53 | */ |
54 | - protected $_drop_table_if = 'DROP TABLE IF EXISTS'; |
|
54 | + protected $_drop_table_if = 'DROP TABLE IF EXISTS'; |
|
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 | 'INT2' => 'INTEGER', |
63 | 63 | 'SMALLINT' => 'INTEGER', |
64 | 64 | 'INT' => 'BIGINT', |
@@ -51,28 +51,28 @@ |
||
51 | 51 | * |
52 | 52 | * @var string |
53 | 53 | */ |
54 | - protected $_create_table_if = 'CREATE TABLE IF NOT EXISTS'; |
|
54 | + protected $_create_table_if = 'CREATE TABLE IF NOT EXISTS'; |
|
55 | 55 | |
56 | 56 | /** |
57 | 57 | * DROP TABLE IF statement |
58 | 58 | * |
59 | 59 | * @var string |
60 | 60 | */ |
61 | - protected $_drop_table_if = 'DROP TABLE IF EXISTS'; |
|
61 | + protected $_drop_table_if = 'DROP TABLE IF EXISTS'; |
|
62 | 62 | |
63 | 63 | /** |
64 | 64 | * UNSIGNED support |
65 | 65 | * |
66 | 66 | * @var bool|array |
67 | 67 | */ |
68 | - protected $_unsigned = FALSE; |
|
68 | + protected $_unsigned = FALSE; |
|
69 | 69 | |
70 | 70 | /** |
71 | 71 | * NULL value representation in CREATE/ALTER TABLE statements |
72 | 72 | * |
73 | 73 | * @var string |
74 | 74 | */ |
75 | - protected $_null = 'NULL'; |
|
75 | + protected $_null = 'NULL'; |
|
76 | 76 | |
77 | 77 | // -------------------------------------------------------------------- |
78 | 78 |