From: Andrey Kutejko <andy128k@gmail.com>
Date: Sat, 27 Jul 2013 20:48:59 +0000 (+0300)
Subject: make setTableDefinition a static method
X-Git-Tag: 0.6~50
X-Git-Url: https://git.andy128k.dev/?a=commitdiff_plain;h=27342d1e7f780612adceb9d09fa83b7a772852c8;p=ipf-legacy-orm.git

make setTableDefinition a static method
---

diff --git a/ipf/orm/import/builder.php b/ipf/orm/import/builder.php
index 9cf200a..6e3bc0f 100644
--- a/ipf/orm/import/builder.php
+++ b/ipf/orm/import/builder.php
@@ -21,13 +21,12 @@ class IPF_ORM_Import_Builder
         }
 
         $ret = array(
-            '  public function setTableDefinition()',
+            '  public static function setTableDefinition(IPF_ORM_Table $table)',
             '  {',
-            '    $table = $this->getTable();',
         );
 
         if (isset($definition['inheritance']['type']) && $definition['inheritance']['type'] == 'concrete')
-            $ret[] = "    parent::setTableDefinition();";
+            $ret[] = '    parent::setTableDefinition($table);';
 
         if (isset($definition['tableName']) && !empty($definition['tableName']))
             $ret[] = "    ".'$table->setTableName(\''. $definition['tableName'].'\');';
diff --git a/ipf/orm/record/abstract.php b/ipf/orm/record/abstract.php
index dc9f4a7..3276a67 100644
--- a/ipf/orm/record/abstract.php
+++ b/ipf/orm/record/abstract.php
@@ -4,7 +4,7 @@ abstract class IPF_ORM_Record_Abstract extends IPF_ORM_Access
 {
     protected $_table;
 
-    public function setTableDefinition()
+    public static function setTableDefinition(IPF_ORM_Table $table)
     {
     }
 
diff --git a/ipf/orm/table.php b/ipf/orm/table.php
index e91896a..aec975a 100644
--- a/ipf/orm/table.php
+++ b/ipf/orm/table.php
@@ -55,8 +55,7 @@ class IPF_ORM_Table extends IPF_ORM_Configurable implements Countable
         $this->initParents($name);
 
         // create database table
-        $record = new $name($this);
-        $record->setTableDefinition();
+        $name::setTableDefinition($this);
 
         $this->columnCount = count($this->_columns);
 
@@ -66,6 +65,7 @@ class IPF_ORM_Table extends IPF_ORM_Configurable implements Countable
 
         $this->initIdentifier();
 
+        $record = new $name($this);
         $record->setUp();
 
         $this->_filters[]  = new IPF_ORM_Record_Filter_Standard();