Changeset 9947

Timestamp:

11/17/08 03:39:00 (2 months ago)

Author:

afz

Message:

Update MDB2_Schema to 0.8.3(changed some part by myself)

Files:

• branches/0.8/jaws/html/libraries/pear/MDB2/Schema.php (modified) (7 diffs)
• branches/0.8/jaws/html/libraries/pear/MDB2/Schema/Validate.php (modified) (4 diffs)

branches/0.8/jaws/html/libraries/pear/MDB2/Schema.php

@@ -44 +44 @@
-// +----------------------------------------------------------------------+
-//
-3 2008/03/24 19:12:32
+7 2008/11/17 00:11:13
-//
-
@@ -421 +421 @@
-            'create' => true,
-            'overwrite' => false,
-
+utf8
-            'description' => '',
-            'comments' => '',
@@ -1282 +1282 @@
-
-            $dbOptions = array();
-
+
+
-                $dbOptions['charset'] = $database_definition['charset'];
-            }
@@ -1403 +1404 @@
-                foreach ($previous_definition['tables'] as $table_name => $table) {
-                    if (empty($defined_tables[$table_name])) {
-
+tables']['
-                    }
-                }
@@ -1431 +1432 @@
-                foreach ($previous_definition['sequences'] as $sequence_name => $sequence) {
-                    if (empty($defined_sequences[$sequence_name])) {
-
+sequences']['
-                    }
-                }
@@ -1483 +1484 @@
-                    }
-                    if (!empty($change)) {
+                        if (array_key_exists('default', $change)
+                            && $change['default']
+                            && !array_key_exists('default', $field)) {
+                                $field['default'] = NULL;
+                        }
-                        $change['definition'] = $field;
-                        $changes['change'][$field_name] = $change;
@@ -1864 +1870 @@
-            foreach ($changes['change'] as $index_name => $index) {
-                if (!empty($index['primary']) || !empty($index['unique'])) {
+                    $this->db->expectError(MDB2_ERROR_NOT_FOUND);
+                    $result = $this->db->manager->dropIndex($table_name, $index_name);
+                    $this->db->popExpect();
+                    if (PEAR::isError($result) && !MDB2::isError($result, MDB2_ERROR_NOT_FOUND)) {
+                        return $result;
+                    }
-                    $this->db->expectError(MDB2_ERROR_NOT_FOUND);
-                    $result = $this->db->manager->dropConstraint($table_name, $index_name, !empty($index['primary']));

branches/0.8/jaws/html/libraries/pear/MDB2/Schema/Validate.php

@@ -44 +44 @@
-// +----------------------------------------------------------------------+
-//
-38 2008/02/06 23:13:51
+40 2008/11/15 23:53:47
-//
-
@@ -204 +204 @@
-        foreach ($table['fields'] as $field_name => $field) {
-            if (!empty($field['autoincrement'])) {
-primary
+autoinc
-                    return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
-                        'there was already an autoincrement field in "'.$table_name.'" before "'.$field_name.'"');
-                }
-primary = tru
+field_nam
-            }
-        }
@@ -227 +227 @@
-                     * a primary key index.
-                     */
-
+
+
-                        $skip_index = true;
-
+autoinc || $
-                        return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
-                            'there was already an primary index or autoincrement field in "'.$table_name.'" before "'.$name.'"');
@@ -873 +874 @@
-        case 'timestamp':
-            if (!preg_match('/([0-9]{4})-([0-9]{1,2})-([0-9]{1,2}) ([0-9]{2}):([0-9]{2}):([0-9]{2})/', $field_value)
+                && strcasecmp($field_value, 'now()') != 0
-                && $field_value !== 'CURRENT_TIMESTAMP'
-            ) {