Skip to content
Snippets Groups Projects
Commit e258684a authored by Laurent Lecluse's avatar Laurent Lecluse
Browse files

Merge branch 'postgres-fix' into 'main'

[PostgreSQL keywords fix]

See merge request !1
parents 8271d0d3 f6728d84
No related branches found
No related tags found
1 merge request!1[PostgreSQL keywords fix]
Pipeline #28720 passed
...@@ -18,8 +18,8 @@ class FunctionManager extends AbstractManager implements FunctionManagerInteface ...@@ -18,8 +18,8 @@ class FunctionManager extends AbstractManager implements FunctionManagerInteface
$q = " $q = "
SELECT SELECT
n.nspname schema, n.nspname \"schema\",
p.proname name, p.proname \"name\",
pg_catalog.pg_get_functiondef(p.oid) definition, pg_catalog.pg_get_functiondef(p.oid) definition,
pg_catalog.pg_get_function_result(p.oid) return, pg_catalog.pg_get_function_result(p.oid) return,
pg_catalog.pg_get_function_arguments(p.oid) arguments pg_catalog.pg_get_function_arguments(p.oid) arguments
......
...@@ -19,8 +19,8 @@ class IndexManager extends AbstractManager implements IndexManagerInterface ...@@ -19,8 +19,8 @@ class IndexManager extends AbstractManager implements IndexManagerInterface
$sql = " $sql = "
SELECT SELECT
i.schemaname schema, i.schemaname \"schema\",
i.indexname name, i.indexname \"name\",
i.indexdef definition, i.indexdef definition,
i.tablename table_name i.tablename table_name
FROM FROM
......
...@@ -18,8 +18,8 @@ class MaterializedViewManager extends AbstractManager implements MaterializedVie ...@@ -18,8 +18,8 @@ class MaterializedViewManager extends AbstractManager implements MaterializedVie
$q = " $q = "
SELECT SELECT
schemaname schema, schemaname \"schema\",
matviewname name, matviewname \"name\",
definition definition
FROM FROM
pg_catalog.pg_matviews pg_catalog.pg_matviews
......
...@@ -18,8 +18,8 @@ class ProcedureManager extends AbstractManager implements ProcedureManagerIntefa ...@@ -18,8 +18,8 @@ class ProcedureManager extends AbstractManager implements ProcedureManagerIntefa
$q = " $q = "
SELECT SELECT
n.nspname schema, n.nspname \"schema\",
p.proname name, p.proname \"name\",
pg_catalog.pg_get_functiondef(p.oid) definition, pg_catalog.pg_get_functiondef(p.oid) definition,
pg_catalog.pg_get_function_result(p.oid) return, pg_catalog.pg_get_function_result(p.oid) return,
pg_catalog.pg_get_function_arguments(p.oid) arguments pg_catalog.pg_get_function_arguments(p.oid) arguments
......
...@@ -18,7 +18,7 @@ class SchemaManager extends AbstractManager implements SchemaManagerInterface ...@@ -18,7 +18,7 @@ class SchemaManager extends AbstractManager implements SchemaManagerInterface
$qr = $this->bdd->select(" $qr = $this->bdd->select("
SELECT SELECT
schema_name name schema_name \"name\"
FROM FROM
information_schema.schemata information_schema.schemata
WHERE WHERE
......
...@@ -18,8 +18,8 @@ class SequenceManager extends AbstractManager implements SequenceManagerInterfac ...@@ -18,8 +18,8 @@ class SequenceManager extends AbstractManager implements SequenceManagerInterfac
$qr = $this->bdd->select(" $qr = $this->bdd->select("
SELECT SELECT
sequence_schema schema, sequence_schema \"schema\",
sequence_name name sequence_name \"name\"
FROM FROM
information_schema.sequences information_schema.sequences
WHERE WHERE
......
...@@ -50,8 +50,8 @@ class TableManager extends AbstractManager implements TableManagerInterface ...@@ -50,8 +50,8 @@ class TableManager extends AbstractManager implements TableManagerInterface
$sql = " $sql = "
SELECT SELECT
table_schema schema, table_schema \"schema\",
table_name name table_name \"name\"
FROM FROM
information_schema.tables information_schema.tables
WHERE WHERE
...@@ -78,21 +78,21 @@ class TableManager extends AbstractManager implements TableManagerInterface ...@@ -78,21 +78,21 @@ class TableManager extends AbstractManager implements TableManagerInterface
$data = []; $data = [];
$q = "SELECT $q = "SELECT
ns.nspname schema, ns.nspname \"schema\",
t.relname name, t.relname \"name\",
'N' temporary, 'N' \"temporary\",
'NO' logging, 'NO' logging,
c.column_name cname, c.column_name cname,
c.data_type type, c.data_type \"type\",
c.character_maximum_length length, c.character_maximum_length length,
c.numeric_scale scale, c.numeric_scale scale,
COALESCE(c.datetime_precision,c.numeric_precision) \"precision\", COALESCE(c.datetime_precision,c.numeric_precision) \"precision\",
c.is_nullable nullable, c.is_nullable nullable,
c.column_default default, c.column_default \"default\",
c.ordinal_position position, c.ordinal_position \"position\",
pg_catalog.col_description(pgcc.oid, c.ordinal_position::int) col_commentaire, pg_catalog.col_description(pgcc.oid, c.ordinal_position::int) col_commentaire,
obj_description(t.oid) commentaire, obj_description(t.oid) commentaire,
s.sequence_name sequence s.sequence_name \"sequence\"
FROM FROM
pg_catalog.pg_class t pg_catalog.pg_class t
JOIN pg_catalog.pg_namespace ns ON ns.oid = t.relnamespace JOIN pg_catalog.pg_namespace ns ON ns.oid = t.relnamespace
...@@ -384,6 +384,10 @@ class TableManager extends AbstractManager implements TableManagerInterface ...@@ -384,6 +384,10 @@ class TableManager extends AbstractManager implements TableManagerInterface
$column['type'] = Bdd::TYPE_STRING; $column['type'] = Bdd::TYPE_STRING;
break; break;
case 'character':
$column['type'] = Bdd::TYPE_STRING;
break;
case 'uuid': case 'uuid':
$column['type'] = Bdd::TYPE_STRING; $column['type'] = Bdd::TYPE_STRING;
break; break;
......
...@@ -18,8 +18,8 @@ class TriggerManager extends AbstractManager implements TriggerManagerInterface ...@@ -18,8 +18,8 @@ class TriggerManager extends AbstractManager implements TriggerManagerInterface
$q = " $q = "
SELECT SELECT
n.nspname schema, n.nspname \"schema\",
t.tgname name, t.tgname \"name\",
c.relname table_name, c.relname table_name,
pg_catalog.pg_get_triggerdef(t.oid, true) definition, pg_catalog.pg_get_triggerdef(t.oid, true) definition,
CASE t.tgenabled CASE t.tgenabled
......
...@@ -18,8 +18,8 @@ class ViewManager extends AbstractManager implements ViewManagerInterface ...@@ -18,8 +18,8 @@ class ViewManager extends AbstractManager implements ViewManagerInterface
$q = " $q = "
SELECT SELECT
v.table_schema schema, v.table_schema \"schema\",
v.table_name name, v.table_name \"name\",
v.view_definition definition v.view_definition definition
FROM FROM
information_schema.views v information_schema.views v
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment