Support for views #409

src/Tqdev/PhpCrudApi/Column/Reflection/ReflectedDatabase.php

@@ -6,36 +6,34 @@ use Tqdev\PhpCrudApi\Database\GenericReflection;
 class ReflectedDatabase implements \JsonSerializable
 {
     private $name;
-    private $tableNames;
+    private $tableTypes;
 
-    public function __construct(String $name, array $tableNames)
+    public function __construct(String $name, array $tableTypes)
     {
         $this->name = $name;
-        $this->tableNames = [];
-        foreach ($tableNames as $tableName) {
-            $this->tableNames[$tableName] = true;
-        }
+        $this->tableTypes = $tableTypes;
     }
 
     public static function fromReflection(GenericReflection $reflection): ReflectedDatabase
     {
         $name = $reflection->getDatabaseName();
-        $tableNames = [];
+        $tableTypes = [];
         foreach ($reflection->getTables() as $table) {
             $tableName = $table['TABLE_NAME'];
+            $tableType = $table['TABLE_TYPE'];
             if (in_array($tableName, $reflection->getIgnoredTables())) {
                 continue;
             }
-            $tableNames[$tableName] = true;
+            $tableTypes[$tableName] = $tableType;
         }
-        return new ReflectedDatabase($name, array_keys($tableNames));
+        return new ReflectedDatabase($name, $tableTypes);
     }
 
     public static function fromJson( /* object */$json): ReflectedDatabase
     {
         $name = $json->name;
-        $tableNames = $json->tables;
-        return new ReflectedDatabase($name, $tableNames);
+        $tableTypes = (array) $json->tables;
+        return new ReflectedDatabase($name, $tableTypes);
     }
 
     public function getName(): String
@@ -45,20 +43,25 @@ class ReflectedDatabase implements \JsonSerializable
 
     public function hasTable(String $tableName): bool
     {
-        return isset($this->tableNames[$tableName]);
+        return isset($this->tableTypes[$tableName]);
+    }
+
+    public function getType(String $tableName): String
+    {
+        return isset($this->tableTypes[$tableName]) ? $this->tableTypes[$tableName] : '';
     }
 
     public function getTableNames(): array
     {
-        return array_keys($this->tableNames);
+        return array_keys($this->tableTypes);
     }
 
     public function removeTable(String $tableName): bool
     {
-        if (!isset($this->tableNames[$tableName])) {
+        if (!isset($this->tableTypes[$tableName])) {
             return false;
         }
-        unset($this->tableNames[$tableName]);
+        unset($this->tableTypes[$tableName]);
         return true;
     }
 
@@ -66,7 +69,7 @@ class ReflectedDatabase implements \JsonSerializable
     {
         return [
             'name' => $this->name,
-            'tables' => array_keys($this->tableNames),
+            'tables' => $this->tableTypes,
         ];
     }
 

src/Tqdev/PhpCrudApi/Column/Reflection/ReflectedTable.php

@@ -6,13 +6,15 @@ use Tqdev\PhpCrudApi\Database\GenericReflection;
 class ReflectedTable implements \JsonSerializable
 {
     private $name;
+    private $type;
     private $columns;
     private $pk;
     private $fks;
 
-    public function __construct(String $name, array $columns)
+    public function __construct(String $name, String $type, array $columns)
     {
         $this->name = $name;
+        $this->type = $type;
         // set columns
         $this->columns = [];
         foreach ($columns as $column) {
@@ -37,11 +39,11 @@ class ReflectedTable implements \JsonSerializable
         }
     }
 
-    public static function fromReflection(GenericReflection $reflection, String $name): ReflectedTable
+    public static function fromReflection(GenericReflection $reflection, String $name, String $type): ReflectedTable
     {
         // set columns
         $columns = [];
-        foreach ($reflection->getTableColumns($name) as $tableColumn) {
+        foreach ($reflection->getTableColumns($name, $type) as $tableColumn) {
             $column = ReflectedColumn::fromReflection($reflection, $tableColumn);
             $columns[$column->getName()] = $column;
         }
@@ -59,19 +61,20 @@ class ReflectedTable implements \JsonSerializable
         foreach ($fks as $columnName => $table) {
             $columns[$columnName]->setFk($table);
         }
-        return new ReflectedTable($name, array_values($columns));
+        return new ReflectedTable($name, $type, array_values($columns));
     }
 
     public static function fromJson( /* object */$json): ReflectedTable
     {
         $name = $json->name;
+        $type = $json->type;
         $columns = [];
         if (isset($json->columns) && is_array($json->columns)) {
             foreach ($json->columns as $column) {
                 $columns[] = ReflectedColumn::fromJson($column);
             }
         }
-        return new ReflectedTable($name, $columns);
+        return new ReflectedTable($name, $type, $columns);
     }
 
     public function hasColumn(String $columnName): bool
@@ -94,6 +97,11 @@ class ReflectedTable implements \JsonSerializable
         return $this->name;
     }
 
+    public function getType(): String
+    {
+        return $this->type;
+    }
+
     public function columnNames(): array
     {
         return array_keys($this->columns);
@@ -128,6 +136,7 @@ class ReflectedTable implements \JsonSerializable
     {
         return [
             'name' => $this->name,
+            'type' => $this->type,
             'columns' => array_values($this->columns),
         ];
     }

src/Tqdev/PhpCrudApi/Column/ReflectionService.php

@@ -42,7 +42,8 @@ class ReflectionService
         if ($data != '') {
             $table = ReflectedTable::fromJson(json_decode(gzuncompress($data)));
         } else {
-            $table = ReflectedTable::fromReflection($this->db->reflection(), $tableName);
+            $tableType = $this->database->getType($tableName);
+            $table = ReflectedTable::fromReflection($this->db->reflection(), $tableName, $tableType);
             $data = gzcompress(json_encode($table, JSON_UNESCAPED_UNICODE));
             $this->cache->set("ReflectedTable($tableName)", $data, $this->ttl);
         }
@@ -64,6 +65,11 @@ class ReflectionService
         return $this->database->hasTable($tableName);
     }
 
+    public function getType(String $tableName): String
+    {
+        return $this->database->getType($tableName);
+    }
+
     public function getTable(String $tableName): ReflectedTable
     {
         if (!isset($this->tables[$tableName])) {

src/Tqdev/PhpCrudApi/Controller/RecordController.php

@@ -37,11 +37,14 @@ class RecordController
     public function read(Request $request): Response
     {
         $table = $request->getPathSegment(2);
-        $id = $request->getPathSegment(3);
-        $params = $request->getParams();
         if (!$this->service->hasTable($table)) {
             return $this->responder->error(ErrorCode::TABLE_NOT_FOUND, $table);
         }
+        if ($this->service->getType($table) != 'table') {
+            return $this->responder->error(ErrorCode::OPERATION_NOT_SUPPORTED, __FUNCTION__);
+        }
+        $id = $request->getPathSegment(3);
+        $params = $request->getParams();
         if (strpos($id, ',') !== false) {
             $ids = explode(',', $id);
             $result = [];
@@ -61,14 +64,17 @@ class RecordController
     public function create(Request $request): Response
     {
         $table = $request->getPathSegment(2);
+        if (!$this->service->hasTable($table)) {
+            return $this->responder->error(ErrorCode::TABLE_NOT_FOUND, $table);
+        }
+        if ($this->service->getType($table) != 'table') {
+            return $this->responder->error(ErrorCode::OPERATION_NOT_SUPPORTED, __FUNCTION__);
+        }
         $record = $request->getBody();
         if ($record === null) {
             return $this->responder->error(ErrorCode::HTTP_MESSAGE_NOT_READABLE, '');
         }
         $params = $request->getParams();
-        if (!$this->service->hasTable($table)) {
-            return $this->responder->error(ErrorCode::TABLE_NOT_FOUND, $table);
-        }
         if (is_array($record)) {
             $result = array();
             foreach ($record as $r) {
@@ -83,15 +89,18 @@ class RecordController
     public function update(Request $request): Response
     {
         $table = $request->getPathSegment(2);
+        if (!$this->service->hasTable($table)) {
+            return $this->responder->error(ErrorCode::TABLE_NOT_FOUND, $table);
+        }
+        if ($this->service->getType($table) != 'table') {
+            return $this->responder->error(ErrorCode::OPERATION_NOT_SUPPORTED, __FUNCTION__);
+        }
         $id = $request->getPathSegment(3);
+        $params = $request->getParams();
         $record = $request->getBody();
         if ($record === null) {
             return $this->responder->error(ErrorCode::HTTP_MESSAGE_NOT_READABLE, '');
         }
-        $params = $request->getParams();
-        if (!$this->service->hasTable($table)) {
-            return $this->responder->error(ErrorCode::TABLE_NOT_FOUND, $table);
-        }
         $ids = explode(',', $id);
         if (is_array($record)) {
             if (count($ids) != count($record)) {
@@ -113,11 +122,14 @@ class RecordController
     public function delete(Request $request): Response
     {
         $table = $request->getPathSegment(2);
-        $id = $request->getPathSegment(3);
-        $params = $request->getParams();
         if (!$this->service->hasTable($table)) {
             return $this->responder->error(ErrorCode::TABLE_NOT_FOUND, $table);
         }
+        if ($this->service->getType($table) != 'table') {
+            return $this->responder->error(ErrorCode::OPERATION_NOT_SUPPORTED, __FUNCTION__);
+        }
+        $id = $request->getPathSegment(3);
+        $params = $request->getParams();
         $ids = explode(',', $id);
         if (count($ids) > 1) {
             $result = array();
@@ -133,15 +145,18 @@ class RecordController
     public function increment(Request $request): Response
     {
         $table = $request->getPathSegment(2);
+        if (!$this->service->hasTable($table)) {
+            return $this->responder->error(ErrorCode::TABLE_NOT_FOUND, $table);
+        }
+        if ($this->service->getType($table) != 'table') {
+            return $this->responder->error(ErrorCode::OPERATION_NOT_SUPPORTED, __FUNCTION__);
+        }
         $id = $request->getPathSegment(3);
         $record = $request->getBody();
         if ($record === null) {
             return $this->responder->error(ErrorCode::HTTP_MESSAGE_NOT_READABLE, '');
         }
         $params = $request->getParams();
-        if (!$this->service->hasTable($table)) {
-            return $this->responder->error(ErrorCode::TABLE_NOT_FOUND, $table);
-        }
         $ids = explode(',', $id);
         if (is_array($record)) {
             if (count($ids) != count($record)) {

src/Tqdev/PhpCrudApi/Database/GenericReflection.php

@@ -20,7 +20,7 @@ class GenericReflection
     {
         switch ($this->driver) {
             case 'mysql':return [];
-            case 'pgsql':return ['spatial_ref_sys'];
+            case 'pgsql':return ['spatial_ref_sys', 'raster_columns', 'raster_overviews', 'geography_columns', 'geometry_columns'];
             case 'sqlsrv':return [];
         }
     }
@@ -28,9 +28,9 @@ class GenericReflection
     private function getTablesSQL(): String
     {
         switch ($this->driver) {
-            case 'mysql':return 'SELECT "TABLE_NAME" FROM "INFORMATION_SCHEMA"."TABLES" WHERE "TABLE_TYPE" IN (\'BASE TABLE\') AND "TABLE_SCHEMA" = ? ORDER BY BINARY "TABLE_NAME"';
-            case 'pgsql':return 'SELECT c.relname as "TABLE_NAME" FROM pg_catalog.pg_class c LEFT JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace WHERE c.relkind IN (\'r\') AND n.nspname <> \'pg_catalog\' AND n.nspname <> \'information_schema\' AND n.nspname !~ \'^pg_toast\' AND pg_catalog.pg_table_is_visible(c.oid) AND \'\' <> ? ORDER BY "TABLE_NAME";';
-            case 'sqlsrv':return 'SELECT o.name as "TABLE_NAME" FROM sysobjects o WHERE o.xtype = \'U\' ORDER BY "TABLE_NAME"';
+            case 'mysql':return 'SELECT "TABLE_NAME", "TABLE_TYPE" FROM "INFORMATION_SCHEMA"."TABLES" WHERE "TABLE_TYPE" IN (\'BASE TABLE\' , \'VIEW\') AND "TABLE_SCHEMA" = ? ORDER BY BINARY "TABLE_NAME"';
+            case 'pgsql':return 'SELECT c.relname as "TABLE_NAME", c.relkind as "TABLE_TYPE" FROM pg_catalog.pg_class c LEFT JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace WHERE c.relkind IN (\'r\', \'v\') AND n.nspname <> \'pg_catalog\' AND n.nspname <> \'information_schema\' AND n.nspname !~ \'^pg_toast\' AND pg_catalog.pg_table_is_visible(c.oid) AND \'\' <> ? ORDER BY "TABLE_NAME";';
+            case 'sqlsrv':return 'SELECT o.name as "TABLE_NAME", o.xtype as "TABLE_TYPE" FROM sysobjects o WHERE o.xtype IN (\'U\', \'V\') ORDER BY "TABLE_NAME"';
         }
     }
 
@@ -69,13 +69,36 @@ class GenericReflection
     public function getTables(): array
     {
         $sql = $this->getTablesSQL();
-        return $this->query($sql, [$this->database]);
+        $results = $this->query($sql, [$this->database]);
+        foreach ($results as &$result) {
+            switch ($this->driver) {
+                case 'mysql':
+                    $map = ['BASE TABLE' => 'table', 'VIEW' => 'view'];
+                    $result['TABLE_TYPE'] = $map[$result['TABLE_TYPE']];
+                    break;
+                case 'pgsql':
+                    $map = ['r' => 'table', 'v' => 'view'];
+                    $result['TABLE_TYPE'] = $map[$result['TABLE_TYPE']];
+                    break;
+                case 'sqlsrv':
+                    $map = ['U' => 'table', 'V' => 'view'];
+                    $result['TABLE_TYPE'] = $map[trim($result['TABLE_TYPE'])];
+                    break;
+            }
+        }
+        return $results;
     }
 
-    public function getTableColumns(String $tableName): array
+    public function getTableColumns(String $tableName, String $type): array
     {
         $sql = $this->getTableColumnsSQL();
-        return $this->query($sql, [$tableName, $this->database]);
+        $results = $this->query($sql, [$tableName, $this->database]);
+        if ($type == 'view') {
+            foreach ($results as &$result) {
+                $result['IS_NULLABLE'] = false;
+            }
+        }
+        return $results;
     }
 
     public function getTablePrimaryKeys(String $tableName): array

src/Tqdev/PhpCrudApi/OpenApi/OpenApiBuilder.php

@@ -87,12 +87,16 @@ class OpenApiBuilder
     private function setPath(String $tableName) /*: void*/
     {
         $table = $this->reflection->getTable($tableName);
+        $type = $table->getType($tableName);
         $pk = $table->getPk();
         $pkName = $pk ? $pk->getName() : '';
         foreach ($this->operations as $operation => $method) {
             if (!$pkName && $operation != 'list') {
                 continue;
             }
+            if ($type != 'table' && $operation != 'list') {
+                continue;
+            }
             if (!$this->isOperationOnTableAllowed($operation, $tableName)) {
                 continue;
             }

src/Tqdev/PhpCrudApi/Record/ErrorCode.php

@@ -26,6 +26,7 @@ class ErrorCode
     const ACCESS_DENIED = 1012;
     const INPUT_VALIDATION_FAILED = 1013;
     const OPERATION_FORBIDDEN = 1014;
+    const OPERATION_NOT_SUPPORTED = 1015;
 
     private $values = [
         9999 => ["%s", Response::INTERNAL_SERVER_ERROR],
@@ -44,6 +45,7 @@ class ErrorCode
         1012 => ["Access denied for '%s'", Response::FORBIDDEN],
         1013 => ["Input validation failed for '%s'", Response::UNPROCESSABLE_ENTITY],
         1014 => ["Operation forbidden", Response::FORBIDDEN],
+        1015 => ["Operation '%s' not supported", Response::METHOD_NOT_ALLOWED],
     ];
 
     public function __construct(int $code)

src/Tqdev/PhpCrudApi/Record/RecordService.php

@@ -50,6 +50,11 @@ class RecordService
         return $this->reflection->hasTable($table);
     }
 
+    public function getType(String $table): bool
+    {
+        return $this->reflection->getType($table);
+    }
+
     public function create(String $tableName, /* object */ $record, array $params)
     {
         $this->sanitizeRecord($tableName, $record, '');

src/Tqdev/PhpCrudApi/Response.php

@@ -7,10 +7,10 @@ class Response
     const UNAUTHORIZED = 401;
     const FORBIDDEN = 403;
     const NOT_FOUND = 404;
+    const METHOD_NOT_ALLOWED = 405;
     const CONFLICT = 409;
     const UNPROCESSABLE_ENTITY = 422;
     const INTERNAL_SERVER_ERROR = 500;
-
     private $status;
     private $headers;
     private $body;

tests/fixtures/blog_sqlsrv.sql

@@ -1,3 +1,9 @@
+IF (OBJECT_ID('FK_kunsthåndværk_users', 'F') IS NOT NULL)
+BEGIN
+ALTER TABLE [kunsthåndværk] DROP	CONSTRAINT [FK_kunsthåndværk_users]
+END
+GO
+
 IF (OBJECT_ID('FK_barcodes_products', 'F') IS NOT NULL)
 BEGIN
 ALTER TABLE [barcodes] DROP	CONSTRAINT [FK_barcodes_products]
@@ -222,7 +228,7 @@ CREATE TABLE [barcodes](
 GO
 
 CREATE TABLE [kunsthåndværk](
-	[id] [nvarchar](36),
+	[id] [nvarchar](36) NOT NULL,
 	[Umlauts ä_ö_ü-COUNT] [int] NOT NULL,
 	[user_id] [int] NOT NULL,
 	[invisible] [nvarchar](36),
@@ -232,14 +238,14 @@ CREATE TABLE [kunsthåndværk](
 GO
 
 CREATE TABLE [invisibles](
-	[id] [nvarchar](36),
+	[id] [nvarchar](36) NOT NULL,
 	CONSTRAINT [PK_invisibles]
 	PRIMARY KEY CLUSTERED([id] ASC)
 )
 GO
 
 CREATE TABLE [nopk](
-	[id] [nvarchar](36)
+	[id] [nvarchar](36) NOT NULL
 )
 GO
 
@@ -349,4 +355,4 @@ ALTER TABLE [kunsthåndværk]  WITH CHECK ADD 	CONSTRAINT [FK_kunsthåndværk_us
 REFERENCES [users] ([id])
 GO
 ALTER TABLE [kunsthåndværk] CHECK	CONSTRAINT [FK_kunsthåndværk_users]
-GO
+GO

tests/functional/003_columns/001_get_database.log

@@ -2,6 +2,6 @@ GET /columns
 ===
 200
 Content-Type: application/json
-Content-Length: 2273
+Content-Length: 2579
 
-{"name":"php-crud-api","tables":[{"name":"barcodes","columns":[{"name":"id","type":"integer","pk":true},{"name":"product_id","type":"integer","fk":"products"},{"name":"hex","type":"varchar","length":255},{"name":"bin","type":"blob"}]},{"name":"categories","columns":[{"name":"id","type":"integer","pk":true},{"name":"name","type":"varchar","length":255},{"name":"icon","type":"blob","nullable":true}]},{"name":"comments","columns":[{"name":"id","type":"integer","pk":true},{"name":"post_id","type":"integer","fk":"posts"},{"name":"message","type":"varchar","length":255}]},{"name":"countries","columns":[{"name":"id","type":"integer","pk":true},{"name":"name","type":"varchar","length":255},{"name":"shape","type":"geometry"}]},{"name":"events","columns":[{"name":"id","type":"integer","pk":true},{"name":"name","type":"varchar","length":255},{"name":"datetime","type":"timestamp"},{"name":"visitors","type":"integer"}]},{"name":"kunsthåndværk","columns":[{"name":"id","type":"varchar","length":36,"pk":true},{"name":"Umlauts ä_ö_ü-COUNT","type":"integer"},{"name":"user_id","type":"integer","fk":"users"}]},{"name":"nopk","columns":[{"name":"id","type":"varchar","length":36}]},{"name":"post_tags","columns":[{"name":"id","type":"integer","pk":true},{"name":"post_id","type":"integer","fk":"posts"},{"name":"tag_id","type":"integer","fk":"tags"}]},{"name":"posts","columns":[{"name":"id","type":"integer","pk":true},{"name":"user_id","type":"integer","fk":"users"},{"name":"category_id","type":"integer","fk":"categories"},{"name":"content","type":"varchar","length":255}]},{"name":"products","columns":[{"name":"id","type":"integer","pk":true},{"name":"name","type":"varchar","length":255},{"name":"price","type":"decimal","precision":10,"scale":2},{"name":"properties","type":"clob"},{"name":"created_at","type":"timestamp"},{"name":"deleted_at","type":"timestamp","nullable":true}]},{"name":"tags","columns":[{"name":"id","type":"integer","pk":true},{"name":"name","type":"varchar","length":255},{"name":"is_important","type":"boolean"}]},{"name":"users","columns":[{"name":"id","type":"integer","pk":true},{"name":"username","type":"varchar","length":255},{"name":"password","type":"varchar","length":255},{"name":"location","type":"geometry","nullable":true}]}]}
+{"name":"php-crud-api","tables":[{"name":"barcodes","type":"table","columns":[{"name":"id","type":"integer","pk":true},{"name":"product_id","type":"integer","fk":"products"},{"name":"hex","type":"varchar","length":255},{"name":"bin","type":"blob"}]},{"name":"categories","type":"table","columns":[{"name":"id","type":"integer","pk":true},{"name":"name","type":"varchar","length":255},{"name":"icon","type":"blob","nullable":true}]},{"name":"comments","type":"table","columns":[{"name":"id","type":"integer","pk":true},{"name":"post_id","type":"integer","fk":"posts"},{"name":"message","type":"varchar","length":255}]},{"name":"countries","type":"table","columns":[{"name":"id","type":"integer","pk":true},{"name":"name","type":"varchar","length":255},{"name":"shape","type":"geometry"}]},{"name":"events","type":"table","columns":[{"name":"id","type":"integer","pk":true},{"name":"name","type":"varchar","length":255},{"name":"datetime","type":"timestamp"},{"name":"visitors","type":"integer"}]},{"name":"kunsthåndværk","type":"table","columns":[{"name":"id","type":"varchar","length":36,"pk":true},{"name":"Umlauts ä_ö_ü-COUNT","type":"integer"},{"name":"user_id","type":"integer","fk":"users"}]},{"name":"nopk","type":"table","columns":[{"name":"id","type":"varchar","length":36}]},{"name":"post_tags","type":"table","columns":[{"name":"id","type":"integer","pk":true},{"name":"post_id","type":"integer","fk":"posts"},{"name":"tag_id","type":"integer","fk":"tags"}]},{"name":"posts","type":"table","columns":[{"name":"id","type":"integer","pk":true},{"name":"user_id","type":"integer","fk":"users"},{"name":"category_id","type":"integer","fk":"categories"},{"name":"content","type":"varchar","length":255}]},{"name":"products","type":"table","columns":[{"name":"id","type":"integer","pk":true},{"name":"name","type":"varchar","length":255},{"name":"price","type":"decimal","precision":10,"scale":2},{"name":"properties","type":"clob"},{"name":"created_at","type":"timestamp"},{"name":"deleted_at","type":"timestamp","nullable":true}]},{"name":"tag_usage","type":"view","columns":[{"name":"name","type":"varchar","length":255},{"name":"count","type":"bigint"}]},{"name":"tags","type":"table","columns":[{"name":"id","type":"integer","pk":true},{"name":"name","type":"varchar","length":255},{"name":"is_important","type":"boolean"}]},{"name":"users","type":"table","columns":[{"name":"id","type":"integer","pk":true},{"name":"username","type":"varchar","length":255},{"name":"password","type":"varchar","length":255},{"name":"location","type":"geometry","nullable":true}]}]}

tests/functional/003_columns/002_get_barcodes_table.log

@@ -2,6 +2,6 @@ GET /columns/barcodes
 ===
 200
 Content-Type: application/json
-Content-Length: 201
+Content-Length: 216
 
-{"name":"barcodes","columns":[{"name":"id","type":"integer","pk":true},{"name":"product_id","type":"integer","fk":"products"},{"name":"hex","type":"varchar","length":255},{"name":"bin","type":"blob"}]}
+{"name":"barcodes","type":"table","columns":[{"name":"id","type":"integer","pk":true},{"name":"product_id","type":"integer","fk":"products"},{"name":"hex","type":"varchar","length":255},{"name":"bin","type":"blob"}]}

tests/functional/003_columns/008_update_barcodes_table.log

@@ -12,9 +12,9 @@ GET /columns/barcodes2
 ===
 200
 Content-Type: application/json
-Content-Length: 202
+Content-Length: 217
 
-{"name":"barcodes2","columns":[{"name":"id","type":"integer","pk":true},{"name":"product_id","type":"integer","fk":"products"},{"name":"hex","type":"varchar","length":255},{"name":"bin","type":"blob"}]}
+{"name":"barcodes2","type":"table","columns":[{"name":"id","type":"integer","pk":true},{"name":"product_id","type":"integer","fk":"products"},{"name":"hex","type":"varchar","length":255},{"name":"bin","type":"blob"}]}
 ===
 PUT /columns/barcodes2
 
@@ -30,6 +30,6 @@ GET /columns/barcodes
 ===
 200
 Content-Type: application/json
-Content-Length: 201
+Content-Length: 216
 
-{"name":"barcodes","columns":[{"name":"id","type":"integer","pk":true},{"name":"product_id","type":"integer","fk":"products"},{"name":"hex","type":"varchar","length":255},{"name":"bin","type":"blob"}]}
+{"name":"barcodes","type":"table","columns":[{"name":"id","type":"integer","pk":true},{"name":"product_id","type":"integer","fk":"products"},{"name":"hex","type":"varchar","length":255},{"name":"bin","type":"blob"}]}

tests/functional/003_columns/010_create_barcodes_table.log

@@ -1,6 +1,6 @@
 POST /columns
 
-{"name":"barcodes2","columns":[{"name":"id","type":"integer","pk":true},{"name":"product_id","type":"integer","fk":"products"},{"name":"hex","type":"varchar","length":255},{"name":"bin","type":"blob"}]}
+{"name":"barcodes2","type":"table","columns":[{"name":"id","type":"integer","pk":true},{"name":"product_id","type":"integer","fk":"products"},{"name":"hex","type":"varchar","length":255},{"name":"bin","type":"blob"}]}
 ===
 200
 Content-Type: application/json
@@ -12,9 +12,9 @@ GET /columns/barcodes2
 ===
 200
 Content-Type: application/json
-Content-Length: 202
+Content-Length: 217
 
-{"name":"barcodes2","columns":[{"name":"id","type":"integer","pk":true},{"name":"product_id","type":"integer","fk":"products"},{"name":"hex","type":"varchar","length":255},{"name":"bin","type":"blob"}]}
+{"name":"barcodes2","type":"table","columns":[{"name":"id","type":"integer","pk":true},{"name":"product_id","type":"integer","fk":"products"},{"name":"hex","type":"varchar","length":255},{"name":"bin","type":"blob"}]}
 ===
 DELETE /columns/barcodes2
 ===