@@ -53,7 +53,7 @@ |
||
53 | 53 | * |
54 | 54 | * @var array |
55 | 55 | */ |
56 | - protected $_unsigned = array( |
|
56 | + protected $_unsigned = array( |
|
57 | 57 | 'INT2' => 'INTEGER', |
58 | 58 | 'SMALLINT' => 'INTEGER', |
59 | 59 | 'INT' => 'BIGINT', |
@@ -108,10 +108,10 @@ |
||
108 | 108 | $retval = array(); |
109 | 109 | for ($i = 0, $c = $this->num_fields(); $i < $c; $i++) |
110 | 110 | { |
111 | - $retval[$i] = new stdClass(); |
|
111 | + $retval[$i] = new stdClass(); |
|
112 | 112 | $retval[$i]->name = pg_field_name($this->result_id, $i); |
113 | 113 | $retval[$i]->type = pg_field_type($this->result_id, $i); |
114 | - $retval[$i]->max_length = pg_field_size($this->result_id, $i); |
|
114 | + $retval[$i]->max_length = pg_field_size($this->result_id, $i); |
|
115 | 115 | } |
116 | 116 | |
117 | 117 | return $retval; |
@@ -53,14 +53,14 @@ |
||
53 | 53 | * |
54 | 54 | * @var string |
55 | 55 | */ |
56 | - protected $_list_databases = 'SELECT datname FROM pg_database'; |
|
56 | + protected $_list_databases = 'SELECT datname FROM pg_database'; |
|
57 | 57 | |
58 | 58 | /** |
59 | 59 | * OPTIMIZE TABLE statement |
60 | 60 | * |
61 | 61 | * @var string |
62 | 62 | */ |
63 | - protected $_optimize_table = 'REINDEX TABLE %s'; |
|
63 | + protected $_optimize_table = 'REINDEX TABLE %s'; |
|
64 | 64 | |
65 | 65 | // -------------------------------------------------------------------- |
66 | 66 |
@@ -51,21 +51,21 @@ |
||
51 | 51 | * |
52 | 52 | * @var string |
53 | 53 | */ |
54 | - protected $_create_table_if = FALSE; |
|
54 | + protected $_create_table_if = FALSE; |
|
55 | 55 | |
56 | 56 | /** |
57 | 57 | * UNSIGNED support |
58 | 58 | * |
59 | 59 | * @var bool|array |
60 | 60 | */ |
61 | - protected $_unsigned = FALSE; |
|
61 | + protected $_unsigned = FALSE; |
|
62 | 62 | |
63 | 63 | /** |
64 | 64 | * NULL value representation in CREATE/ALTER TABLE statements |
65 | 65 | * |
66 | 66 | * @var string |
67 | 67 | */ |
68 | - protected $_null = 'NULL'; |
|
68 | + protected $_null = 'NULL'; |
|
69 | 69 | |
70 | 70 | // -------------------------------------------------------------------- |
71 | 71 |
@@ -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 |
@@ -51,14 +51,14 @@ |
||
51 | 51 | * |
52 | 52 | * @var bool|array |
53 | 53 | */ |
54 | - protected $_unsigned = FALSE; |
|
54 | + protected $_unsigned = FALSE; |
|
55 | 55 | |
56 | 56 | /** |
57 | 57 | * NULL value representation in CREATE/ALTER TABLE statements |
58 | 58 | * |
59 | 59 | * @var string |
60 | 60 | */ |
61 | - protected $_null = 'NULL'; |
|
61 | + protected $_null = 'NULL'; |
|
62 | 62 | |
63 | 63 | // -------------------------------------------------------------------- |
64 | 64 |
@@ -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; |
@@ -341,11 +341,11 @@ discard block |
||
341 | 341 | $retval = array(); |
342 | 342 | for ($i = 0, $c = count($query); $i < $c; $i++) |
343 | 343 | { |
344 | - $retval[$i] = new stdClass(); |
|
344 | + $retval[$i] = new stdClass(); |
|
345 | 345 | $retval[$i]->name = $query[$i]->COLUMN_NAME; |
346 | 346 | $retval[$i]->type = $query[$i]->DATA_TYPE; |
347 | - $retval[$i]->max_length = ($query[$i]->CHARACTER_MAXIMUM_LENGTH > 0) ? $query[$i]->CHARACTER_MAXIMUM_LENGTH : $query[$i]->NUMERIC_PRECISION; |
|
348 | - $retval[$i]->default = $query[$i]->COLUMN_DEFAULT; |
|
347 | + $retval[$i]->max_length = ($query[$i]->CHARACTER_MAXIMUM_LENGTH > 0) ? $query[$i]->CHARACTER_MAXIMUM_LENGTH : $query[$i]->NUMERIC_PRECISION; |
|
348 | + $retval[$i]->default = $query[$i]->COLUMN_DEFAULT; |
|
349 | 349 | } |
350 | 350 | |
351 | 351 | return $retval; |
@@ -501,7 +501,7 @@ discard block |
||
501 | 501 | ."\nWHERE ".$this->escape_identifiers('CI_rownum').' BETWEEN '.($this->qb_offset + 1).' AND '.$limit; |
502 | 502 | } |
503 | 503 | |
504 | - return preg_replace('/(^\SELECT (DISTINCT)?)/i','\\1 TOP '.$limit.' ', $sql); |
|
504 | + return preg_replace('/(^\SELECT (DISTINCT)?)/i', '\\1 TOP '.$limit.' ', $sql); |
|
505 | 505 | } |
506 | 506 | |
507 | 507 | // -------------------------------------------------------------------- |
@@ -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', |