$orderedFields[$row['ordinal_position']] = $name;
$field = array();
-
- // ??
- list($type, $size) = $this->reverseMapType($row['udt_name']);
- $field['type'] = $type;
- if ($size !== null) {
- $field['size'] = $size;
- }
+ $field['type'] = $row['udt_name'];
if ($type == 'char' || $type == 'varchar') {
if ($row['character_maximum_length'] !== null) {
}
}
+ /**
+ * Append an SQL statement to drop an index from a table.
+ * Note that in PostgreSQL, index names are DB-unique.
+ *
+ * @param array $statements
+ * @param string $table
+ * @param string $name
+ * @param array $def
+ */
+ function appendDropIndex(array &$statements, $table, $name)
+ {
+ $statements[] = "DROP INDEX $name";
+ }
+
/**
* Quote a db/table/column identifier if necessary.
*
*/
function quoteIdentifier($name)
{
- return '"' . $name . '"';
+ return $this->conn->quoteIdentifier($name);
}
function mapType($column)
$type = $map[$type];
}
- if (!empty($column['size'])) {
- $size = $column['size'];
- if ($type == 'integer' &&
- in_array($size, array('small', 'big'))) {
- $type = $size . 'int';
+ if ($type == 'int') {
+ if (!empty($column['size'])) {
+ $size = $column['size'];
+ if ($size == 'small') {
+ return 'int2';
+ } else if ($size == 'big') {
+ return 'int8';
+ }
}
+ return 'int4';
}
return $type;
}
}
- /**
- * 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)
- {
- $type = strtolower($type);
- $map = array(
- 'int4' => array('int', null),
- 'int8' => array('int', 'big'),
- 'bytea' => array('blob', null),
- );
- if (isset($map[$type])) {
- return $map[$type];
- } else {
- return array($type, null);
- }
- }
-
/**
* Filter the given table definition array to match features available
* in this database.
*/
function filterDef(array $tableDef)
{
- foreach (array_keys($tableDef['fields']) as $name => &$col) {
+ foreach ($tableDef['fields'] as $name => &$col) {
// No convenient support for field descriptions
unset($col['description']);
+ /*
if (isset($col['size'])) {
// Don't distinguish between tinyint and int.
if ($col['size'] == 'tiny' && $col['type'] == 'int') {
unset($col['size']);
}
}
+ */
+ $col['type'] = $this->mapType($col);
+ unset($col['size']);
+ }
+ if (!empty($tableDef['primary key'])) {
+ $tableDef['primary key'] = $this->filterKeyDef($tableDef['primary key']);
+ }
+ if (!empty($tableDef['unique keys'])) {
+ foreach ($tableDef['unique keys'] as $i => $def) {
+ $tableDef['unique keys'][$i] = $this->filterKeyDef($def);
+ }
}
return $tableDef;
}
+ /**
+ * Filter the given key/index definition to match features available
+ * in this database.
+ *
+ * @param array $def
+ * @return array
+ */
+ function filterKeyDef(array $def)
+ {
+ // PostgreSQL doesn't like prefix lengths specified on keys...?
+ foreach ($def as $i => $item)
+ {
+ if (is_array($item)) {
+ $def[$i] = $item[0];
+ }
+ }
+ return $def;
+ }
}