Doctrine

Timestamp:

10/21/08 08:58:04 (9 months ago)

Author:

adrive

Message:

[1.0, 1.1] Fixes #1588: Oracle building schema does not detect foreign keys

Location:

branches/1.0

Files:

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

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

@@ -121 +121 @@
     public function listTableColumns($table)
     {
-        $table  = strtoupper($table);
         $sql    = "SELECT column_name, data_type, data_length, nullable, data_default, data_scale, data_precision FROM all_tab_columns"
-                . " WHERE table_name = '" . $table . "' ORDER BY column_name";
+                . " WHERE table_name = '" . $table . "' ORDER BY column_id";
 
         $result = $this->conn->fetchAssoc($sql);
@@ -169 +168 @@
         return array_map(array($this->conn->formatter, 'fixIndexName'), $indexes);
     }
-
+    
+    /**
+     * list table relations
+     */
+    public function listTableRelations($table)
+    {
+        $relations = array();
+        $sql  = 'SELECT ac.table_name AS referenced_table_name, lcc.column_name AS local_column_name, rcc.column_name AS referenced_column_name '
+              . 'FROM all_constraints ac '
+              . 'JOIN all_cons_columns lcc ON ac.r_constraint_name = lcc.constraint_name '
+              . 'JOIN all_cons_columns rcc ON ac.constraint_name = rcc.constraint_name '
+              . "WHERE ac.constraint_type = 'R'" 
+              . "AND ac.r_constraint_name IN (SELECT constraint_name FROM all_constraints WHERE constraint_type IN ('P', 'U') AND table_name ='$table')";
+        
+        $results = $this->conn->fetchAssoc($sql);
+        foreach ($results as $result) 
+        {
+            $result = array_change_key_case($result, CASE_LOWER);
+            $relations[] = array('table'   => $result['referenced_table_name'],
+                                 'local'   => $result['column_name'],
+                                 'foreign' => $result['referenced_column_name']);
+        }
+        return $relations;
+    }
     /**
      * lists tables

branches/1.0/tests/Import/OracleTestCase.php

@@ -45 +45 @@
         $this->import->listTableColumns('table');
 
-        $q = "SELECT column_name, data_type, data_length, nullable, data_default, data_scale, data_precision FROM all_tab_columns WHERE table_name = 'TABLE' ORDER BY column_name";
+        $q = "SELECT column_name, data_type, data_length, nullable, data_default, data_scale, data_precision FROM all_tab_columns WHERE table_name = 'table' ORDER BY column_id";
 
         $this->assertEqual($this->adapter->pop(), $q);