dblayeroo : PgSQL : get the unique keys correctely

git-svn-id: https://svn.fournier38.fr/svn/ProgSVN/trunk@5039 bf3deb0d-5f1a-0410-827f-c0cc1f45334c
This commit is contained in:
2019-02-15 08:15:24 +00:00
parent 673b8ec609
commit 38b8b4f5a6

View File

@@ -723,8 +723,8 @@ class dblayeroo
} }
} }
ksort ($unique); ksort ($unique);
$unique[] = $primary; if (! in_array ($primary, $unique))
$unique = array_unique ($unique); $unique[] = $primary;
try try
{ {
@@ -827,8 +827,8 @@ class dblayeroo
} }
} }
$unique = array_values ($unique); $unique = array_values ($unique);
$unique[] = $primary; if (! in_array ($primary, $unique))
$unique = array_unique ($unique); $unique[] = $primary;
$st = self::$instance[$this->dsn]->prepare (" $st = self::$instance[$this->dsn]->prepare ("
SELECT UPDATE_RULE,DELETE_RULE,COLUMN_NAME, SELECT UPDATE_RULE,DELETE_RULE,COLUMN_NAME,
kColUsage.REFERENCED_TABLE_NAME,REFERENCED_COLUMN_NAME kColUsage.REFERENCED_TABLE_NAME,REFERENCED_COLUMN_NAME
@@ -939,14 +939,14 @@ class dblayeroo
array ($unique[$col["constraint_name"]]); array ($unique[$col["constraint_name"]]);
$unique[$col["constraint_name"]][] = $col["column_name"]; $unique[$col["constraint_name"]][] = $col["column_name"];
} }
else elseif (! in_array ($col["column_name"], $unique))
{ {
$unique[$col["constraint_name"]] = $col["column_name"]; $unique[$col["constraint_name"]] = $col["column_name"];
} }
} }
$unique = array_values ($unique); $unique = array_values ($unique);
$unique[] = $primary; if (! in_array ($primary, $unique))
$unique = array_unique ($unique); $unique[] = $primary;
$st = self::$instance[$this->dsn]->prepare (" $st = self::$instance[$this->dsn]->prepare ("
SELECT kColUsage1.column_name COLUMN_NAME, SELECT kColUsage1.column_name COLUMN_NAME,
kColUsage2.table_name REFERENCED_TABLE_NAME, kColUsage2.table_name REFERENCED_TABLE_NAME,