cvs: pear /MDB2/MDB2/Driver/Reverse pgsql.php
| From: | Lukas Smith | Date: | Fri, 14 Oct 2005 10:43:20 +0000 |
| Subject: | cvs: pear /MDB2/MDB2/Driver/Reverse pgsql.php | ||
| Groups: | php.pear.cvs | ||
| Request: | Send a blank email to pear-cvs+get-35519@lists.php.net to get a copy of this message | ||
lsmith Fri Oct 14 06:43:20 2005 EDT
Modified files:
/pear/MDB2/MDB2/Driver/Reverse pgsql.php
Log:
- added support for primary keys in getIndexDefinition()
http://cvs.php.net/diff.php/pear/MDB2/MDB2/Driver/Reverse/pgsql.php?r1=1.24&r2=1.25&ty=u
Index: pear/MDB2/MDB2/Driver/Reverse/pgsql.php
diff -u pear/MDB2/MDB2/Driver/Reverse/pgsql.php:1.24 pear/MDB2/MDB2/Driver/Reverse/pgsql.php:1.25
--- pear/MDB2/MDB2/Driver/Reverse/pgsql.php:1.24 Fri Oct 7 06:29:26 2005
+++ pear/MDB2/MDB2/Driver/Reverse/pgsql.php Fri Oct 14 06:43:20 2005
@@ -42,7 +42,7 @@
// | Author: Paul Cooper <pgc@ucecom.com> |
// +----------------------------------------------------------------------+
//
-// $Id: pgsql.php,v 1.24 2005/10/07 10:29:26 lsmith Exp $
+// $Id: pgsql.php,v 1.25 2005/10/14 10:43:20 lsmith Exp $
require_once 'MDB2/Driver/Reverse/Common.php';
@@ -95,7 +95,6 @@
if (PEAR::isError($column)) {
return $column;
}
-
list($types, $length) = $db->datatype->mapNativeDatatype($column);
$notnull = false;
if (array_key_exists('attnotnull', $column) &&
$column['attnotnull'] == 't') {
@@ -152,7 +151,7 @@
return $db;
}
- $query = "SELECT * FROM pg_index, pg_class
+ $query = "SELECT relname, indisunique, indisprimary, indkey FROM pg_index, pg_class
WHERE (pg_class.relname='$index_name') AND
(pg_class.oid=pg_index.indexrelid)";
$row = $db->queryRow($query, null, MDB2_FETCHMODE_ASSOC);
if (PEAR::isError($row)) {
@@ -167,7 +166,9 @@
$columns = $db->manager->listTableFields($table);
$definition = array();
- if ($row['indisunique'] == 't') {
+ if ($row['indisprimary'] == 't') {
+ $definition['primary'] = true;
+ } elseif ($row['indisunique'] == 't') {
$definition['unique'] = true;
}