Changeset 3048 for trunk/lib/Doctrine.php

Timestamp:

11/01/07 19:45:36 (14 months ago)

Author:

jwage

Message:

Clean up, initial entry of root txt files, fixed a few broken unit tests. New documentation.

Files:

• trunk/lib/Doctrine.php (modified) (6 diffs)

trunk/lib/Doctrine.php

@@ -487 +487 @@
 
     /**
-     * loadAll
-     * loads all runtime classes
-     *
-     * @return void
-     */
-    public static function loadAll()
-    {
-        return self::loadAllRuntimeClasses();
-    }
-
-    /**
-     * importSchema
-     * method for importing existing schema to Doctrine_Record classes
-     *
-     * @param string $directory Directory to write your models to
-     * @param array $databases Array of databases to generate models for
-     * @return boolean
-     */
-    public static function importSchema($directory, array $databases = array())
-    {
-        return self::generateModelsFromDb($directory, $databases);
-    }
-
-    /**
-     * exportSchema
-     * method for exporting Doctrine_Record classes to a schema
-     *
-     * @param string $directory Directory containing your models
-     * @return void
-     */
-    public static function exportSchema($directory = null)
-    {
-        return self::createTablesFromModels($directory);
-    }
-
-    /**
-     * exportSql
-     * method for exporting Doctrine_Record classes to a schema
-     *
-     * @param string $directory
-     */
-    public static function exportSql($directory = null)
-    {
-        return self::generateSqlFromModels($directory);
-    }
-
-    /**
-     * loadAllRuntimeClasses
-     *
-     * loads all runtime classes
-     *
-     * @return void
-     */
-    public static function loadAllRuntimeClasses()
-    {
-        $classes = Doctrine_Compiler::getRuntimeClasses();
-
-        foreach ($classes as $class) {
-            self::autoload($class);
-        }
-    }
-
-    /**
      * loadModels
      *
@@ -593 +530 @@
         if ($classes === null) {
             $classes = get_declared_classes();
+            $classes = array_merge($classes, array_keys(self::$_loadedModels));
         }
         
@@ -694 +632 @@
     {
         $import = new Doctrine_Import_Schema();
-        $import->setOption('generateBaseClasses', true);
+        $import->setOptions($options);
         
         return $import->importSchema($yamlPath, 'yml', $directory);
@@ -862 +800 @@
 
     /**
-     * loadDummyData
-     *
-     * Populdate your models with dummy data
-     *
-     * @param string $append Whether or not to append the data
-     * @param string $num Number of records to populate
-     * @return void
-     */
-    public static function loadDummyData($append, $num = 5)
-    {
-        $data = new Doctrine_Data();
-
-        if ( ! $append) {
-          $data->purge();
-        }
-        
-        return $data->importDummyData($num);
-    }
-
-    /**
      * migrate
      * 
@@ -953 +871 @@
 
     /**
-     * connection
-     *
-     * @param string $adapter 
-     * @param string $name 
-     * @return void
-     */
-    public static function connection($adapter, $name = null)
-    {
-        return Doctrine_Manager::connection($adapter, $name);
-    }
-
-    /**
      * fileFinder
      *
@@ -983 +889 @@
      *
      * @param string $target
-     *
+     * @param array  $includedDrivers
      * @throws Doctrine_Exception
      * @return void