From e60f172d06acc78801b715deb08e9a8cddc2db4a Mon Sep 17 00:00:00 2001
From: michaelward82 <m.ward@leythers.com>
Date: Fri, 11 Apr 2014 14:50:39 +0100
Subject: [PATCH] Resolves issue #88. Allows static calling of Model
 subclasses, ignoring namespace info during table name generation.

Model class static property $_table_use_short_name = true allows static calling of the model subclass whilst avoiding the inclusion of namespace information in the auto generated table name.
---
 docs/models.rst      | 17 ++++++++++++++---
 paris.php            | 17 ++++++++++++++++-
 test/ParisTest53.php |  9 +++++++++
 3 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/docs/models.rst b/docs/models.rst
index 2a4d8139..3816f379 100644
--- a/docs/models.rst
+++ b/docs/models.rst
@@ -37,8 +37,19 @@ in a similar way. For example ``\Models\CarTyre`` would be converted to
 ``models_car_tyre``. Note here that backslashes are replaced with underscores
 in addition to the *CapWords* replacement discussed in the previous paragraph.
 
-To override this default behaviour, add a **public static** property to
-your class called ``$_table``:
+To disregard namespace information when calculating the table name, set a
+**public static** property named ``$_table_use_short_name`` on your class.
+This would result in ``\Models\CarTyre`` being converted to ``car_tyre``.
+
+.. code-block:: php
+
+    <?php
+    class User extends Model {
+        public static $_table_use_short_name = true;
+    }
+
+To override the default naming behaviour and directly specify a table name,
+add a **public static** property to your class called ``$_table``:
 
 .. code-block:: php
 
@@ -73,4 +84,4 @@ called ``$_id_column``:
 **Note** - Paris has its *own* default ID column name mechanism, and
 does not respect column names specified in Idiorm’s configuration.
 
-.. _Active Record pattern: http://martinfowler.com/eaaCatalog/activeRecord.html
\ No newline at end of file
+.. _Active Record pattern: http://martinfowler.com/eaaCatalog/activeRecord.html
diff --git a/paris.php b/paris.php
index 4441ce1a..b3eb7645 100644
--- a/paris.php
+++ b/paris.php
@@ -190,11 +190,26 @@ protected static function _get_static_property($class_name, $property, $default=
          * Static method to get a table name given a class name.
          * If the supplied class has a public static property
          * named $_table, the value of this property will be
-         * returned. If not, the class name will be converted using
+         * returned.
+         *
+         * If not, the class name will be converted using
          * the _class_name_to_table_name method method.
+         *
+         * If public static property $_table_use_short_name == true
+         * then $class_name passed to _class_name_to_table_name is
+         * stripped of namespace information.
+         *
          */
         protected static function _get_table_name($class_name) {
             $specified_table_name = self::_get_static_property($class_name, '_table');
+            $use_short_class_name =
+                self::_get_static_property($class_name, '_table_use_short_name');
+
+            if ($use_short_class_name) {
+                $exploded_class_name = explode('\\', $class_name);
+                $class_name = end($exploded_class_name);
+            }
+
             if (is_null($specified_table_name)) {
                 return self::_class_name_to_table_name($class_name);
             }
diff --git a/test/ParisTest53.php b/test/ParisTest53.php
index 789dc1d7..4d067d66 100644
--- a/test/ParisTest53.php
+++ b/test/ParisTest53.php
@@ -25,6 +25,12 @@ public function testNamespacedTableName() {
         $this->assertEquals($expected, ORM::get_last_query());
     }
 
+    public function testIgnoredNamespaceTableName() {
+        IgnoreNamespace::find_many();
+        $expected = 'SELECT * FROM `ignore_namespace`';
+        $this->assertEquals($expected, ORM::get_last_query());
+    }
+
     public function testModelWithCustomTable() {
         Model::factory('ModelWithCustomTable')->find_many();
         $expected = 'SELECT * FROM `custom_table`';
@@ -43,3 +49,6 @@ class Simple extends Model { }
 class ModelWithCustomTable extends Model {
     public static $_table = 'custom_table';
 }
+class IgnoreNamespace extends Model {
+    public static $_table_use_short_name = true;
+}