Doctrine

Timestamp:

06/24/08 04:29:36 (13 months ago)

Author:

jwage

Message:

fixes #625 - Implementing generating relationships from existing databases for MySQL.

Location:

branches/0.11/lib/Doctrine

Files:

• Import.php (modified) (4 diffs)
• Import/Mysql.php (modified) (1 diff)

branches/0.11/lib/Doctrine/Import.php

@@ -105 +105 @@
 
     /**
+     * lists table relations
+     *
+     * Expects an array of this format to be returned with all the relationships in it where the key is 
+     * the name of the foreign table, and the value is an array containing the local and foreign column
+     * name
+     *
+     * Array
+     * (
+     *   [groups] => Array
+     *     (
+     *        [local] => group_id
+     *        [foreign] => id
+     *     )
+     * )
+     *
+     * @param string $table     database table name
+     * @return array
+     */
+    public function listTableRelations($table)
+    {
+        throw new Doctrine_Import_Exception(__FUNCTION__ . ' not supported by this driver.');
+    }
+
+    /**
      * lists table constraints
      *
@@ -356 +380 @@
           $builder->setOptions($options);
 
+          $definitions = array();
           $classes = array();
           foreach ($connection->import->listTables() as $table) {
@@ -362 +387 @@
 
               if( ! isset($options['singularize']) || $options['singularize'] !== false) {
-                  $e = explode('_', Doctrine_Inflector::tableize($table));
-                  foreach ($e as $k => $v) {
-                      $e[$k] = Doctrine_Inflector::singularize($v);
-                  }
-                  $classTable = implode('_', $e);
+                  $classTable = $this->_singularizeTableName($table);
               } else {
                   $classTable = Doctrine_Inflector::tableize($table);
@@ -372 +393 @@
 
               $definition['className'] = Doctrine_Inflector::classify($classTable);
-
               $definition['columns'] = $connection->import->listTableColumns($table);
 
-              $builder->buildRecord($definition);
-
+              try {
+                  $definition['relations'] = array();
+                  $relations = $connection->import->listTableRelations($table);
+                  foreach ($relations as $table => $options) {
+                      if( ! isset($options['singularize']) || $options['singularize'] !== false) {
+                          $relClassTable = $this->_singularizeTableName($table);
+                      } else {
+                          $relClassTable = Doctrine_Inflector::tableize($table);
+                      }
+                      $class = Doctrine_Inflector::classify($relClassTable);
+                      $definition['relations'][$class] = array('local'          => $options['local'],
+                                                               'foreign'        => $options['foreign']);
+                  }
+              } catch (Exception $e) {}
+
+              $definitions[$definition['className']] = $definition;
               $classes[] = $definition['className'];
           }
+
+          // Build opposite end of relationships
+          foreach ($definitions as $defClass => $definition) {
+              foreach ($definition['relations'] as $relClass => $relation) {
+                  $definitions[$relClass]['relations'][$defClass] = array('local'   => $relation['foreign'],
+                                                                          'foreign' => $relation['local'],
+                                                                          'type'    => 'many');
+              }
+          }
+
+          // Build records
+          foreach ($definitions as $definition) {
+              $builder->buildRecord($definition);
+          }
         }
 
         return $classes;
     }
+
+    /**
+     * Singularize a table name
+     *
+     * @param string $tableName 
+     * @return $singularTableName
+     */
+    protected function _singularizeTableName($tableName)
+    {
+        $e = explode('_', Doctrine_Inflector::tableize($tableName));
+        foreach ($e as $k => $v) {
+            $e[$k] = Doctrine_Inflector::singularize($v);
+        }
+        return implode('_', $e);
+    }
 }

branches/0.11/lib/Doctrine/Import/Mysql.php

@@ -99 +99 @@
 
     /**
-     * lists table foreign keys
-     *
-     * @param string $table     database table name
-     * @return array
-     */
-    public function listTableForeignKeys($table) 
-    {
-        $sql = 'SHOW CREATE TABLE ' . $this->conn->quoteIdentifier($table, true);    
+     * lists table relations
+     *
+     * Expects an array of this format to be returned with all the relationships in it where the key is 
+     * the name of the foreign table, and the value is an array containing the local and foreign column
+     * name
+     *
+     * Array
+     * (
+     *   [groups] => Array
+     *     (
+     *        [local] => group_id
+     *        [foreign] => id
+     *     )
+     * )
+     *
+     * @param string $table     database table name
+     * @return array
+     */
+    public function listTableRelations($tableName)
+    {
+        $relations = array();
+        $sql = "SELECT column_name, REFERENCED_TABLE_NAME, REFERENCED_COLUMN_NAME FROM information_schema.key_column_usage WHERE table_name = '" . $tableName . "' AND table_schema = '" . $this->conn->getDatabaseName() . "' and REFERENCED_COLUMN_NAME is not NULL";
+        $results = $this->conn->fetchAssoc($sql);
+        foreach ($results as $result)
+        {
+            $result = array_change_key_case($result, CASE_LOWER);
+            $relations[$result['referenced_table_name']] = array('local'   => $result['column_name'],
+                                                                 'foreign' => $result['referenced_column_name']);
+        }
+        return $relations;
     }