cvs: pear /MDB2/MDB2/Driver/Reverse ibase.php
| From: | Lorenzo Alberton | Date: | Fri, 17 Feb 2006 18:32:52 +0000 |
| Subject: | cvs: pear /MDB2/MDB2/Driver/Reverse ibase.php | ||
| Groups: | php.pear.cvs | ||
| Request: | Send a blank email to pear-cvs+get-38335@lists.php.net to get a copy of this message | ||
quipo Fri Feb 17 18:32:52 2006 UTC
Modified files:
/pear/MDB2/MDB2/Driver/Reverse ibase.php
Log:
discard all constraints in getTableIndexDefinition()
http://cvs.php.net/viewcvs.cgi/pear/MDB2/MDB2/Driver/Reverse/ibase.php?r1=1.35&r2=1.36&diff_format=u
Index: pear/MDB2/MDB2/Driver/Reverse/ibase.php
diff -u pear/MDB2/MDB2/Driver/Reverse/ibase.php:1.35 pear/MDB2/MDB2/Driver/Reverse/ibase.php:1.36
--- pear/MDB2/MDB2/Driver/Reverse/ibase.php:1.35 Fri Jan 13 20:39:05 2006
+++ pear/MDB2/MDB2/Driver/Reverse/ibase.php Fri Feb 17 18:32:52 2006
@@ -42,7 +42,7 @@
// | Author: Lorenzo Alberton <l.alberton@quipo.it> |
// +----------------------------------------------------------------------+
//
-// $Id: ibase.php,v 1.35 2006/01/13 20:39:05 quipo Exp $
+// $Id: ibase.php,v 1.36 2006/02/17 18:32:52 quipo Exp $
//
require_once 'MDB2/Driver/Reverse/Common.php';
@@ -227,14 +227,13 @@
RDB\$INDICES.RDB\$UNIQUE_FLAG AS unique_flag,
RDB\$INDICES.RDB\$FOREIGN_KEY AS foreign_key,
RDB\$INDICES.RDB\$DESCRIPTION AS description,
- RDB\$RELATION_CONSTRAINTS.RDB\$CONSTRAINT_TYPE as constraint_type
+ RDB\$RELATION_CONSTRAINTS.RDB\$CONSTRAINT_TYPE AS constraint_type
FROM RDB\$INDEX_SEGMENTS
LEFT JOIN RDB\$INDICES ON RDB\$INDICES.RDB\$INDEX_NAME =
RDB\$INDEX_SEGMENTS.RDB\$INDEX_NAME
LEFT JOIN RDB\$RELATION_CONSTRAINTS ON RDB\$RELATION_CONSTRAINTS.RDB\$INDEX_NAME =
RDB\$INDEX_SEGMENTS.RDB\$INDEX_NAME
WHERE UPPER(RDB\$INDICES.RDB\$RELATION_NAME)='$table'
AND UPPER(RDB\$INDICES.RDB\$INDEX_NAME)='$index_name'
- AND (RDB\$RELATION_CONSTRAINTS.RDB\$CONSTRAINT_TYPE IS NULL OR
- RDB\$RELATION_CONSTRAINTS.RDB\$CONSTRAINT_TYPE <> 'PRIMARY
KEY')
+ AND RDB\$RELATION_CONSTRAINTS.RDB\$CONSTRAINT_TYPE IS NULL
ORDER BY RDB\$INDEX_SEGMENTS.RDB\$FIELD_POSITION;";
$result = $db->query($query);
if (PEAR::isError($result)) {
@@ -296,7 +295,7 @@
RDB\$INDICES.RDB\$UNIQUE_FLAG AS unique_flag,
RDB\$INDICES.RDB\$FOREIGN_KEY AS foreign_key,
RDB\$INDICES.RDB\$DESCRIPTION AS description,
- RDB\$RELATION_CONSTRAINTS.RDB\$CONSTRAINT_TYPE as constraint_type
+ RDB\$RELATION_CONSTRAINTS.RDB\$CONSTRAINT_TYPE AS constraint_type
FROM RDB\$INDEX_SEGMENTS
LEFT JOIN RDB\$INDICES ON RDB\$INDICES.RDB\$INDEX_NAME =
RDB\$INDEX_SEGMENTS.RDB\$INDEX_NAME
LEFT JOIN RDB\$RELATION_CONSTRAINTS ON RDB\$RELATION_CONSTRAINTS.RDB\$INDEX_NAME =
RDB\$INDEX_SEGMENTS.RDB\$INDEX_NAME