refactor table definition

diff --git a/ipf/orm/import/builder.php b/ipf/orm/import/builder.php
index 8258b5da4347ee25a3092aa7973cc6aec9092411..1fd3c971ac272b628c71e31229df767df299ba9e 100644 (file)
--- 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 41fd7f7a3aef32378044ffef6bd3429a12bd0d33..e03cf839fa6b75fb0483b917b9d8b35e018dcbea 100644 (file)
--- 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);