Doctrine

Timestamp:

09/26/08 18:31:22 (9 months ago)

Author:

jwage

Message:

[1.0] fixes #1337 Fixes issue with oracle export driver

Location:

branches/1.0

Files:

• lib/Doctrine/Export.php (modified) (4 diffs)
• lib/Doctrine/Export/Oracle.php (modified) (2 diffs)
• tests/Export/OracleTestCase.php (modified) (1 diff)

branches/1.0/lib/Doctrine/Export.php

@@ -1107 +1107 @@
                      'create_sequences' => array(),
                      'create_indexes'   => array(),
-                     'alters'           => array()
+                     'alters'           => array(),
+                     'create_triggers'  => array(),
                  );
              }
@@ -1140 +1141 @@
                  }
 
-                 // If alter table statement
-                 if (substr($query, 0, strlen('ALTER TABLE')) == 'ALTER TABLE') {
+                 // If alter table statement or oracle anonymous block enclosing alter
+                 if (substr($query, 0, strlen('ALTER TABLE')) == 'ALTER TABLE'
+                       || substr($query, 0, strlen('DECLARE')) == 'DECLARE') {
                      $connections[$connectionName]['alters'][] = $query;
 
@@ -1147 +1149 @@
                      continue;
                  }
+                 
+                 // If create trgger statement
+                 if (substr($query, 0, strlen('CREATE TRIGGER')) == 'CREATE TRIGGER') {
+                        $connections[$connectionName]['create_triggers'][] = $query;
+                        
+                        unset($sql[$key]);
+                        continue;
+                 }
              }
          }
@@ -1153 +1163 @@
          $build = array();
          foreach ($connections as $connectionName => $sql) {
-             $build[$connectionName] = array_unique(array_merge($sql['create_tables'], $sql['create_sequences'], $sql['create_indexes'], $sql['alters']));
+             $build[$connectionName] = array_unique(array_merge($sql['create_tables'], $sql['create_sequences'], $sql['create_indexes'], $sql['alters'], $sql['create_triggers']));
          }
 

branches/1.0/lib/Doctrine/Export/Oracle.php

@@ -103 +103 @@
             'fields' => array($name => true),
         );
-
-        $sql[] = $this->createConstraintSql($table, $indexName, $definition);
-
+                
+        $sql[] = 'DECLARE
+  constraints_Count NUMBER;
+BEGIN
+  SELECT COUNT(CONSTRAINT_NAME) INTO constraints_Count FROM USER_CONSTRAINTS WHERE TABLE_NAME = \''.$table.'\' AND CONSTRAINT_TYPE = \'P\';
+  IF constraints_Count = 0 THEN
+    EXECUTE IMMEDIATE \''.$this->createConstraintSql($table, $indexName, $definition).'\';
+  END IF;
+END;';   
+                
         if (is_null($start)) {
             $query = 'SELECT MAX(' . $this->conn->quoteIdentifier($name, true) . ') FROM ' . $this->conn->quoteIdentifier($table, true);
@@ -139 +146 @@
       END LOOP;
    END IF;
-END;
-';
+END;';
         return $sql;
     }

branches/1.0/tests/Export/OracleTestCase.php

@@ -106 +106 @@
 
         $this->assertEqual($this->adapter->pop(), 'COMMIT');
-        $this->assertEqual(substr($this->adapter->pop(),0, 14), 'CREATE TRIGGER');
+        $this->assertEqual(substr($this->adapter->pop(), 0, 14), 'CREATE TRIGGER');
         $this->assertEqual($this->adapter->pop(), 'CREATE SEQUENCE MYTABLE_seq START WITH 1 INCREMENT BY 1 NOCACHE');  
-        $this->assertEqual($this->adapter->pop(), 'ALTER TABLE MYTABLE ADD CONSTRAINT MYTABLE_AI_PK_idx PRIMARY KEY (id)');
+        $this->assertEqual(substr($this->adapter->pop(), 0, 7), "DECLARE");
         $this->assertEqual($this->adapter->pop(), 'CREATE TABLE mytable (id INT)');
         $this->assertEqual($this->adapter->pop(), 'BEGIN TRANSACTION');