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

refactor table definition
---

diff --git a/ipf/admin/models/_generated/BaseAdminLog.php b/ipf/admin/models/_generated/BaseAdminLog.php
index a76d24c..22f28cf 100644
--- a/ipf/admin/models/_generated/BaseAdminLog.php
+++ b/ipf/admin/models/_generated/BaseAdminLog.php
@@ -10,7 +10,8 @@ abstract class BaseAdminLog extends IPF_ORM_Record
 {
   public function setTableDefinition()
   {
-    $this->setTableName('admin_log');
+    $table = $this->getTable();
+    $table->setTableName('admin_log');
     $this->getTable()->setColumn('username', 'string', 32, array('type' => 'string', 'length' => '32'));
     $this->getTable()->setColumn('user_id', 'integer', null, array('type' => 'integer'));
     $this->getTable()->setColumn('object_id', 'integer', null, array('type' => 'integer'));
diff --git a/ipf/auth/models/_generated/BasePermission.php b/ipf/auth/models/_generated/BasePermission.php
index 69c7648..cf0e609 100644
--- a/ipf/auth/models/_generated/BasePermission.php
+++ b/ipf/auth/models/_generated/BasePermission.php
@@ -10,7 +10,8 @@ abstract class BasePermission extends IPF_ORM_Record
 {
   public function setTableDefinition()
   {
-    $this->setTableName('auth_permission');
+    $table = $this->getTable();
+    $table->setTableName('auth_permission');
     $this->getTable()->setColumn('name', 'string', 255, array('unique' => true, 'type' => 'string', 'length' => '255'));
     $this->option('type', 'INNODB');
     $this->option('collate', 'utf8_unicode_ci');
diff --git a/ipf/auth/models/_generated/BaseRole.php b/ipf/auth/models/_generated/BaseRole.php
index e9bdf4c..45c8e05 100644
--- a/ipf/auth/models/_generated/BaseRole.php
+++ b/ipf/auth/models/_generated/BaseRole.php
@@ -10,7 +10,8 @@ abstract class BaseRole extends IPF_ORM_Record
 {
   public function setTableDefinition()
   {
-    $this->setTableName('auth_role');
+    $table = $this->getTable();
+    $table->setTableName('auth_role');
     $this->getTable()->setColumn('name', 'string', 255, array('unique' => true, 'type' => 'string', 'notblank' => true, 'length' => '255'));
     $this->option('type', 'INNODB');
     $this->option('collate', 'utf8_unicode_ci');
diff --git a/ipf/auth/models/_generated/BaseRolePermission.php b/ipf/auth/models/_generated/BaseRolePermission.php
index bdf64c5..e20a9ce 100644
--- a/ipf/auth/models/_generated/BaseRolePermission.php
+++ b/ipf/auth/models/_generated/BaseRolePermission.php
@@ -10,7 +10,8 @@ abstract class BaseRolePermission extends IPF_ORM_Record
 {
   public function setTableDefinition()
   {
-    $this->setTableName('auth_role_permission');
+    $table = $this->getTable();
+    $table->setTableName('auth_role_permission');
     $this->getTable()->setColumn('role_id', 'integer', null, array('type' => 'integer', 'primary' => true));
     $this->getTable()->setColumn('permission_id', 'integer', null, array('type' => 'integer', 'primary' => true));
     $this->option('type', 'INNODB');
diff --git a/ipf/auth/models/_generated/BaseUser.php b/ipf/auth/models/_generated/BaseUser.php
index ba17448..aee003b 100644
--- a/ipf/auth/models/_generated/BaseUser.php
+++ b/ipf/auth/models/_generated/BaseUser.php
@@ -10,7 +10,8 @@ abstract class BaseUser extends IPF_ORM_Record
 {
   public function setTableDefinition()
   {
-    $this->setTableName('auth_user');
+    $table = $this->getTable();
+    $table->setTableName('auth_user');
     $this->getTable()->setColumn('username', 'string', 32, array('type' => 'string', 'notblank' => true, 'notnull' => true, 'unique' => true, 'length' => '32'));
     $this->getTable()->setColumn('password', 'string', 128, array('type' => 'string', 'notblank' => true, 'notnull' => true, 'length' => '128'));
     $this->getTable()->setColumn('first_name', 'string', 32, array('type' => 'string', 'length' => '32'));
diff --git a/ipf/auth/models/_generated/BaseUserPermission.php b/ipf/auth/models/_generated/BaseUserPermission.php
index 227ed05..0034fbc 100644
--- a/ipf/auth/models/_generated/BaseUserPermission.php
+++ b/ipf/auth/models/_generated/BaseUserPermission.php
@@ -10,7 +10,8 @@ abstract class BaseUserPermission extends IPF_ORM_Record
 {
   public function setTableDefinition()
   {
-    $this->setTableName('auth_user_permission');
+    $table = $this->getTable();
+    $table->setTableName('auth_user_permission');
     $this->getTable()->setColumn('user_id', 'integer', null, array('type' => 'integer', 'primary' => true));
     $this->getTable()->setColumn('permission_id', 'integer', null, array('type' => 'integer', 'primary' => true));
     $this->option('type', 'INNODB');
diff --git a/ipf/auth/models/_generated/BaseUserRole.php b/ipf/auth/models/_generated/BaseUserRole.php
index ab9b2dd..b49c39c 100644
--- a/ipf/auth/models/_generated/BaseUserRole.php
+++ b/ipf/auth/models/_generated/BaseUserRole.php
@@ -10,7 +10,8 @@ abstract class BaseUserRole extends IPF_ORM_Record
 {
   public function setTableDefinition()
   {
-    $this->setTableName('auth_user_role');
+    $table = $this->getTable();
+    $table->setTableName('auth_user_role');
     $this->getTable()->setColumn('user_id', 'integer', null, array('type' => 'integer', 'primary' => true));
     $this->getTable()->setColumn('role_id', 'integer', null, array('type' => 'integer', 'primary' => true));
     $this->option('type', 'INNODB');
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);
diff --git a/ipf/session/models/_generated/BaseSession.php b/ipf/session/models/_generated/BaseSession.php
index 242e682..9498fa0 100644
--- a/ipf/session/models/_generated/BaseSession.php
+++ b/ipf/session/models/_generated/BaseSession.php
@@ -10,7 +10,8 @@ abstract class BaseSession extends IPF_ORM_Record
 {
   public function setTableDefinition()
   {
-    $this->setTableName('session');
+    $table = $this->getTable();
+    $table->setTableName('session');
     $this->getTable()->setColumn('session_key', 'string', 40, array('primary' => true, 'type' => 'string', 'length' => '40'));
     $this->getTable()->setColumn('session_data', 'string', null, array('type' => 'string'));
     $this->getTable()->setColumn('expire_data', 'timestamp', null, array('type' => 'timestamp'));