X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fschema.php;h=e4b7f416cd7fa7a4e474e9548e8831e876702e46;hb=3b6f738ab73b7f77dd09ac21dd9446876776fc04;hp=da43c0559ab8255cfcd549e264b5caca3975a6f1;hpb=229c7726344714187dad2641879cb9c4211cc85d;p=quix0rs-gnu-social.git
diff --git a/lib/schema.php b/lib/schema.php
index da43c0559a..e4b7f416cd 100644
--- a/lib/schema.php
+++ b/lib/schema.php
@@ -119,14 +119,13 @@ class Schema
/**
* Creates a table with the given names and columns.
*
- * @param string $name Name of the table
- * @param array $columns Array of ColumnDef objects
- * for new table.
+ * @param string $tableName Name of the table
+ * @param array $def Table definition array listing fields and indexes.
*
* @return boolean success flag
*/
- public function createTable($name, $columns)
+ public function createTable($tableName, $def)
{
$statements = $this->buildCreateTable($tableName, $def);
return $this->runSqlSet($statements);
@@ -143,6 +142,7 @@ class Schema
*/
public function buildCreateTable($name, $def)
{
+ $def = $this->validateDef($name, $def);
$def = $this->filterDef($def);
$sql = array();
@@ -150,7 +150,7 @@ class Schema
$this->appendColumnDef($sql, $col, $colDef);
}
- // Primary and unique keys are constraints, so go within
+ // Primary, unique, and foreign keys are constraints, so go within
// the CREATE TABLE statement normally.
if (!empty($def['primary key'])) {
$this->appendPrimaryKeyDef($sql, $def['primary key']);
@@ -162,6 +162,12 @@ class Schema
}
}
+ if (!empty($def['foreign keys'])) {
+ foreach ($def['foreign keys'] as $keyName => $keyDef) {
+ $this->appendForeignKeyDef($sql, $keyName, $keyDef);
+ }
+ }
+
// Multi-value indexes are advisory and for best portability
// should be created as separate statements.
$statements = array();
@@ -226,7 +232,7 @@ class Schema
}
/**
- * Append an SQL fragment with a constraint definition for a primary
+ * Append an SQL fragment with a constraint definition for a unique
* key in a CREATE TABLE statement.
*
* @param array $sql
@@ -235,7 +241,31 @@ class Schema
*/
function appendUniqueKeyDef(array &$sql, $name, array $def)
{
- $sql[] = "UNIQUE $name " . $this->buildIndexList($def);
+ $sql[] = "CONSTRAINT $name UNIQUE " . $this->buildIndexList($def);
+ }
+
+ /**
+ * Append an SQL fragment with a constraint definition for a foreign
+ * key in a CREATE TABLE statement.
+ *
+ * @param array $sql
+ * @param string $name
+ * @param array $def
+ */
+ function appendForeignKeyDef(array &$sql, $name, array $def)
+ {
+ if (count($def) != 2) {
+ throw new Exception("Invalid foreign key def for $name: " . var_export($def, true));
+ }
+ list($refTable, $map) = $def;
+ $srcCols = array_keys($map);
+ $refCols = array_values($map);
+ $sql[] = "CONSTRAINT $name FOREIGN KEY " .
+ $this->buildIndexList($srcCols) .
+ " REFERENCES " .
+ $this->quoteIdentifier($refTable) .
+ " " .
+ $this->buildIndexList($refCols);
}
/**
@@ -252,6 +282,19 @@ class Schema
$statements[] = "CREATE INDEX $name ON $table " . $this->buildIndexList($def);
}
+ /**
+ * Append an SQL statement to drop an index from a table.
+ *
+ * @param array $statements
+ * @param string $table
+ * @param string $name
+ * @param array $def
+ */
+ function appendDropIndex(array &$statements, $table, $name)
+ {
+ $statements[] = "DROP INDEX $name ON " . $this->quoteIdentifier($table);
+ }
+
function buildIndexList(array $def)
{
// @fixme
@@ -449,6 +492,9 @@ class Schema
{
$ok = true;
foreach ($statements as $sql) {
+ if (defined('DEBUG_INSTALLER')) {
+ echo "" . htmlspecialchars($sql) . "
\n";
+ }
$res = $this->conn->query($sql);
if (PEAR::isError($res)) {
@@ -475,31 +521,28 @@ class Schema
* @return array of SQL statements
*/
- function buildEnsureTable($tableName, $def)
+ function buildEnsureTable($tableName, array $def)
{
try {
$old = $this->getTableDef($tableName);
- } catch (Exception $e) {
- // @fixme this is a terrible check :D
- if (preg_match('/no such table/', $e->getMessage())) {
- return $this->buildCreateTable($tableName, $def);
- } else {
- throw $e;
- }
+ } catch (SchemaTableMissingException $e) {
+ return $this->buildCreateTable($tableName, $def);
}
- $old = $this->filterDef($old);
+ // Filter the DB-independent table definition to match the current
+ // database engine's features and limitations.
+ $def = $this->validateDef($tableName, $def);
$def = $this->filterDef($def);
- // @fixme check if not present
- $fields = $this->diffArrays($old['fields'], $def['fields'], array($this, 'columnsEqual'));
- $uniques = $this->diffArrays($old['unique keys'], $def['unique keys']);
- $indexes = $this->diffArrays($old['indexes'], $def['indexes']);
+ $statements = array();
+ $fields = $this->diffArrays($old, $def, 'fields', array($this, 'columnsEqual'));
+ $uniques = $this->diffArrays($old, $def, 'unique keys');
+ $indexes = $this->diffArrays($old, $def, 'indexes');
+ $foreign = $this->diffArrays($old, $def, 'foreign keys');
- $total = $fields['count'] + $uniques['count'] + $indexes['count'];
- if ($total == 0) {
- // nothing to do
- return array();
+ // Drop any obsolete or modified indexes ahead...
+ foreach ($indexes['del'] + $indexes['mod'] as $indexName) {
+ $this->appendDropIndex($statements, $tableName, $indexName);
}
// For efficiency, we want this all in one
@@ -507,6 +550,10 @@ class Schema
$phrase = array();
+ foreach ($foreign['del'] + $foreign['mod'] as $keyName) {
+ $this->appendAlterDropForeign($phrase, $keyName);
+ }
+
foreach ($uniques['del'] + $uniques['mod'] as $keyName) {
$this->appendAlterDropUnique($phrase, $keyName);
}
@@ -530,16 +577,32 @@ class Schema
$this->appendAlterAddUnique($phrase, $keyName, $def['unique keys'][$keyName]);
}
- $sql = 'ALTER TABLE ' . $tableName . ' ' . implode(",\n", $phrase);
+ foreach ($foreign['mod'] + $foreign['add'] as $keyName) {
+ $this->appendAlterAddForeign($phrase, $keyName, $def['foreign keys'][$keyName]);
+ }
- return array($sql);
+ $this->appendAlterExtras($phrase, $tableName);
+
+ if (count($phrase) > 0) {
+ $sql = 'ALTER TABLE ' . $tableName . ' ' . implode(",\n", $phrase);
+ $statements[] = $sql;
+ }
+
+ // Now create any indexes...
+ foreach ($indexes['mod'] + $indexes['add'] as $indexName) {
+ $this->appendCreateIndex($statements, $tableName, $indexName, $def['indexes'][$indexName]);
+ }
+
+ return $statements;
}
- function diffArrays($old, $new, $compareCallback=null)
+ function diffArrays($oldDef, $newDef, $section, $compareCallback=null)
{
+ $old = isset($oldDef[$section]) ? $oldDef[$section] : array();
+ $new = isset($newDef[$section]) ? $newDef[$section] : array();
- $oldKeys = array_keys($old ? $old : array());
- $newKeys = array_keys($new ? $new : array());
+ $oldKeys = array_keys($old);
+ $newKeys = array_keys($new);
$toadd = array_diff($newKeys, $oldKeys);
$todrop = array_diff($oldKeys, $newKeys);
@@ -553,7 +616,7 @@ class Schema
if ($compareCallback) {
$same = call_user_func($compareCallback, $old[$name], $new[$name]);
} else {
- $same = ($old[$name] != $new[$name]);
+ $same = ($old[$name] == $new[$name]);
}
if ($same) {
$tokeep[] = $name;
@@ -618,7 +681,15 @@ class Schema
$sql = array();
$sql[] = 'ADD';
$this->appendUniqueKeyDef($sql, $keyName, $def);
- $phrase[] = implode(' ', $sql);'ADD CONSTRAINT ' . $keyName;
+ $phrase[] = implode(' ', $sql);
+ }
+
+ function appendAlterAddForeign(array &$phrase, $keyName, array $def)
+ {
+ $sql = array();
+ $sql[] = 'ADD';
+ $this->appendForeignKeyDef($sql, $keyName, $def);
+ $phrase[] = implode(' ', $sql);
}
function appendAlterDropUnique(array &$phrase, $keyName)
@@ -626,6 +697,16 @@ class Schema
$phrase[] = 'DROP CONSTRAINT ' . $keyName;
}
+ function appendAlterDropForeign(array &$phrase, $keyName)
+ {
+ $phrase[] = 'DROP FOREIGN KEY ' . $keyName;
+ }
+
+ function appendAlterExtras(array &$phrase, $tableName)
+ {
+ // no-op
+ }
+
/**
* Quote a db/table/column identifier if necessary.
*
@@ -648,11 +729,7 @@ class Schema
function quoteValue($val)
{
- if (is_int($val) || is_float($val) || is_double($val)) {
- return strval($val);
- } else {
- return '"' . $this->conn->escapeSimple($val) . '"';
- }
+ return $this->conn->quoteSmart($val);
}
/**
@@ -750,15 +827,17 @@ class Schema
function typeAndSize($column)
{
- $type = $this->mapType($column);
+ //$type = $this->mapType($column);
+ $type = $column['type'];
+ if (isset($column['size'])) {
+ $type = $column['size'] . $type;
+ }
$lengths = array();
- if ($column['type'] == 'numeric') {
- if (isset($column['precision'])) {
- $lengths[] = $column['precision'];
- if (isset($column['scale'])) {
- $lengths[] = $column['scale'];
- }
+ if (isset($column['precision'])) {
+ $lengths[] = $column['precision'];
+ if (isset($column['scale'])) {
+ $lengths[] = $column['scale'];
}
} else if (isset($column['length'])) {
$lengths[] = $column['length'];
@@ -771,27 +850,16 @@ class Schema
}
}
- /**
- * Map a native type back to an independent type + size
- *
- * @param string $type
- * @return array ($type, $size) -- $size may be null
- */
- protected function reverseMapType($type)
- {
- return array($type, null);
- }
-
/**
* Convert an old-style set of ColumnDef objects into the current
* Drupal-style schema definition array, for backwards compatibility
* with plugins written for 0.9.x.
*
* @param string $tableName
- * @param array $defs
+ * @param array $defs: array of ColumnDef objects
* @return array
*/
- function oldToNew($tableName, $defs)
+ protected function oldToNew($tableName, array $defs)
{
$table = array();
$prefixes = array(
@@ -801,7 +869,6 @@ class Schema
'big',
);
foreach ($defs as $cd) {
- $cd->addToTableDef($table);
$column = array();
$column['type'] = $cd->type;
foreach ($prefixes as $prefix) {
@@ -820,7 +887,7 @@ class Schema
if (!$cd->nullable) {
$column['not null'] = true;
}
- if ($cd->autoincrement) {
+ if ($cd->auto_increment) {
$column['type'] = 'serial';
}
if ($cd->default) {
@@ -865,6 +932,31 @@ class Schema
return $tableDef;
}
+ /**
+ * Validate a table definition array, checking for basic structure.
+ *
+ * If necessary, converts from an old-style array of ColumnDef objects.
+ *
+ * @param string $tableName
+ * @param array $def: table definition array
+ * @return array validated table definition array
+ *
+ * @throws Exception on wildly invalid input
+ */
+ function validateDef($tableName, array $def)
+ {
+ if (count($def) && $def[0] instanceof ColumnDef) {
+ $def = $this->oldToNew($tableName, $def);
+ }
+
+ // A few quick checks :D
+ if (!isset($def['fields'])) {
+ throw new Exception("Invalid table definition for $tableName: no fields.");
+ }
+
+ return $def;
+ }
+
function isNumericType($type)
{
$type = strtolower($type);