remove dead code. generators

diff --git a/ipf/orm.php b/ipf/orm.php
index 00aef1602e61dc8b9350a290efea569e9f4d595f..6ec89280d4b96779bb9b464ed3d759d9127119a7 100644 (file)
--- a/ipf/orm.php
+++ b/ipf/orm.php
@@ -154,8 +154,8 @@ final class IPF_ORM
     const EXPORT_NONE               = 0;
     const EXPORT_TABLES             = 1;
     const EXPORT_CONSTRAINTS        = 2;
-    const EXPORT_PLUGINS            = 4;
     const EXPORT_ALL                = 7;
+
     const HYDRATE_RECORD            = 2;
     const HYDRATE_ARRAY             = 3;
 

diff --git a/ipf/orm/export.php b/ipf/orm/export.php
index e92deaf7749928d71a0c2ea02ebda2927b4dbfc2..425235dca576584525e27331c7fcd552541f8662 100644 (file)
--- a/ipf/orm/export.php
+++ b/ipf/orm/export.php
@@ -408,11 +408,7 @@ class IPF_ORM_Export extends IPF_ORM_Connection_Module
         } else {
             $sql[] = $query;
         }
-        
-        if ($table->getAttribute(IPF_ORM::ATTR_EXPORT) & IPF_ORM::EXPORT_PLUGINS) {
-            $sql = array_merge($sql, $this->exportGeneratorsSql($table));
-        }
-        
+
         $sql = array_unique($sql);
         
         rsort($sql);
@@ -420,46 +416,6 @@ class IPF_ORM_Export extends IPF_ORM_Connection_Module
         return $sql;
     }
 
-    public function getAllGenerators(IPF_ORM_Table $table)
-    {
-        $generators = array();
-
-        foreach ($table->getGenerators() as $name => $generator) {
-            if ($generator === null) {
-                continue;                       
-            }
-
-            $generators[] = $generator;
-
-            $generatorTable = $generator->getTable();
-            
-            if ($generatorTable instanceof IPF_ORM_Table) {
-                $generators = array_merge($generators, $this->getAllGenerators($generatorTable));
-            }
-        }
-
-        return $generators;
-    }
-
-    public function exportGeneratorsSql(IPF_ORM_Table $table)
-    {
-        $sql = array();
-
-        foreach ($this->getAllGenerators($table) as $name => $generator) {
-            $table = $generator->getTable();
-            
-            // Make sure plugin has a valid table
-            if ($table instanceof IPF_ORM_Table) {
-                $data = $this->getExportableFormat($table);
-                $query = $this->createTableSql($data['tableName'], $data['columns'], $data['options']);
-
-                $sql = array_merge($sql, (array) $query);
-            }
-        }
-
-        return $sql;
-    }
-
     private function getExportableFormat($table)
     {
         $columns = array();

diff --git a/ipf/orm/record/abstract.php b/ipf/orm/record/abstract.php
index cf4604656ded33700b51e0c90f4fcb41e6465ac6..3d9a91a2481ecdb74b268484c223586038997e96 100644 (file)
--- a/ipf/orm/record/abstract.php
+++ b/ipf/orm/record/abstract.php
@@ -37,12 +37,6 @@ abstract class IPF_ORM_Record_Abstract extends IPF_ORM_Access
         }    
     }
 
-    public function loadGenerator(IPF_ORM_Record_Generator $generator)
-    {
-        $generator->initialize($this->_table);
-        $this->_table->addGenerator($generator, get_class($generator));
-    }
-
     public function check($constraint, $name = null)
     {
         if (is_array($constraint)) {

diff --git a/ipf/orm/table.php b/ipf/orm/table.php
index 5c0b09bf0e02c4684cd51a40c015a1dd02fe48f1..bb496e62c84d1bd94aca7e353d191f39ac383ca1 100644 (file)
--- a/ipf/orm/table.php
+++ b/ipf/orm/table.php
@@ -33,7 +33,6 @@ class IPF_ORM_Table extends IPF_ORM_Configurable implements Countable
     protected $_parser;
 
     protected $_templates   = array();
-    protected $_generators     = array();
     protected $_invokedMethods = array();
 
     public $listeners = array();
@@ -877,35 +876,6 @@ class IPF_ORM_Table extends IPF_ORM_Configurable implements Countable
         $tpl->setTableDefinition($this);
     }
 
-    public function getGenerators()
-    {
-        return $this->_generators;
-    }
-
-    public function getGenerator($generator)
-    {
-        if ( ! isset($this->_generators[$generator])) {
-            throw new IPF_ORM_Exception('Generator ' . $generator . ' not loaded');
-        }
-
-        return $this->_generators[$generator];
-    }
-
-    public function hasGenerator($generator)
-    {
-        return isset($this->_generators[$generator]);
-    }
-
-    public function addGenerator(IPF_ORM_Record_Generator $generator, $name = null)
-    {
-        if ($name === null) {
-            $this->_generators[] = $generator;
-        } else {
-            $this->_generators[$name] = $generator;
-        }
-        return $this;
-    }
-
     public function bindQueryParts(array $queryParts)
     {
         $this->_options['queryParts'] = $queryParts;