tonyair/silverstripe-postgresql
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-postgresql synced 2024-10-22 17:05:45 +02:00
Code Issues Projects Releases Wiki Activity

BUG Fix constraints ignoring schema

Browse Source
This commit is contained in:
Damian Mooyman 2016-01-21 09:28:37 +13:00
parent e46a37090c
commit 3780d1b152
1 changed files with 64 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
code/PostgreSQLSchemaManager.php
View File

@ -506,7 +506,8 @@ class PostgreSQLSchemaManager extends DBSchemaManager
} }
// SET check constraint (The constraint HAS to be dropped) // SET check constraint (The constraint HAS to be dropped)
$existing_constraint=$this->query("SELECT conname FROM pg_constraint WHERE conname='{$tableName}_{$colName}_check';")->value(); $constraintName = "{$tableName}_{$colName}_check";
$constraintExists = $this->constraintExists($constraintName, false);
if (isset($matches[4])) { if (isset($matches[4])) {
//Take this new constraint and see what's outstanding from the target table: //Take this new constraint and see what's outstanding from the target table:
$constraint_bits=explode('(', $matches[4]); $constraint_bits=explode('(', $matches[4]);
@ -529,13 +530,13 @@ class PostgreSQLSchemaManager extends DBSchemaManager
} }
//First, delete any existing constraint on this column, even if it's no longer an enum //First, delete any existing constraint on this column, even if it's no longer an enum
if ($existing_constraint) { if ($constraintExists) {
$alterCol .= ",\nDROP CONSTRAINT \"{$tableName}_{$colName}_check\""; $alterCol .= ",\nDROP CONSTRAINT \"{$constraintName}\"";
} }
//Now create the constraint (if we've asked for one) //Now create the constraint (if we've asked for one)
if (!empty($matches[4])) { if (!empty($matches[4])) {
$alterCol .= ",\nADD CONSTRAINT \"{$tableName}_{$colName}_check\" $matches[4]"; $alterCol .= ",\nADD CONSTRAINT \"{$constraintName}\" $matches[4]";
} }
} }
@ -933,16 +934,26 @@ class PostgreSQLSchemaManager extends DBSchemaManager
* query all over again. * query all over again.
* *
* @param string $constraint * @param string $constraint
* @param bool $cache Flag whether a cached version should be used. Set to false to cache bust.
* @return false|array Either false, if the constraint doesn't exist, or an array
* with the keys conname and pg_get_constraintdef
*/ */
protected function constraintExists($constraint) protected function constraintExists($constraint, $cache = true)
{ {
if (!isset(self::$cached_constraints[$constraint])) { if (!$cache || !isset(self::$cached_constraints[$constraint])) {
$exists = $this->preparedQuery(" $value = $this->preparedQuery("
SELECT conname,pg_catalog.pg_get_constraintdef(r.oid, true) SELECT conname,pg_catalog.pg_get_constraintdef(r.oid, true)
FROM pg_catalog.pg_constraint r WHERE r.contype = 'c' AND conname = ? ORDER BY 1;", FROM pg_catalog.pg_constraint r
array($constraint) INNER JOIN pg_catalog.pg_namespace n
ON r.connamespace = n.oid
WHERE r.contype = 'c' AND conname = ? AND n.nspname = ?
ORDER BY 1;",
array($constraint, $this->database->currentSchema())
)->first(); )->first();
self::$cached_constraints[$constraint]=$exists; if (!$cache) {
return $value;
}
self::$cached_constraints[$constraint] = $value;
} }
return self::$cached_constraints[$constraint]; return self::$cached_constraints[$constraint];
@ -965,10 +976,13 @@ class PostgreSQLSchemaManager extends DBSchemaManager
WHERE c.relname = ? AND pg_catalog.pg_table_is_visible(c.oid) AND n.nspname = ? WHERE c.relname = ? AND pg_catalog.pg_table_is_visible(c.oid) AND n.nspname = ?
);"; );";
$result = $this->preparedQuery($query, $tableName, $this->database->currentSchema()); $result = $this->preparedQuery(
$query,
array($tableName, $this->database->currentSchema())
);
$table = array(); $table = array();
while ($row = pg_fetch_assoc($result)) { foreach ($result as $row) {
$table[] = array( $table[] = array(
'Column' => $row['Column'], 'Column' => $row['Column'],
'DataType' => $row['DataType'] 'DataType' => $row['DataType']
@ -1471,12 +1485,10 @@ class PostgreSQLSchemaManager extends DBSchemaManager
$this->query("CREATE TABLE \"$partition_name\" (CHECK (" . str_replace('NEW.', '', $partition_value) . ")) INHERITS (\"$tableName\")$tableSpace;"); $this->query("CREATE TABLE \"$partition_name\" (CHECK (" . str_replace('NEW.', '', $partition_value) . ")) INHERITS (\"$tableName\")$tableSpace;");
} else { } else {
//Drop the constraint, we will recreate in in the next line //Drop the constraint, we will recreate in in the next line
$existing_constraint = $this->preparedQuery( $constraintName = "{$partition_name}_pkey";
"SELECT conname FROM pg_constraint WHERE conname = ?;", $constraintExists = $this->constraintExists($constraintName, false);
array("{$partition_name}_pkey") if ($constraintExists) {
); $this->query("ALTER TABLE \"$partition_name\" DROP CONSTRAINT \"{$constraintName}\";");
if ($existing_constraint) {
$this->query("ALTER TABLE \"$partition_name\" DROP CONSTRAINT \"{$partition_name}_pkey\";");
} }
$this->dropTrigger(strtolower('trigger_' . $tableName . '_insert'), $tableName); $this->dropTrigger(strtolower('trigger_' . $tableName . '_insert'), $tableName);
} }