diff --git a/src/Driver/Postgresql/FunctionManager.php b/src/Driver/Postgresql/FunctionManager.php index 83c27fe90b27d774f8fe9cc1a208c06a8476f5f5..5ed520e11d9d276b7634a8d642d52e7c08b2b74b 100644 --- a/src/Driver/Postgresql/FunctionManager.php +++ b/src/Driver/Postgresql/FunctionManager.php @@ -18,8 +18,8 @@ class FunctionManager extends AbstractManager implements FunctionManagerInteface $q = " SELECT - n.nspname schema, - p.proname name, + n.nspname \"schema\", + p.proname \"name\", pg_catalog.pg_get_functiondef(p.oid) definition, pg_catalog.pg_get_function_result(p.oid) return, pg_catalog.pg_get_function_arguments(p.oid) arguments diff --git a/src/Driver/Postgresql/IndexManager.php b/src/Driver/Postgresql/IndexManager.php index 7ad0cae3c52312c95bd2cd31406c5820440d913a..5f7a349205cde0b8ae3718e640559e77730fb67a 100644 --- a/src/Driver/Postgresql/IndexManager.php +++ b/src/Driver/Postgresql/IndexManager.php @@ -19,8 +19,8 @@ class IndexManager extends AbstractManager implements IndexManagerInterface $sql = " SELECT - i.schemaname schema, - i.indexname name, + i.schemaname \"schema\", + i.indexname \"name\", i.indexdef definition, i.tablename table_name FROM diff --git a/src/Driver/Postgresql/MaterializedViewManager.php b/src/Driver/Postgresql/MaterializedViewManager.php index b6acc1d7438063cdd017b0ab663417426685c143..3bbf40a3e29473d7bcb99607d5eee15c0f931053 100644 --- a/src/Driver/Postgresql/MaterializedViewManager.php +++ b/src/Driver/Postgresql/MaterializedViewManager.php @@ -18,8 +18,8 @@ class MaterializedViewManager extends AbstractManager implements MaterializedVie $q = " SELECT - schemaname schema, - matviewname name, + schemaname \"schema\", + matviewname \"name\", definition FROM pg_catalog.pg_matviews diff --git a/src/Driver/Postgresql/ProcedureManager.php b/src/Driver/Postgresql/ProcedureManager.php index eecae6790091afaf30c7fa3dc51dd8d0975d3c30..3405c3368cefbde60db8d72e3a618b0b14fea8fd 100644 --- a/src/Driver/Postgresql/ProcedureManager.php +++ b/src/Driver/Postgresql/ProcedureManager.php @@ -18,8 +18,8 @@ class ProcedureManager extends AbstractManager implements ProcedureManagerIntefa $q = " SELECT - n.nspname schema, - p.proname name, + n.nspname \"schema\", + p.proname \"name\", pg_catalog.pg_get_functiondef(p.oid) definition, pg_catalog.pg_get_function_result(p.oid) return, pg_catalog.pg_get_function_arguments(p.oid) arguments diff --git a/src/Driver/Postgresql/SchemaManager.php b/src/Driver/Postgresql/SchemaManager.php index 49ede925f6ed6388843e2f5853cfca312138df6e..03511c0e06232fc7fa23ecfe9179a43bca6bfa03 100644 --- a/src/Driver/Postgresql/SchemaManager.php +++ b/src/Driver/Postgresql/SchemaManager.php @@ -18,7 +18,7 @@ class SchemaManager extends AbstractManager implements SchemaManagerInterface $qr = $this->bdd->select(" SELECT - schema_name name + schema_name \"name\" FROM information_schema.schemata WHERE diff --git a/src/Driver/Postgresql/SequenceManager.php b/src/Driver/Postgresql/SequenceManager.php index 2dc03dba3852e6e99b9a82f7ec955557e7e93a63..cef45d7ba816e3cafee029662d86cfc744cb4aff 100644 --- a/src/Driver/Postgresql/SequenceManager.php +++ b/src/Driver/Postgresql/SequenceManager.php @@ -18,8 +18,8 @@ class SequenceManager extends AbstractManager implements SequenceManagerInterfac $qr = $this->bdd->select(" SELECT - sequence_schema schema, - sequence_name name + sequence_schema \"schema\", + sequence_name \"name\" FROM information_schema.sequences WHERE diff --git a/src/Driver/Postgresql/TableManager.php b/src/Driver/Postgresql/TableManager.php index d35bdcd413f565bebc8a8196e6e707a339ad7d26..d4906f311e3d6296d741685025f20987cd63b60e 100644 --- a/src/Driver/Postgresql/TableManager.php +++ b/src/Driver/Postgresql/TableManager.php @@ -50,8 +50,8 @@ class TableManager extends AbstractManager implements TableManagerInterface $sql = " SELECT - table_schema schema, - table_name name + table_schema \"schema\", + table_name \"name\" FROM information_schema.tables WHERE @@ -78,21 +78,21 @@ class TableManager extends AbstractManager implements TableManagerInterface $data = []; $q = "SELECT - ns.nspname schema, - t.relname name, - 'N' temporary, + ns.nspname \"schema\", + t.relname \"name\", + 'N' \"temporary\", 'NO' logging, c.column_name cname, - c.data_type type, + c.data_type \"type\", c.character_maximum_length length, c.numeric_scale scale, COALESCE(c.datetime_precision,c.numeric_precision) \"precision\", c.is_nullable nullable, - c.column_default default, - c.ordinal_position position, + c.column_default \"default\", + c.ordinal_position \"position\", pg_catalog.col_description(pgcc.oid, c.ordinal_position::int) col_commentaire, obj_description(t.oid) commentaire, - s.sequence_name sequence + s.sequence_name \"sequence\" FROM pg_catalog.pg_class t JOIN pg_catalog.pg_namespace ns ON ns.oid = t.relnamespace @@ -384,6 +384,10 @@ class TableManager extends AbstractManager implements TableManagerInterface $column['type'] = Bdd::TYPE_STRING; break; + case 'character': + $column['type'] = Bdd::TYPE_STRING; + break; + case 'uuid': $column['type'] = Bdd::TYPE_STRING; break; diff --git a/src/Driver/Postgresql/TriggerManager.php b/src/Driver/Postgresql/TriggerManager.php index fa06ecd9efaa7328115916ec4329d91457722efb..e42078311e4e9b85d7009258ac42b466197add1f 100644 --- a/src/Driver/Postgresql/TriggerManager.php +++ b/src/Driver/Postgresql/TriggerManager.php @@ -18,8 +18,8 @@ class TriggerManager extends AbstractManager implements TriggerManagerInterface $q = " SELECT - n.nspname schema, - t.tgname name, + n.nspname \"schema\", + t.tgname \"name\", c.relname table_name, pg_catalog.pg_get_triggerdef(t.oid, true) definition, CASE t.tgenabled diff --git a/src/Driver/Postgresql/ViewManager.php b/src/Driver/Postgresql/ViewManager.php index 6e971b9bd18273f0adbb6acde94d3b880d44fd18..a69159d3048a7ce27f8b55282f112543d71f3c0c 100644 --- a/src/Driver/Postgresql/ViewManager.php +++ b/src/Driver/Postgresql/ViewManager.php @@ -18,8 +18,8 @@ class ViewManager extends AbstractManager implements ViewManagerInterface $q = " SELECT - v.table_schema schema, - v.table_name name, + v.table_schema \"schema\", + v.table_name \"name\", v.view_definition definition FROM information_schema.views v