From 3fd53e33d6add0278c29125a2e55192652bb525e Mon Sep 17 00:00:00 2001 From: Andrey Kutejko Date: Sat, 27 Jul 2013 23:48:59 +0300 Subject: [PATCH] make setTableDefinition a static method --- ipf/admin/models/_generated/BaseAdminLog.php | 3 +-- ipf/auth/models/_generated/BasePermission.php | 3 +-- ipf/auth/models/_generated/BaseRole.php | 3 +-- ipf/auth/models/_generated/BaseRolePermission.php | 3 +-- ipf/auth/models/_generated/BaseUser.php | 3 +-- ipf/auth/models/_generated/BaseUserPermission.php | 3 +-- ipf/auth/models/_generated/BaseUserRole.php | 3 +-- ipf/orm/import/builder.php | 5 ++--- ipf/orm/record/abstract.php | 2 +- ipf/orm/table.php | 4 ++-- ipf/session/models/_generated/BaseSession.php | 3 +-- 11 files changed, 13 insertions(+), 22 deletions(-) diff --git a/ipf/admin/models/_generated/BaseAdminLog.php b/ipf/admin/models/_generated/BaseAdminLog.php index 6f71fc1..9f55ad4 100644 --- a/ipf/admin/models/_generated/BaseAdminLog.php +++ b/ipf/admin/models/_generated/BaseAdminLog.php @@ -8,9 +8,8 @@ abstract class BaseAdminLog extends IPF_ORM_Record { - public function setTableDefinition() + public static function setTableDefinition(IPF_ORM_Table $table) { - $table = $this->getTable(); $table->setTableName('admin_log'); $table->setColumn('username', 'string', 32, array('type' => 'string', 'length' => '32')); $table->setColumn('user_id', 'integer', null, array('type' => 'integer')); diff --git a/ipf/auth/models/_generated/BasePermission.php b/ipf/auth/models/_generated/BasePermission.php index 1e3db87..190b33e 100644 --- a/ipf/auth/models/_generated/BasePermission.php +++ b/ipf/auth/models/_generated/BasePermission.php @@ -8,9 +8,8 @@ abstract class BasePermission extends IPF_ORM_Record { - public function setTableDefinition() + public static function setTableDefinition(IPF_ORM_Table $table) { - $table = $this->getTable(); $table->setTableName('auth_permission'); $table->setColumn('name', 'string', 255, array('unique' => true, 'type' => 'string', 'length' => '255')); $table->setOption('type', 'INNODB'); diff --git a/ipf/auth/models/_generated/BaseRole.php b/ipf/auth/models/_generated/BaseRole.php index 8b956c7..0e72b24 100644 --- a/ipf/auth/models/_generated/BaseRole.php +++ b/ipf/auth/models/_generated/BaseRole.php @@ -8,9 +8,8 @@ abstract class BaseRole extends IPF_ORM_Record { - public function setTableDefinition() + public static function setTableDefinition(IPF_ORM_Table $table) { - $table = $this->getTable(); $table->setTableName('auth_role'); $table->setColumn('name', 'string', 255, array('unique' => true, 'type' => 'string', 'notblank' => true, 'length' => '255')); $table->setOption('type', 'INNODB'); diff --git a/ipf/auth/models/_generated/BaseRolePermission.php b/ipf/auth/models/_generated/BaseRolePermission.php index 6f58632..e01c1de 100644 --- a/ipf/auth/models/_generated/BaseRolePermission.php +++ b/ipf/auth/models/_generated/BaseRolePermission.php @@ -8,9 +8,8 @@ abstract class BaseRolePermission extends IPF_ORM_Record { - public function setTableDefinition() + public static function setTableDefinition(IPF_ORM_Table $table) { - $table = $this->getTable(); $table->setTableName('auth_role_permission'); $table->setColumn('role_id', 'integer', null, array('type' => 'integer', 'primary' => true)); $table->setColumn('permission_id', 'integer', null, array('type' => 'integer', 'primary' => true)); diff --git a/ipf/auth/models/_generated/BaseUser.php b/ipf/auth/models/_generated/BaseUser.php index e6ca794..98c8483 100644 --- a/ipf/auth/models/_generated/BaseUser.php +++ b/ipf/auth/models/_generated/BaseUser.php @@ -8,9 +8,8 @@ abstract class BaseUser extends IPF_ORM_Record { - public function setTableDefinition() + public static function setTableDefinition(IPF_ORM_Table $table) { - $table = $this->getTable(); $table->setTableName('auth_user'); $table->setColumn('username', 'string', 32, array('type' => 'string', 'notblank' => true, 'notnull' => true, 'unique' => true, 'length' => '32')); $table->setColumn('password', 'string', 128, array('type' => 'string', 'notblank' => true, 'notnull' => true, 'length' => '128')); diff --git a/ipf/auth/models/_generated/BaseUserPermission.php b/ipf/auth/models/_generated/BaseUserPermission.php index 9c2d55f..c45e3a6 100644 --- a/ipf/auth/models/_generated/BaseUserPermission.php +++ b/ipf/auth/models/_generated/BaseUserPermission.php @@ -8,9 +8,8 @@ abstract class BaseUserPermission extends IPF_ORM_Record { - public function setTableDefinition() + public static function setTableDefinition(IPF_ORM_Table $table) { - $table = $this->getTable(); $table->setTableName('auth_user_permission'); $table->setColumn('user_id', 'integer', null, array('type' => 'integer', 'primary' => true)); $table->setColumn('permission_id', 'integer', null, array('type' => 'integer', 'primary' => true)); diff --git a/ipf/auth/models/_generated/BaseUserRole.php b/ipf/auth/models/_generated/BaseUserRole.php index f29522e..c9d50e0 100644 --- a/ipf/auth/models/_generated/BaseUserRole.php +++ b/ipf/auth/models/_generated/BaseUserRole.php @@ -8,9 +8,8 @@ abstract class BaseUserRole extends IPF_ORM_Record { - public function setTableDefinition() + public static function setTableDefinition(IPF_ORM_Table $table) { - $table = $this->getTable(); $table->setTableName('auth_user_role'); $table->setColumn('user_id', 'integer', null, array('type' => 'integer', 'primary' => true)); $table->setColumn('role_id', 'integer', null, array('type' => 'integer', 'primary' => true)); 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(); diff --git a/ipf/session/models/_generated/BaseSession.php b/ipf/session/models/_generated/BaseSession.php index e321fd7..98eb6e4 100644 --- a/ipf/session/models/_generated/BaseSession.php +++ b/ipf/session/models/_generated/BaseSession.php @@ -8,9 +8,8 @@ abstract class BaseSession extends IPF_ORM_Record { - public function setTableDefinition() + public static function setTableDefinition(IPF_ORM_Table $table) { - $table = $this->getTable(); $table->setTableName('session'); $table->setColumn('session_key', 'string', 40, array('primary' => true, 'type' => 'string', 'length' => '40')); $table->setColumn('session_data', 'string', null, array('type' => 'string')); -- 2.49.0