Changeset 4682

Timestamp:

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

Author:

jwage

Message:

fixes #1186 - removing all use of singularization and plurilization

Location:

branches/1.0

Files:

• docs/manual/de/getting-started/working-with-existing-databases.txt (modified) (1 diff)
• docs/manual/en/getting-started/working-with-existing-databases.txt (modified) (1 diff)
• docs/manual/ja/getting-started.txt (modified) (1 diff)
• docs/manual/ja/getting-started/working-with-existing-databases.txt (modified) (1 diff)
• lib/Doctrine.php (modified) (1 diff)
• lib/Doctrine/Configurable.php (modified) (1 diff)
• lib/Doctrine/Import.php (modified) (4 diffs)
• lib/Doctrine/Inflector.php (modified) (2 diffs)
• tests/ImportTestCase.php (modified) (1 diff)

branches/1.0/docs/manual/de/getting-started/working-with-existing-databases.txt

@@ -97 +97 @@
 
 This is where you can put your custom finder methods which can be used by calling Doctrine::getTable('User').
-
-+++ Singularizing Import
-
-By default Doctrine will attempt to ensure your models are singularized when they are imported from an existing 
-database. This feature may not be ideal for everyone so it can easily be turned off using an attribute.
-
-<code type="php">
-Doctrine_Manager::getInstance()->setAttribute('singularize_import', false);
-</code>
-
-Now, if you have a table named "files", the result will be a model named "Files" instead of "File".

branches/1.0/docs/manual/en/getting-started/working-with-existing-databases.txt

@@ -97 +97 @@
 
 This is where you can put your custom finder methods which can be used by calling Doctrine::getTable('User').
-
-+++ Singularizing Import
-
-By default Doctrine will attempt to ensure your models are singularized when they are imported from an existing 
-database. This feature may not be ideal for everyone so it can easily be turned off using an attribute.
-
-<code type="php">
-Doctrine_Manager::getInstance()->setAttribute('singularize_import', false);
-</code>
-
-Now, if you have a table named "files", the result will be a model named "Files" instead of "File".

branches/1.0/docs/manual/ja/getting-started.txt

@@ -263 +263 @@
 
 ã“ã“ã«ã‚«ã‚¹ã‚¿ãƒ ãƒ¡ã‚œãƒƒãƒ‰ã‚’è¿œåŠ ã—ãŠDoctrine::getTable('User')を䜿っお呌ぶこずができたす。
-
-+++ むンポヌトの際のテヌブル名の単数圢化
-
-デフォルトではDoctrineは既存のデヌタベヌスから読み蟌たれた各モデルの名前を単数型にしようずしたす。この機胜を望たない方は以䞋の方法で簡単にoffにしおください
-
-<code type="php">
-Doctrine_Manager::getInstance()->setAttribute('singularize_import', false);
-</code>
-
-これで"files"ずいうテヌブル名からは"File.php"ずいうモデルは無く、"Files.php"ずいうモデルが生成されたす。
 
 ++ テヌブルの䜜成

branches/1.0/docs/manual/ja/getting-started/working-with-existing-databases.txt

@@ -90 +90 @@
 
 ã“ã“ã«ã‚«ã‚¹ã‚¿ãƒ ãƒ¡ã‚œãƒƒãƒ‰ã‚’è¿œåŠ ã—ãŠDoctrine::getTable('User')を䜿っお呌ぶこずができたす。
-
-+++ Singularizing Import
-
-デフォルトではDoctrineは既存のデヌタベヌスから読み蟌たれた各モデルの名前を単数型にしようずしたす。この機胜を望たない方は以䞋の方法で簡単にoffにしおください
-
-<code type="php">
-Doctrine_Manager::getInstance()->setAttribute('singularize_import', false);
-</code>
-
-これで"files"ずいうテヌブル名からは"File.php"ずいうモデルは無く、"Files.php"ずいうモデルが生成されたす。

branches/1.0/lib/Doctrine.php

@@ -195 +195 @@
     const ATTR_MODEL_LOADING            = 161;
     const ATTR_RECURSIVE_MERGE_FIXTURES = 162;
-    const ATTR_SINGULARIZE_IMPORT       = 163;
     const ATTR_USE_DQL_CALLBACKS        = 164;
 

branches/1.0/lib/Doctrine/Configurable.php

@@ -181 +181 @@
             case Doctrine::ATTR_QUERY_CACHE_LIFESPAN:
             case Doctrine::ATTR_RECURSIVE_MERGE_FIXTURES;
-            case Doctrine::ATTR_SINGULARIZE_IMPORT;
             case Doctrine::ATTR_USE_DQL_CALLBACKS;
 

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);
-    }
 }

branches/1.0/lib/Doctrine/Inflector.php

@@ -39 +39 @@
 {
     /**
-     * Pluralize an English noun. Converts 'Category' to 'Categories'.
-     *
-     * @param    string $word English noun to pluralize
-     * @return   string $word Plural noun
-     */
-    public static function pluralize($word)
-    {
-        $plural = array('/(quiz)$/i' => '\1zes',
-                        '/^(ox)$/i' => '\1en',
-                        '/([m|l])ouse$/i' => '\1ice',
-                        '/(matr|vert|ind)ix|ex$/i' => '\1ices',
-                        '/(x|ch|ss|sh)$/i' => '\1es',
-                        '/([^aeiouy]|qu)ies$/i' => '\1y',
-                        '/([^aeiouy]|qu)y$/i' => '\1ies',
-                        '/(hive)$/i' => '\1s',
-                        '/(?:([^f])fe|([lr])f)$/i' => '\1\2ves',
-                        '/sis$/i' => 'ses',
-                        '/([ti])um$/i' => '\1a',
-                        '/(buffal|tomat)o$/i' => '\1oes',
-                        '/(bu)s$/i' => '\1ses',
-                        '/(alias|status)/i' => '\1es',
-                        '/(octop|vir)us$/i' => '\1i',
-                        '/(ax|test)is$/i' => '\1es',
-                        '/s$/i' => 's',
-                        '/$/' => 's');
-
-        $uncountable = array('equipment',
-                             'information',
-                             'rice',
-                             'money',
-                             'species',
-                             'series',
-                             'fish',
-                             'sheep');
-
-        $irregular = array('person' => 'people',
-                           'man'    => 'men',
-                           'child'  => 'children',
-                           'sex'    => 'sexes',
-                           'move'   => 'moves');
-
-        $lowercasedWord = strtolower($word);
-
-        foreach ($uncountable as $_uncountable) {
-            if(substr($lowercasedWord, (-1 * strlen($_uncountable))) == $_uncountable) {
-                return $word;
-            }
-        }
-
-        foreach ($irregular as $_plural=> $_singular){
-            if (preg_match('/('.$_plural.')$/i', $word, $arr)) {
-                return preg_replace('/('.$_plural.')$/i', substr($arr[0],0,1) . substr($_singular,1), $word);
-            }
-        }
-
-        foreach ($plural as $rule => $replacement) {
-            if (preg_match($rule, $word)) {
-                return preg_replace($rule, $replacement, $word);
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Singularize an English noun. Converts 'Quizzes' to 'Quiz'.
-     *
-     * @param    string  $word    English noun to singularize
-     * @return   string  $word    Singular noun.
-     */
-    public static function singularize($word)
-    {
-        $singular = array('/(quiz)zes$/i' => '\\1',
-                          '/(matr)ices$/i' => '\\1ix',
-                          '/(vert|ind)ices$/i' => '\\1ex',
-                          '/^(ox)en/i' => '\\1',
-                          '/(alias|status)es$/i' => '\\1',
-                          '/([octop|vir])i$/i' => '\\1us',
-                          '/(cris|ax|test)es$/i' => '\\1is',
-                          '/(shoe)s$/i' => '\\1',
-                          '/(o)es$/i' => '\\1',
-                          '/(bus)es$/i' => '\\1',
-                          '/([m|l])ice$/i' => '\\1ouse',
-                          '/(x|ch|ss|sh)es$/i' => '\\1',
-                          '/(m)ovies$/i' => '\\1ovie',
-                          '/(s)eries$/i' => '\\1eries',
-                          '/([^aeiouy]|qu)ies$/i' => '\\1y',
-                          '/([lr])ves$/i' => '\\1f',
-                          '/(tive)s$/i' => '\\1',
-                          '/(hive)s$/i' => '\\1',
-                          '/([^f])ves$/i' => '\\1fe',
-                          '/(^analy)ses$/i' => '\\1sis',
-                          '/((a)naly|(b)a|(d)iagno|(p)arenthe|(p)rogno|(s)ynop|(t)he)ses$/i' => '\\1\\2sis',
-                          '/([ti])a$/i' => '\\1um',
-                          '/(n)ews$/i' => '\\1ews',
-                          '/^(.{2,2})$/i' => '\\1',
-                          '/s$/i' => '');
-
-        $uncountable = array('equipment',
-                             'information',
-                             'rice',
-                             'money',
-                             'species',
-                             'series',
-                             'fish',
-                             'sheep',
-                             'sms',
-                             'status',
-                             'access');
-
-        $irregular = array('person' => 'people',
-                           'man'    => 'men',
-                           'child'  => 'children',
-                           'sex'    => 'sexes',
-                           'move'   => 'moves');
-
-        $lowercasedWord = strtolower($word);
-        foreach ($uncountable as $_uncountable){
-            if(substr($lowercasedWord, ( -1 * strlen($_uncountable))) == $_uncountable){
-                return $word;
-            }
-        }
-
-        foreach ($irregular as $_singular => $_plural) {
-            if (preg_match('/('.$_plural.')$/i', $word, $arr)) {
-                return preg_replace('/('.$_plural.')$/i', substr($arr[0],0,1).substr($_singular,1), $word);
-            }
-        }
-
-        foreach ($singular as $rule => $replacement) {
-            if (preg_match($rule, $word)) {
-                return preg_replace($rule, $replacement, $word);
-            }
-        }
-
-        return $word;
-    }
-
-    /**
      * Convert word in to the format for a Doctrine table name. Converts 'ModelName' to 'model_name'
      *
@@ -185 +46 @@
     public static function tableize($word)
     {
-        // Would prefer this but it breaks unit tests. Forces the table underscore pattern
-        // return self::pluralize(self::underscore($name));
         return strtolower(preg_replace('~(?<=\\w)([A-Z])~', '_$1', $word));
     }

branches/1.0/tests/ImportTestCase.php

@@ -52 +52 @@
         Doctrine_Lib::removeDirectories('Import/_files');
     }
-
-    public function testImportSingularizeOn()
-    {
-        $this->dbh = new PDO('sqlite::memory:');
-
-        $this->dbh->exec('CREATE TABLE imports_tests_users (id INTEGER PRIMARY KEY, name TEXT)');
-
-        $this->conn = Doctrine_Manager::connection($this->dbh, 'tmp1234');
-        $this->conn->setAttribute(Doctrine::ATTR_SINGULARIZE_IMPORT, true);
-        $this->conn->import->importSchema('Import/_files', array('tmp1234'));
-
-        $this->assertTrue(file_exists('Import/_files/ImportTestUser.php'));
-        $this->assertTrue(file_exists('Import/_files/generated/BaseImportTestUser.php'));
-        Doctrine_Lib::removeDirectories('Import/_files');
-    }
-
-    public function testImportSingularizeOff()
-    {
-        $this->dbh = new PDO('sqlite::memory:');
-
-        $this->dbh->exec('CREATE TABLE imports_tests_users (id INTEGER PRIMARY KEY, name TEXT)');
-
-        $this->conn = Doctrine_Manager::connection($this->dbh, 'tmp1235');
-        $this->conn->setAttribute(Doctrine::ATTR_SINGULARIZE_IMPORT, false);
-        $this->conn->import->importSchema('Import/_files', array('tmp1235'));
-
-        $this->assertTrue(file_exists('Import/_files/ImportsTestsUsers.php'));
-        $this->assertTrue(file_exists('Import/_files/generated/BaseImportsTestsUsers.php'));
-        Doctrine_Lib::removeDirectories('Import/_files');
-    }
 }