@@ -298,8 +298,8 @@ |
||
298 | 298 | public function getSequence ( $table , $column ) |
299 | 299 | { |
300 | 300 | $return = $this->getPDO () |
301 | - ->query ( "select * from information_schema.columns where extra like '%auto_increment%' and TABLE_SCHEMA='{$this->database}' AND TABLE_NAME='{$table}' AND COLUMN_NAME='{$column}';" ) |
|
302 | - ->fetch ( \PDO::FETCH_ASSOC ); |
|
301 | + ->query ( "select * from information_schema.columns where extra like '%auto_increment%' and TABLE_SCHEMA='{$this->database}' AND TABLE_NAME='{$table}' AND COLUMN_NAME='{$column}';" ) |
|
302 | + ->fetch ( \PDO::FETCH_ASSOC ); |
|
303 | 303 | |
304 | 304 | if ( ! $return ) |
305 | 305 | { |
@@ -247,7 +247,7 @@ |
||
247 | 247 | { |
248 | 248 | $pdo = $this->getPDO (); |
249 | 249 | $return1 = $pdo->query ( "SELECT pg_get_serial_sequence('$table', '$column');" ) |
250 | - ->fetchColumn (); |
|
250 | + ->fetchColumn (); |
|
251 | 251 | |
252 | 252 | if ( $return1 ) |
253 | 253 | { |
@@ -19,6 +19,6 @@ |
||
19 | 19 | |
20 | 20 | public function parseRelation ( \Classes\MakerFile $makerFile, \Classes\Db\DbTable $dbTable ) |
21 | 21 | { |
22 | - return array(); |
|
22 | + return array(); |
|
23 | 23 | } |
24 | 24 | } |
@@ -117,7 +117,7 @@ |
||
117 | 117 | */ |
118 | 118 | public function isOverwrite () |
119 | 119 | { |
120 | - return $this->overwrite; |
|
120 | + return $this->overwrite; |
|
121 | 121 | } |
122 | 122 | |
123 | 123 | } |
@@ -19,6 +19,6 @@ |
||
19 | 19 | |
20 | 20 | public function parseRelation ( \Classes\MakerFile $makerFile, \Classes\Db\DbTable $dbTable ) |
21 | 21 | { |
22 | - return array(); |
|
22 | + return array(); |
|
23 | 23 | } |
24 | 24 | } |
@@ -107,32 +107,32 @@ discard block |
||
107 | 107 | if ( $table->hasColumn ( $constrant[ "column_name" ] ) ) |
108 | 108 | { |
109 | 109 | $objConstrant = Constrant::getInstance () |
110 | - ->populate ( |
|
111 | - array ( |
|
112 | - 'constrant' => $constrant[ 'constraint_name' ] , |
|
113 | - 'schema' => $constrant[ 'foreign_schema' ] , |
|
114 | - 'table' => $constrant[ 'foreign_table' ] , |
|
115 | - 'column' => $constrant[ 'foreign_column' ], |
|
116 | - 'database' => $this->database |
|
117 | - ) |
|
118 | - ); |
|
110 | + ->populate ( |
|
111 | + array ( |
|
112 | + 'constrant' => $constrant[ 'constraint_name' ] , |
|
113 | + 'schema' => $constrant[ 'foreign_schema' ] , |
|
114 | + 'table' => $constrant[ 'foreign_table' ] , |
|
115 | + 'column' => $constrant[ 'foreign_column' ], |
|
116 | + 'database' => $this->database |
|
117 | + ) |
|
118 | + ); |
|
119 | 119 | |
120 | 120 | switch ( $constrant[ 'constraint_type' ] ) |
121 | 121 | { |
122 | 122 | case "FOREIGN KEY": |
123 | 123 | $table->getColumn ( $constrant[ "column_name" ] ) |
124 | - ->addRefFk ( $objConstrant ); |
|
124 | + ->addRefFk ( $objConstrant ); |
|
125 | 125 | break; |
126 | 126 | case"PRIMARY KEY": |
127 | 127 | $table->getColumn ( $constrant[ "column_name" ] ) |
128 | - ->setPrimaryKey ( $objConstrant ) |
|
129 | - ->setSequence ( |
|
130 | - $this->getSequence ( |
|
131 | - $table_name , |
|
132 | - $constrant[ "column_name" ], |
|
133 | - $schema |
|
134 | - ) |
|
135 | - ); |
|
128 | + ->setPrimaryKey ( $objConstrant ) |
|
129 | + ->setSequence ( |
|
130 | + $this->getSequence ( |
|
131 | + $table_name , |
|
132 | + $constrant[ "column_name" ], |
|
133 | + $schema |
|
134 | + ) |
|
135 | + ); |
|
136 | 136 | break; |
137 | 137 | } |
138 | 138 | } |
@@ -152,13 +152,13 @@ discard block |
||
152 | 152 | if ( $table->hasColumn ( $constrant[ "foreign_column" ] ) ) |
153 | 153 | { |
154 | 154 | $table->getColumn ( $constrant[ "foreign_column" ] ) |
155 | - ->createDependece ( |
|
156 | - $constrant[ 'constraint_name' ] , |
|
157 | - $constrant[ 'table_name' ] , |
|
158 | - $constrant[ 'column_name' ] , |
|
159 | - $this->database, |
|
160 | - $constrant[ 'table_schema' ] |
|
161 | - ); |
|
155 | + ->createDependece ( |
|
156 | + $constrant[ 'constraint_name' ] , |
|
157 | + $constrant[ 'table_name' ] , |
|
158 | + $constrant[ 'column_name' ] , |
|
159 | + $this->database, |
|
160 | + $constrant[ 'table_schema' ] |
|
161 | + ); |
|
162 | 162 | } |
163 | 163 | } |
164 | 164 | } |
@@ -193,10 +193,10 @@ discard block |
||
193 | 193 | ); |
194 | 194 | |
195 | 195 | $this->getTable ( $key , $schema ) |
196 | - ->addColumn ( $column ) |
|
197 | - ->setNamespace ( |
|
198 | - $this->config->createClassNamespace ( $this->getTable ( $key , $schema ) ) |
|
199 | - ); |
|
196 | + ->addColumn ( $column ) |
|
197 | + ->setNamespace ( |
|
198 | + $this->config->createClassNamespace ( $this->getTable ( $key , $schema ) ) |
|
199 | + ); |
|
200 | 200 | } |
201 | 201 | } |
202 | 202 | |
@@ -256,13 +256,13 @@ discard block |
||
256 | 256 | public function createTable ( $nameTable , $schema = 0 ) |
257 | 257 | { |
258 | 258 | $this->objDbTables[ $schema ][ trim ( $nameTable ) ] = DbTable::getInstance () |
259 | - ->populate ( |
|
260 | - array ( |
|
261 | - 'table' => $nameTable , |
|
262 | - 'schema' => $schema , |
|
263 | - 'database' => $this->database |
|
264 | - ) |
|
265 | - ); |
|
259 | + ->populate ( |
|
260 | + array ( |
|
261 | + 'table' => $nameTable , |
|
262 | + 'schema' => $schema , |
|
263 | + 'database' => $this->database |
|
264 | + ) |
|
265 | + ); |
|
266 | 266 | |
267 | 267 | return $this; |
268 | 268 | } |
@@ -178,15 +178,15 @@ |
||
178 | 178 | public function createDependece ( $constraint_name , $table_name , $column_name ,$database, $schema = null ) |
179 | 179 | { |
180 | 180 | $objConstrantDependence = Constrant::getInstance () |
181 | - ->populate ( |
|
182 | - array ( |
|
183 | - 'constrant' => $constraint_name , |
|
184 | - 'schema' => $schema , |
|
185 | - 'table' => $table_name , |
|
186 | - 'column' => $column_name, |
|
187 | - 'database' => $database |
|
188 | - ) |
|
189 | - ); |
|
181 | + ->populate ( |
|
182 | + array ( |
|
183 | + 'constrant' => $constraint_name , |
|
184 | + 'schema' => $schema , |
|
185 | + 'table' => $table_name , |
|
186 | + 'column' => $column_name, |
|
187 | + 'database' => $database |
|
188 | + ) |
|
189 | + ); |
|
190 | 190 | |
191 | 191 | $this->addDependece ( $objConstrantDependence ); |
192 | 192 |
@@ -65,7 +65,7 @@ |
||
65 | 65 | private $adapterDriver; |
66 | 66 | |
67 | 67 | private $frameworkList = array ( |
68 | - 'none', 'zf1', 'phalcon' |
|
68 | + 'none', 'zf1', 'phalcon' |
|
69 | 69 | ); |
70 | 70 | |
71 | 71 | public function __construct ( $argv, $basePath ) |