From: Andrey Kutejko <andy128k@gmail.com>
Date: Sat, 27 Jul 2013 15:51:35 +0000 (+0300)
Subject: refactor table definition
X-Git-Tag: 0.6~59
X-Git-Url: https://git.andy128k.dev/?a=commitdiff_plain;h=5ef034e658d943e46e2a5376c2f6654c053c7e34;p=ipf-legacy-orm.git

refactor table definition
---

diff --git a/ipf/orm/import/builder.php b/ipf/orm/import/builder.php
index 8258b5d..1fd3c97 100644
--- a/ipf/orm/import/builder.php
+++ b/ipf/orm/import/builder.php
@@ -23,13 +23,14 @@ class IPF_ORM_Import_Builder
         $ret = array(
             '  public function setTableDefinition()',
             '  {',
+            '    $table = $this->getTable();',
         );
 
         if (isset($definition['inheritance']['type']) && $definition['inheritance']['type'] == 'concrete')
             $ret[] = "    parent::setTableDefinition();";
 
         if (isset($definition['tableName']) && !empty($definition['tableName']))
-            $ret[] = "    ".'$this->setTableName(\''. $definition['tableName'].'\');';
+            $ret[] = "    ".'$table->setTableName(\''. $definition['tableName'].'\');';
 
         if (isset($definition['columns']) && is_array($definition['columns']) && !empty($definition['columns']))
             $ret[] = $this->buildColumns($definition['columns']);
diff --git a/ipf/orm/record/abstract.php b/ipf/orm/record/abstract.php
index 41fd7f7..e03cf83 100644
--- a/ipf/orm/record/abstract.php
+++ b/ipf/orm/record/abstract.php
@@ -29,10 +29,7 @@ abstract class IPF_ORM_Record_Abstract extends IPF_ORM_Access
     {
         $this->_table->setAttribute($attr, $value);
     }
-    public function setTableName($tableName)
-    {
-        $this->_table->setTableName($tableName);
-    }
+
     public function setInheritanceMap($map)
     {
         $this->_table->setOption('inheritanceMap', $map);