Doctrine

Timestamp:

03/06/08 06:21:55 (16 months ago)

Author:

jwage

Message:

fixes #829 fixes #707

Location:

branches/0.10/lib

Files:

• Doctrine.php (modified) (3 diffs)
• Doctrine/Export/Schema.php (modified) (2 diffs)
• Doctrine/Import/Builder.php (modified) (2 diffs)

branches/0.10/lib/Doctrine.php

@@ -536 +536 @@
      *
      * @param  string   $directory      Path to directory of models or array of directory paths
-     * @param  integer  $forceStyle     Pass value of Doctrine::ATTR_MODEL_LOADING to force a certain style of model loading
+     * @param  integer  $modelLoading   Pass value of Doctrine::ATTR_MODEL_LOADING to force a certain style of model loading
      *                                  Allowed Doctrine::MODEL_LOADING_AGGRESSIVE(default) or Doctrine::MODEL_LOADING_CONSERVATIVE
-     * @return array    $modelLoading   Array of the models loaded by the operation
      */
     public static function loadModels($directory, $modelLoading = null)
@@ -693 +692 @@
      * @param string $directory Directory to write your models to
      * @param array $databases Array of databases to generate models for
+     * @param array $options Array of options
      * @return boolean
      * @throws Exception
      */
-    public static function generateModelsFromDb($directory, array $databases = array())
-    {
-        return Doctrine_Manager::connection()->import->importSchema($directory, $databases);
+    public static function generateModelsFromDb($directory, array $databases = array(), array $options = array())
+    {
+        return Doctrine_Manager::connection()->import->importSchema($directory, $databases, $options);
     }
 
@@ -708 +708 @@
      *
      * @param string $yamlPath Path to write oyur yaml schema file to
-     * @return void
-     */
-    public static function generateYamlFromDb($yamlPath)
+     * @param array  $options Array of options
+     * @return void
+     */
+    public static function generateYamlFromDb($yamlPath, array $databases = array(), array $options = array())
     {
         $directory = '/tmp/tmp_doctrine_models';
 
-        Doctrine::generateModelsFromDb($directory);
+        $options['generateBaseClasses'] = isset($options['generateBaseClasses']) ? $options['generateBaseClasses']:false;
+        Doctrine::generateModelsFromDb($directory, $databases, $options);
 
         $export = new Doctrine_Export_Schema();

branches/0.10/lib/Doctrine/Export/Schema.php

@@ -58 +58 @@
         $fks = array();
 
-        // we iterate trhough the diff of previously declared classes
+        // we iterate through the diff of previously declared classes
         // and currently declared classes
         foreach ($loadedModels as $className) {
@@ -70 +70 @@
             
             $table = array();
-            
+            $remove = array('ptype', 'ntype', 'alltypes');
+            // Fix explicit length in schema, concat it to type in this format: type(length)
             foreach ($data['columns'] AS $name => $column) {
                 $data['columns'][$name]['type'] = $column['type'] . '(' . $column['length'] . ')';
                 unset($data['columns'][$name]['length']);
+
+                // Strip out schema information which is not necessary to be dumped to the yaml schema file
+                foreach ($remove as $value) {
+                    if (isset($data['columns'][$name][$value])) {
+                        unset($data['columns'][$name][$value]);
+                    }
+                }
+                
+                // If type is the only property of the column then lets abbreviate the syntax
+                // columns: { name: string(255) }
+                if (count($data['columns'][$name]) === 1 && isset($data['columns'][$name]['type'])) {
+                    $type = $data['columns'][$name]['type'];
+                    unset($data['columns'][$name]);
+                    $data['columns'][$name] = $type;
+                }
             }
             

branches/0.10/lib/Doctrine/Import/Builder.php

@@ -471 +471 @@
             }
 
+            // The column definition is one array, everthing but name, type and length are an array of
+            // possible options. This removes the name, type and length and creates the options array for
+            // the column definition
             $options = $column;
-            $unset = array('name', 'type', 'length', 'ptype');
+            $unset = array('name', 'type', 'length');
             foreach ($options as $key => $value) {
-                if (in_array($key, $unset) || $value === null) {
+                if (in_array($key, $unset) || empty($value)) {
                     unset($options[$key]);
                 }
             }
-            
+
+            // Unset notnull if the column is primary and if notnull === true
+            // It defaults to true so no need to have it in definition
+            if (isset($options['primary']) && $options['primary'] && isset($options['notnull']) && $options['notnull'] === true) {
+                unset($options['notnull']);
+            }
+
             if (is_array($options) && !empty($options)) {
                 $build .= ', ' . $this->varExport($options);
@@ -716 +725 @@
     public function buildRecord(array $definition)
     {
-        if ( !isset($definition['className'])) {
+        if ( ! isset($definition['className'])) {
             throw new Doctrine_Import_Builder_Exception('Missing class name.');
         }