Changeset 4682 for branches/1.0/lib/Doctrine/Import.php

Timestamp:

07/13/08 01:14:08 (6 months ago)

Author:

jwage

Message:

fixes #1186 - removing all use of singularization and plurilization

Files:

• branches/1.0/lib/Doctrine/Import.php (modified) (4 diffs)

branches/1.0/lib/Doctrine/Import.php

@@ -364 +364 @@
     public function importSchema($directory, array $databases = array(), array $options = array())
     {
-        $options['singularize'] = ! isset($options['singularize']) ? 
-                $this->conn->getAttribute('singularize_import'):$options['singularize'];
-
         $connections = Doctrine_Manager::getInstance()->getConnections();
 
@@ -386 +383 @@
               $definition['tableName'] = $table;
 
-              if( ! isset($options['singularize']) || $options['singularize'] !== false) {
-                  $classTable = $this->_singularizeTableName($table);
-              } else {
-                  $classTable = Doctrine_Inflector::tableize($table);
-              }
+              $classTable = Doctrine_Inflector::tableize($table);
 
               $definition['className'] = Doctrine_Inflector::classify($classTable);
@@ -401 +394 @@
                   foreach ($relations as $relation) {
                       $table = $relation['table'];
-                      if( ! isset($options['singularize']) || $options['singularize'] !== false) {
-                          $relClassTable = $this->_singularizeTableName($table);
-                      } else {
-                          $relClassTable = Doctrine_Inflector::tableize($table);
-                      }
+                      $relClassTable = Doctrine_Inflector::tableize($table);
                       $class = Doctrine_Inflector::classify($relClassTable);
                       if (in_array($class, $classes)) {
@@ -433 +422 @@
         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);
-    }
 }