update tests

mevdschee · mevdschee · commit c6cdcfb369c9 · 2022-04-26T13:33:28.000+02:00
diff --git a/api.include.php b/api.include.php
@@ -4181,8 +4181,8 @@ public function updateTable(string $tableName, /* object */ $changes): bool
         {
             $table = $this->reflection->getTable($tableName);
             $newTable = ReflectedTable::fromJson((object) array_merge((array) $table->jsonSerialize(), (array) $changes));
-            if ($table->getName() != $newTable->getName()) {
-                if (!$this->db->definition()->renameTable($table->getName(), $newTable->getName())) {
+            if ($table->getRealName() != $newTable->getRealName()) {
+                if (!$this->db->definition()->renameTable($table->getRealName(), $newTable->getRealName())) {
                     return false;
                 }
             }
diff --git a/api.php b/api.php
@@ -4181,8 +4181,8 @@ public function updateTable(string $tableName, /* object */ $changes): bool
         {
             $table = $this->reflection->getTable($tableName);
             $newTable = ReflectedTable::fromJson((object) array_merge((array) $table->jsonSerialize(), (array) $changes));
-            if ($table->getName() != $newTable->getName()) {
-                if (!$this->db->definition()->renameTable($table->getName(), $newTable->getName())) {
+            if ($table->getRealName() != $newTable->getRealName()) {
+                if (!$this->db->definition()->renameTable($table->getRealName(), $newTable->getRealName())) {
                     return false;
                 }
             }
diff --git a/src/Tqdev/PhpCrudApi/Column/DefinitionService.php b/src/Tqdev/PhpCrudApi/Column/DefinitionService.php
@@ -17,30 +17,26 @@ public function __construct(GenericDB $db, ReflectionService $reflection)
         $this->reflection = $reflection;
     }
 
-    public function updateTable(string $tableName, /* object */ $changes): bool
+    public function updateTable(ReflectedTable $table, /* object */ $changes): bool
     {
-        $table = $this->reflection->getTable($tableName);
         $newTable = ReflectedTable::fromJson((object) array_merge((array) $table->jsonSerialize(), (array) $changes));
-        if ($table->getName() != $newTable->getName()) {
-            if (!$this->db->definition()->renameTable($table->getName(), $newTable->getName())) {
+        if ($table->getRealName() != $newTable->getRealName()) {
+            if (!$this->db->definition()->renameTable($table->getRealName(), $newTable->getRealName())) {
                 return false;
             }
         }
         return true;
     }
 
-    public function updateColumn(string $tableName, string $columnName, /* object */ $changes): bool
+    public function updateColumn(ReflectedTable $table, ReflectedColumn $column, /* object */ $changes): bool
     {
-        $table = $this->reflection->getTable($tableName);
-        $column = $table->getColumn($columnName);
-
         // remove constraints on other column
         $newColumn = ReflectedColumn::fromJson((object) array_merge((array) $column->jsonSerialize(), (array) $changes));
         if ($newColumn->getPk() != $column->getPk() && $table->hasPk()) {
             $oldColumn = $table->getPk();
-            if ($oldColumn->getName() != $columnName) {
+            if ($oldColumn->getRealName() != $column->getRealName()) {
                 $oldColumn->setPk(false);
-                if (!$this->db->definition()->removeColumnPrimaryKey($table->getName(), $oldColumn->getName(), $oldColumn)) {
+                if (!$this->db->definition()->removeColumnPrimaryKey($table->getRealName(), $oldColumn->getRealName(), $oldColumn)) {
                     return false;
                 }
             }
@@ -49,12 +45,12 @@ public function updateColumn(string $tableName, string $columnName, /* object */
         // remove constraints
         $newColumn = ReflectedColumn::fromJson((object) array_merge((array) $column->jsonSerialize(), ['pk' => false, 'fk' => false]));
         if ($newColumn->getPk() != $column->getPk() && !$newColumn->getPk()) {
-            if (!$this->db->definition()->removeColumnPrimaryKey($table->getName(), $column->getName(), $newColumn)) {
+            if (!$this->db->definition()->removeColumnPrimaryKey($table->getRealName(), $column->getRealName(), $newColumn)) {
                 return false;
             }
         }
         if ($newColumn->getFk() != $column->getFk() && !$newColumn->getFk()) {
-            if (!$this->db->definition()->removeColumnForeignKey($table->getName(), $column->getName(), $newColumn)) {
+            if (!$this->db->definition()->removeColumnForeignKey($table->getRealName(), $column->getRealName(), $newColumn)) {
                 return false;
             }
         }
@@ -63,8 +59,8 @@ public function updateColumn(string $tableName, string $columnName, /* object */
         $newColumn = ReflectedColumn::fromJson((object) array_merge((array) $column->jsonSerialize(), (array) $changes));
         $newColumn->setPk(false);
         $newColumn->setFk('');
-        if ($newColumn->getName() != $column->getName()) {
-            if (!$this->db->definition()->renameColumn($table->getName(), $column->getName(), $newColumn)) {
+        if ($newColumn->getRealName() != $column->getRealName()) {
+            if (!$this->db->definition()->renameColumn($table->getRealName(), $column->getRealName(), $newColumn)) {
                 return false;
             }
         }
@@ -74,25 +70,25 @@ public function updateColumn(string $tableName, string $columnName, /* object */
             $newColumn->getPrecision() != $column->getPrecision() ||
             $newColumn->getScale() != $column->getScale()
         ) {
-            if (!$this->db->definition()->retypeColumn($table->getName(), $newColumn->getName(), $newColumn)) {
+            if (!$this->db->definition()->retypeColumn($table->getRealName(), $newColumn->getRealName(), $newColumn)) {
                 return false;
             }
         }
         if ($newColumn->getNullable() != $column->getNullable()) {
-            if (!$this->db->definition()->setColumnNullable($table->getName(), $newColumn->getName(), $newColumn)) {
+            if (!$this->db->definition()->setColumnNullable($table->getRealName(), $newColumn->getRealName(), $newColumn)) {
                 return false;
             }
         }
 
         // add constraints
         $newColumn = ReflectedColumn::fromJson((object) array_merge((array) $column->jsonSerialize(), (array) $changes));
         if ($newColumn->getFk()) {
-            if (!$this->db->definition()->addColumnForeignKey($table->getName(), $newColumn->getName(), $newColumn)) {
+            if (!$this->db->definition()->addColumnForeignKey($table->getRealName(), $newColumn->getRealName(), $newColumn)) {
                 return false;
             }
         }
         if ($newColumn->getPk()) {
-            if (!$this->db->definition()->addColumnPrimaryKey($table->getName(), $newColumn->getName(), $newColumn)) {
+            if (!$this->db->definition()->addColumnPrimaryKey($table->getRealName(), $newColumn->getRealName(), $newColumn)) {
                 return false;
             }
         }
@@ -108,50 +104,48 @@ public function addTable(/* object */$definition)
         return true;
     }
 
-    public function addColumn(string $tableName, /* object */ $definition)
+    public function addColumn(ReflectedTable $table, /* object */ $definition)
     {
         $newColumn = ReflectedColumn::fromJson($definition);
-        if (!$this->db->definition()->addColumn($tableName, $newColumn)) {
+        if (!$this->db->definition()->addColumn($table->getRealName(), $newColumn)) {
             return false;
         }
         if ($newColumn->getFk()) {
-            if (!$this->db->definition()->addColumnForeignKey($tableName, $newColumn->getName(), $newColumn)) {
+            if (!$this->db->definition()->addColumnForeignKey($table->getRealName(), $newColumn->getRealName(), $newColumn)) {
                 return false;
             }
         }
         if ($newColumn->getPk()) {
-            if (!$this->db->definition()->addColumnPrimaryKey($tableName, $newColumn->getName(), $newColumn)) {
+            if (!$this->db->definition()->addColumnPrimaryKey($table->getRealName(), $newColumn->getRealName(), $newColumn)) {
                 return false;
             }
         }
         return true;
     }
 
-    public function removeTable(string $tableName)
+    public function removeTable(ReflectedTable $table)
     {
-        if (!$this->db->definition()->removeTable($tableName)) {
+        if (!$this->db->definition()->removeTable($table->getRealName())) {
             return false;
         }
         return true;
     }
 
-    public function removeColumn(string $tableName, string $columnName)
+    public function removeColumn(ReflectedTable $table, ReflectedColumn $column)
     {
-        $table = $this->reflection->getTable($tableName);
-        $newColumn = $table->getColumn($columnName);
-        if ($newColumn->getPk()) {
-            $newColumn->setPk(false);
-            if (!$this->db->definition()->removeColumnPrimaryKey($table->getName(), $newColumn->getName(), $newColumn)) {
+        if ($column->getPk()) {
+            $column->setPk(false);
+            if (!$this->db->definition()->removeColumnPrimaryKey($table->getRealName(), $column->getRealName(), $column)) {
                 return false;
             }
         }
-        if ($newColumn->getFk()) {
-            $newColumn->setFk("");
-            if (!$this->db->definition()->removeColumnForeignKey($tableName, $columnName, $newColumn)) {
+        if ($column->getFk()) {
+            $column->setFk("");
+            if (!$this->db->definition()->removeColumnForeignKey($table->getRealName(), $column->getRealName(), $column)) {
                 return false;
             }
         }
-        if (!$this->db->definition()->removeColumn($tableName, $columnName)) {
+        if (!$this->db->definition()->removeColumn($table->getRealName(), $column->getRealName())) {
             return false;
         }
         return true;
diff --git a/src/Tqdev/PhpCrudApi/Controller/ColumnController.php b/src/Tqdev/PhpCrudApi/Controller/ColumnController.php
@@ -73,7 +73,8 @@ public function updateTable(ServerRequestInterface $request): ResponseInterface
         if (!$this->reflection->hasTable($tableName)) {
             return $this->responder->error(ErrorCode::TABLE_NOT_FOUND, $tableName);
         }
-        $success = $this->definition->updateTable($tableName, $request->getParsedBody());
+        $table = $this->reflection->getTable($tableName);
+        $success = $this->definition->updateTable($table, $request->getParsedBody());
         if ($success) {
             $this->reflection->refreshTables();
         }
@@ -91,7 +92,8 @@ public function updateColumn(ServerRequestInterface $request): ResponseInterface
         if (!$table->hasColumn($columnName)) {
             return $this->responder->error(ErrorCode::COLUMN_NOT_FOUND, $columnName);
         }
-        $success = $this->definition->updateColumn($tableName, $columnName, $request->getParsedBody());
+        $column = $table->getColumn($columnName);
+        $success = $this->definition->updateColumn($table, $column, $request->getParsedBody());
         if ($success) {
             $this->reflection->refreshTable($tableName);
         }
@@ -122,7 +124,7 @@ public function addColumn(ServerRequestInterface $request): ResponseInterface
         if ($table->hasColumn($columnName)) {
             return $this->responder->error(ErrorCode::COLUMN_ALREADY_EXISTS, $columnName);
         }
-        $success = $this->definition->addColumn($tableName, $request->getParsedBody());
+        $success = $this->definition->addColumn($table, $request->getParsedBody());
         if ($success) {
             $this->reflection->refreshTable($tableName);
         }
@@ -135,7 +137,8 @@ public function removeTable(ServerRequestInterface $request): ResponseInterface
         if (!$this->reflection->hasTable($tableName)) {
             return $this->responder->error(ErrorCode::TABLE_NOT_FOUND, $tableName);
         }
-        $success = $this->definition->removeTable($tableName);
+        $table = $this->reflection->getTable($tableName);
+        $success = $this->definition->removeTable($table);
         if ($success) {
             $this->reflection->refreshTables();
         }
@@ -153,7 +156,8 @@ public function removeColumn(ServerRequestInterface $request): ResponseInterface
         if (!$table->hasColumn($columnName)) {
             return $this->responder->error(ErrorCode::COLUMN_NOT_FOUND, $columnName);
         }
-        $success = $this->definition->removeColumn($tableName, $columnName);
+        $column = $table->getColumn($columnName);
+        $success = $this->definition->removeColumn($table, $column);
         if ($success) {
             $this->reflection->refreshTable($tableName);
         }
diff --git a/src/Tqdev/PhpCrudApi/Database/GenericDefinition.php b/src/Tqdev/PhpCrudApi/Database/GenericDefinition.php
@@ -107,7 +107,7 @@ private function getColumnRenameSQL(string $tableName, string $columnName, Refle
     {
         $p1 = $this->quote($tableName);
         $p2 = $this->quote($columnName);
-        $p3 = $this->quote($newColumn->getName());
+        $p3 = $this->quote($newColumn->getRealName());
 
         switch ($this->driver) {
             case 'mysql':
@@ -127,7 +127,7 @@ private function getColumnRetypeSQL(string $tableName, string $columnName, Refle
     {
         $p1 = $this->quote($tableName);
         $p2 = $this->quote($columnName);
-        $p3 = $this->quote($newColumn->getName());
+        $p3 = $this->quote($newColumn->getRealName());
         $p4 = $this->getColumnType($newColumn, true);
 
         switch ($this->driver) {
@@ -144,7 +144,7 @@ private function getSetColumnNullableSQL(string $tableName, string $columnName,
     {
         $p1 = $this->quote($tableName);
         $p2 = $this->quote($columnName);
-        $p3 = $this->quote($newColumn->getName());
+        $p3 = $this->quote($newColumn->getRealName());
         $p4 = $this->getColumnType($newColumn, true);
 
         switch ($this->driver) {
@@ -216,7 +216,7 @@ private function getSetColumnPkDefaultSQL(string $tableName, string $columnName,
 
         switch ($this->driver) {
             case 'mysql':
-                $p3 = $this->quote($newColumn->getName());
+                $p3 = $this->quote($newColumn->getRealName());
                 $p4 = $this->getColumnType($newColumn, true);
                 return "ALTER TABLE $p1 CHANGE $p2 $p3 $p4";
             case 'pgsql':
@@ -265,7 +265,7 @@ private function getRemoveColumnFkConstraintSQL(string $tableName, string $colum
 
     private function getAddTableSQL(ReflectedTable $newTable): string
     {
-        $tableName = $newTable->getName();
+        $tableName = $newTable->getRealName();
         $p1 = $this->quote($tableName);
         $fields = [];
         $constraints = [];
@@ -304,7 +304,7 @@ private function getAddTableSQL(ReflectedTable $newTable): string
     private function getAddColumnSQL(string $tableName, ReflectedColumn $newColumn): string
     {
         $p1 = $this->quote($tableName);
-        $p2 = $this->quote($newColumn->getName());
+        $p2 = $this->quote($newColumn->getRealName());
         $p3 = $this->getColumnType($newColumn, false);
 
         switch ($this->driver) {
diff --git a/tests/functional/003_columns/018_get_posts_table.log b/tests/functional/003_columns/018_get_posts_table.log
@@ -0,0 +1,8 @@
+===
+GET /columns/posts
+===
+200
+Content-Type: application/json; charset=utf-8
+Content-Length: 347
+
+{"name":"abc_posts","alias":"posts","type":"table","columns":[{"name":"abc_id","alias":"id","type":"integer","pk":true},{"name":"abc_user_id","alias":"user_id","type":"integer","fk":"users"},{"name":"abc_category_id","alias":"category_id","type":"integer","fk":"categories"},{"name":"abc_content","alias":"content","type":"varchar","length":255}]}
diff --git a/tests/functional/003_columns/019_update_posts_table.log b/tests/functional/003_columns/019_update_posts_table.log
@@ -0,0 +1,36 @@
+===
+PUT /columns/posts
+
+{"name":"posts2"}
+===
+200
+Content-Type: application/json; charset=utf-8
+Content-Length: 4
+
+true
+===
+GET /columns/posts2
+===
+200
+Content-Type: application/json; charset=utf-8
+Content-Length: 257
+
+{"name":"posts2","type":"table","columns":[{"name":"abc_id","type":"integer","pk":true},{"name":"abc_user_id","type":"integer","fk":"users"},{"name":"abc_category_id","type":"integer","fk":"categories"},{"name":"abc_content","type":"varchar","length":255}]}
+===
+PUT /columns/posts2
+
+{"name":"posts"}
+===
+200
+Content-Type: application/json; charset=utf-8
+Content-Length: 4
+
+true
+===
+GET /columns/posts
+===
+200
+Content-Type: application/json; charset=utf-8
+Content-Length: 347
+
+{"name":"abc_posts","alias":"posts","type":"table","columns":[{"name":"abc_id","alias":"id","type":"integer","pk":true},{"name":"abc_user_id","alias":"user_id","type":"integer","fk":"users"},{"name":"abc_category_id","alias":"category_id","type":"integer","fk":"categories"},{"name":"abc_content","alias":"content","type":"varchar","length":255}]}

Original file line number	Diff line number	Diff line change
`@@ -4181,8 +4181,8 @@ public function updateTable(string $tableName, /* object */ $changes): bool`
`4181`	`4181`	`{`
`4182`	`4182`	`$table = $this->reflection->getTable($tableName);`
`4183`	`4183`	`$newTable = ReflectedTable::fromJson((object) array_merge((array) $table->jsonSerialize(), (array) $changes));`
`4184`		`- if ($table->getName() != $newTable->getName()) {`
`4185`		`- if (!$this->db->definition()->renameTable($table->getName(), $newTable->getName())) {`
	`4184`	`+ if ($table->getRealName() != $newTable->getRealName()) {`
	`4185`	`+ if (!$this->db->definition()->renameTable($table->getRealName(), $newTable->getRealName())) {`
`4186`	`4186`	`return false;`
`4187`	`4187`	`}`
`4188`	`4188`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,30 +17,26 @@ public function __construct(GenericDB $db, ReflectionService $reflection)`
`17`	`17`	`$this->reflection = $reflection;`
`18`	`18`	`}`
`19`	`19`
`20`		`- public function updateTable(string $tableName, /* object */ $changes): bool`
	`20`	`+ public function updateTable(ReflectedTable $table, /* object */ $changes): bool`
`21`	`21`	`{`
`22`		`- $table = $this->reflection->getTable($tableName);`
`23`	`22`	`$newTable = ReflectedTable::fromJson((object) array_merge((array) $table->jsonSerialize(), (array) $changes));`
`24`		`- if ($table->getName() != $newTable->getName()) {`
`25`		`- if (!$this->db->definition()->renameTable($table->getName(), $newTable->getName())) {`
	`23`	`+ if ($table->getRealName() != $newTable->getRealName()) {`
	`24`	`+ if (!$this->db->definition()->renameTable($table->getRealName(), $newTable->getRealName())) {`
`26`	`25`	`return false;`
`27`	`26`	`}`
`28`	`27`	`}`
`29`	`28`	`return true;`
`30`	`29`	`}`
`31`	`30`
`32`		`- public function updateColumn(string $tableName, string $columnName, /* object */ $changes): bool`
	`31`	`+ public function updateColumn(ReflectedTable $table, ReflectedColumn $column, /* object */ $changes): bool`
`33`	`32`	`{`
`34`		`- $table = $this->reflection->getTable($tableName);`
`35`		`- $column = $table->getColumn($columnName);`
`36`		`-`
`37`	`33`	`// remove constraints on other column`
`38`	`34`	`$newColumn = ReflectedColumn::fromJson((object) array_merge((array) $column->jsonSerialize(), (array) $changes));`
`39`	`35`	`if ($newColumn->getPk() != $column->getPk() && $table->hasPk()) {`
`40`	`36`	`$oldColumn = $table->getPk();`
`41`		`- if ($oldColumn->getName() != $columnName) {`
	`37`	`+ if ($oldColumn->getRealName() != $column->getRealName()) {`
`42`	`38`	`$oldColumn->setPk(false);`
`43`		`- if (!$this->db->definition()->removeColumnPrimaryKey($table->getName(), $oldColumn->getName(), $oldColumn)) {`
	`39`	`+ if (!$this->db->definition()->removeColumnPrimaryKey($table->getRealName(), $oldColumn->getRealName(), $oldColumn)) {`
`44`	`40`	`return false;`
`45`	`41`	`}`
`46`	`42`	`}`
`@@ -49,12 +45,12 @@ public function updateColumn(string $tableName, string $columnName, /* object */`
`49`	`45`	`// remove constraints`
`50`	`46`	`$newColumn = ReflectedColumn::fromJson((object) array_merge((array) $column->jsonSerialize(), ['pk' => false, 'fk' => false]));`
`51`	`47`	`if ($newColumn->getPk() != $column->getPk() && !$newColumn->getPk()) {`
`52`		`- if (!$this->db->definition()->removeColumnPrimaryKey($table->getName(), $column->getName(), $newColumn)) {`
	`48`	`+ if (!$this->db->definition()->removeColumnPrimaryKey($table->getRealName(), $column->getRealName(), $newColumn)) {`
`53`	`49`	`return false;`
`54`	`50`	`}`
`55`	`51`	`}`
`56`	`52`	`if ($newColumn->getFk() != $column->getFk() && !$newColumn->getFk()) {`
`57`		`- if (!$this->db->definition()->removeColumnForeignKey($table->getName(), $column->getName(), $newColumn)) {`
	`53`	`+ if (!$this->db->definition()->removeColumnForeignKey($table->getRealName(), $column->getRealName(), $newColumn)) {`
`58`	`54`	`return false;`
`59`	`55`	`}`
`60`	`56`	`}`
`@@ -63,8 +59,8 @@ public function updateColumn(string $tableName, string $columnName, /* object */`
`63`	`59`	`$newColumn = ReflectedColumn::fromJson((object) array_merge((array) $column->jsonSerialize(), (array) $changes));`
`64`	`60`	`$newColumn->setPk(false);`
`65`	`61`	`$newColumn->setFk('');`
`66`		`- if ($newColumn->getName() != $column->getName()) {`
`67`		`- if (!$this->db->definition()->renameColumn($table->getName(), $column->getName(), $newColumn)) {`
	`62`	`+ if ($newColumn->getRealName() != $column->getRealName()) {`
	`63`	`+ if (!$this->db->definition()->renameColumn($table->getRealName(), $column->getRealName(), $newColumn)) {`
`68`	`64`	`return false;`
`69`	`65`	`}`
`70`	`66`	`}`
`@@ -74,25 +70,25 @@ public function updateColumn(string $tableName, string $columnName, /* object */`
`74`	`70`	`$newColumn->getPrecision() != $column->getPrecision() \|\|`
`75`	`71`	`$newColumn->getScale() != $column->getScale()`
`76`	`72`	`) {`
`77`		`- if (!$this->db->definition()->retypeColumn($table->getName(), $newColumn->getName(), $newColumn)) {`
	`73`	`+ if (!$this->db->definition()->retypeColumn($table->getRealName(), $newColumn->getRealName(), $newColumn)) {`
`78`	`74`	`return false;`
`79`	`75`	`}`
`80`	`76`	`}`
`81`	`77`	`if ($newColumn->getNullable() != $column->getNullable()) {`
`82`		`- if (!$this->db->definition()->setColumnNullable($table->getName(), $newColumn->getName(), $newColumn)) {`
	`78`	`+ if (!$this->db->definition()->setColumnNullable($table->getRealName(), $newColumn->getRealName(), $newColumn)) {`
`83`	`79`	`return false;`
`84`	`80`	`}`
`85`	`81`	`}`
`86`	`82`
`87`	`83`	`// add constraints`
`88`	`84`	`$newColumn = ReflectedColumn::fromJson((object) array_merge((array) $column->jsonSerialize(), (array) $changes));`
`89`	`85`	`if ($newColumn->getFk()) {`
`90`		`- if (!$this->db->definition()->addColumnForeignKey($table->getName(), $newColumn->getName(), $newColumn)) {`
	`86`	`+ if (!$this->db->definition()->addColumnForeignKey($table->getRealName(), $newColumn->getRealName(), $newColumn)) {`
`91`	`87`	`return false;`
`92`	`88`	`}`
`93`	`89`	`}`
`94`	`90`	`if ($newColumn->getPk()) {`
`95`		`- if (!$this->db->definition()->addColumnPrimaryKey($table->getName(), $newColumn->getName(), $newColumn)) {`
	`91`	`+ if (!$this->db->definition()->addColumnPrimaryKey($table->getRealName(), $newColumn->getRealName(), $newColumn)) {`
`96`	`92`	`return false;`
`97`	`93`	`}`
`98`	`94`	`}`
`@@ -108,50 +104,48 @@ public function addTable(/* object */$definition)`
`108`	`104`	`return true;`
`109`	`105`	`}`
`110`	`106`
`111`		`- public function addColumn(string $tableName, /* object */ $definition)`
	`107`	`+ public function addColumn(ReflectedTable $table, /* object */ $definition)`
`112`	`108`	`{`
`113`	`109`	`$newColumn = ReflectedColumn::fromJson($definition);`
`114`		`- if (!$this->db->definition()->addColumn($tableName, $newColumn)) {`
	`110`	`+ if (!$this->db->definition()->addColumn($table->getRealName(), $newColumn)) {`
`115`	`111`	`return false;`
`116`	`112`	`}`
`117`	`113`	`if ($newColumn->getFk()) {`
`118`		`- if (!$this->db->definition()->addColumnForeignKey($tableName, $newColumn->getName(), $newColumn)) {`
	`114`	`+ if (!$this->db->definition()->addColumnForeignKey($table->getRealName(), $newColumn->getRealName(), $newColumn)) {`
`119`	`115`	`return false;`
`120`	`116`	`}`
`121`	`117`	`}`
`122`	`118`	`if ($newColumn->getPk()) {`
`123`		`- if (!$this->db->definition()->addColumnPrimaryKey($tableName, $newColumn->getName(), $newColumn)) {`
	`119`	`+ if (!$this->db->definition()->addColumnPrimaryKey($table->getRealName(), $newColumn->getRealName(), $newColumn)) {`
`124`	`120`	`return false;`
`125`	`121`	`}`
`126`	`122`	`}`
`127`	`123`	`return true;`
`128`	`124`	`}`
`129`	`125`
`130`		`- public function removeTable(string $tableName)`
	`126`	`+ public function removeTable(ReflectedTable $table)`
`131`	`127`	`{`
`132`		`- if (!$this->db->definition()->removeTable($tableName)) {`
	`128`	`+ if (!$this->db->definition()->removeTable($table->getRealName())) {`
`133`	`129`	`return false;`
`134`	`130`	`}`
`135`	`131`	`return true;`
`136`	`132`	`}`
`137`	`133`
`138`		`- public function removeColumn(string $tableName, string $columnName)`
	`134`	`+ public function removeColumn(ReflectedTable $table, ReflectedColumn $column)`
`139`	`135`	`{`
`140`		`- $table = $this->reflection->getTable($tableName);`
`141`		`- $newColumn = $table->getColumn($columnName);`
`142`		`- if ($newColumn->getPk()) {`
`143`		`- $newColumn->setPk(false);`
`144`		`- if (!$this->db->definition()->removeColumnPrimaryKey($table->getName(), $newColumn->getName(), $newColumn)) {`
	`136`	`+ if ($column->getPk()) {`
	`137`	`+ $column->setPk(false);`
	`138`	`+ if (!$this->db->definition()->removeColumnPrimaryKey($table->getRealName(), $column->getRealName(), $column)) {`
`145`	`139`	`return false;`
`146`	`140`	`}`
`147`	`141`	`}`
`148`		`- if ($newColumn->getFk()) {`
`149`		`- $newColumn->setFk("");`
`150`		`- if (!$this->db->definition()->removeColumnForeignKey($tableName, $columnName, $newColumn)) {`
	`142`	`+ if ($column->getFk()) {`
	`143`	`+ $column->setFk("");`
	`144`	`+ if (!$this->db->definition()->removeColumnForeignKey($table->getRealName(), $column->getRealName(), $column)) {`
`151`	`145`	`return false;`
`152`	`146`	`}`
`153`	`147`	`}`
`154`		`- if (!$this->db->definition()->removeColumn($tableName, $columnName)) {`
	`148`	`+ if (!$this->db->definition()->removeColumn($table->getRealName(), $column->getRealName())) {`
`155`	`149`	`return false;`
`156`	`150`	`}`
`157`	`151`	`return true;`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,8 @@ public function updateTable(ServerRequestInterface $request): ResponseInterface`
`73`	`73`	`if (!$this->reflection->hasTable($tableName)) {`
`74`	`74`	`return $this->responder->error(ErrorCode::TABLE_NOT_FOUND, $tableName);`
`75`	`75`	`}`
`76`		`- $success = $this->definition->updateTable($tableName, $request->getParsedBody());`
	`76`	`+ $table = $this->reflection->getTable($tableName);`
	`77`	`+ $success = $this->definition->updateTable($table, $request->getParsedBody());`
`77`	`78`	`if ($success) {`
`78`	`79`	`$this->reflection->refreshTables();`
`79`	`80`	`}`
`@@ -91,7 +92,8 @@ public function updateColumn(ServerRequestInterface $request): ResponseInterface`
`91`	`92`	`if (!$table->hasColumn($columnName)) {`
`92`	`93`	`return $this->responder->error(ErrorCode::COLUMN_NOT_FOUND, $columnName);`
`93`	`94`	`}`
`94`		`- $success = $this->definition->updateColumn($tableName, $columnName, $request->getParsedBody());`
	`95`	`+ $column = $table->getColumn($columnName);`
	`96`	`+ $success = $this->definition->updateColumn($table, $column, $request->getParsedBody());`
`95`	`97`	`if ($success) {`
`96`	`98`	`$this->reflection->refreshTable($tableName);`
`97`	`99`	`}`
`@@ -122,7 +124,7 @@ public function addColumn(ServerRequestInterface $request): ResponseInterface`
`122`	`124`	`if ($table->hasColumn($columnName)) {`
`123`	`125`	`return $this->responder->error(ErrorCode::COLUMN_ALREADY_EXISTS, $columnName);`
`124`	`126`	`}`
`125`		`- $success = $this->definition->addColumn($tableName, $request->getParsedBody());`
	`127`	`+ $success = $this->definition->addColumn($table, $request->getParsedBody());`
`126`	`128`	`if ($success) {`
`127`	`129`	`$this->reflection->refreshTable($tableName);`
`128`	`130`	`}`
`@@ -135,7 +137,8 @@ public function removeTable(ServerRequestInterface $request): ResponseInterface`
`135`	`137`	`if (!$this->reflection->hasTable($tableName)) {`
`136`	`138`	`return $this->responder->error(ErrorCode::TABLE_NOT_FOUND, $tableName);`
`137`	`139`	`}`
`138`		`- $success = $this->definition->removeTable($tableName);`
	`140`	`+ $table = $this->reflection->getTable($tableName);`
	`141`	`+ $success = $this->definition->removeTable($table);`
`139`	`142`	`if ($success) {`
`140`	`143`	`$this->reflection->refreshTables();`
`141`	`144`	`}`
`@@ -153,7 +156,8 @@ public function removeColumn(ServerRequestInterface $request): ResponseInterface`
`153`	`156`	`if (!$table->hasColumn($columnName)) {`
`154`	`157`	`return $this->responder->error(ErrorCode::COLUMN_NOT_FOUND, $columnName);`
`155`	`158`	`}`
`156`		`- $success = $this->definition->removeColumn($tableName, $columnName);`
	`159`	`+ $column = $table->getColumn($columnName);`
	`160`	`+ $success = $this->definition->removeColumn($table, $column);`
`157`	`161`	`if ($success) {`
`158`	`162`	`$this->reflection->refreshTable($tableName);`
`159`	`163`	`}`