Changeset 396

Timestamp:

10/14/07 07:11:37 (1 year ago)

Author:

kaste

Message:

basic implementation of a database adapter in the middle of AR and ADODb

Files:

• branches/kaste/framework/lib/Ak.php (modified) (1 diff)
• branches/kaste/framework/lib/AkActiveRecord.php (modified) (6 diffs)
• branches/kaste/framework/lib/AkActiveRecord/AkActsAsList.php (modified) (9 diffs)
• branches/kaste/framework/lib/AkActiveRecord/AkActsAsNestedSet.php (modified) (1 diff)
• branches/kaste/framework/lib/AkActiveRecord/AkActsAsTree.php (modified) (1 diff)
• branches/kaste/framework/lib/AkActiveRecord/AkDbAdapter.php (added)
• branches/kaste/framework/lib/AkActiveRecord/AkDbAdapter_mysql.php (added)
• branches/kaste/framework/lib/AkActiveRecord/AkDbAdapter_pgsql.php (added)
• branches/kaste/framework/lib/AkActiveRecord/AkDbAdapter_sqlite.php (added)
• branches/kaste/framework/lib/AkActiveRecord/AkHasAndBelongsToMany.php (modified) (1 diff)
• branches/kaste/framework/lib/AkDbManager.php (modified) (1 diff)
• branches/kaste/framework/lib/AkInstaller.php (modified) (4 diffs)
• branches/kaste/framework/lib/constants.php (modified) (2 diffs)
• branches/kaste/framework/test/fixtures/config/config.php (modified) (1 diff)
• branches/kaste/framework/test/unit/lib/AkActiveRecord/AkActsAsList.php (modified) (2 diffs)
• branches/kaste/framework/test/unit/lib/AkActiveRecord/AkActsAsNestedSet.php (modified) (2 diffs)
• branches/kaste/framework/test/unit/lib/AkActiveRecord/AkActsAsTree.php (modified) (2 diffs)
• branches/kaste/framework/test/unit/lib/AkActiveRecord/AkObserver.php (modified) (1 diff)
• branches/kaste/framework/test/unit/lib/AkActiveRecord/AkValidation.php (modified) (1 diff)
• branches/kaste/framework/test/unit/lib/AkActiveRecord/_AkActiveRecord_1.php (modified) (3 diffs)
• branches/kaste/framework/test/unit/lib/AkActiveRecord/_AkActiveRecord_locking.php (modified) (1 diff)
• branches/kaste/framework/test/unit/lib/AkInstaller.php (modified) (1 diff)

branches/kaste/framework/lib/Ak.php

@@ -64 +64 @@
-    function &db($dsn = null, $connection_id = null)
-    {
+        require_once(AK_LIB_DIR.DS.'AkActiveRecord'.DS.'AkDbAdapter.php');
+        return AkDbAdapter::getConnection();
-        static $db, $default_connection_id;
-

branches/kaste/framework/lib/AkActiveRecord.php

@@ -20 +20 @@
-
-require_once(AK_LIB_DIR.DS.'AkActiveRecord'.DS.'AkAssociatedActiveRecord.php');
+require_once(AK_LIB_DIR.DS.'AkActiveRecord'.DS.'AkDbAdapter.php');
-
-/**#@+
@@ -189 +190 @@
-    var $_tableName;
-    var $_db;
+    //var $_db_settings = ;
-    var $_newRecord;
-    var $_freeze;
@@ -2462 +2464 @@
-    function setConnection($dns = null, $connection_id = null)
-    {
-
+
+
-    }
-    
@@ -2470 +2473 @@
-    function _getDatabaseType()
-    {
-
-
-
-
-
-
-
-
-
+
-    }
-    /*/Database connection*/
@@ -2712 +2707 @@
-        if(empty($this->_columnsSettings) || !AK_ACTIVE_RECORD_ENABLE_PERSISTENCE){
-            if(empty($this->_dataDictionary)){
-
+->connection
-            }
-
@@ -4788 +4783 @@
-        $resulting_array = array();
-        if(!empty($source_array) && is_array($source_array) && func_num_args() > 1) {
-
-
-
-
-
-
-
-
+    
+    
+    
+    
+    
+    
+    
+    
-        }
-        return $resulting_array;

branches/kaste/framework/lib/AkActiveRecord/AkActsAsList.php

@@ -137 +137 @@
-    }
-
+    /**
+    * This function saves the object using save() before inserting it into the list
+    */
+    function insertAtPosition($position)
+    {
+        $this->_ActiveRecordInstance->transactionStart();
+        if($this->_ActiveRecordInstance->isNewRecord()){
+            $this->_ActiveRecordInstance->save();
+        }
+        $this->removeFromList();
+        $this->incrementPositionsOnLowerItems($position);
+
+        $this->_ActiveRecordInstance->updateAttribute($this->column, $position);
+        if($this->_ActiveRecordInstance->transactionHasFailed()){
+            $this->_ActiveRecordInstance->transactionComplete();
+            return false;
+        }
+
+        $this->_ActiveRecordInstance->transactionComplete();
+        return true;
+    }
+    
-    function moveLower()
-    {
@@ -167 +189 @@
-    }
-
-
-    function moveToBottom()
-    {
@@ -182 +203 @@
-        return false;
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-    function moveToTop()
-    {
@@ -239 +218 @@
-        return false;
-    }
+    
+    function assumeBottomPosition()
+    {
+        return $this->_ActiveRecordInstance->updateAttribute($this->column, $this->getBottomPosition($this->_ActiveRecordInstance->getId()) + 1);
+    }
+
+    function assumeTopPosition()
+    {
+        return $this->_ActiveRecordInstance->updateAttribute($this->column, 1);
+    }
+
+    function getBottomPosition($except = null)
+    {
+        return ($item = $this->getBottomItem($except)) ? $item->getAttribute($this->column) : 0;
+    }
+
+    /**
+    * Returns an instance of the item that's on the very bottom of the list. Returns false if there's none
+    */
+    function getBottomItem($except = null)
+    {
+        $conditions = $this->getScopeCondition();
+
+        if(isset($except)){
+            $conditions .= " AND id != $except";
+        }
+        return $this->_ActiveRecordInstance->find('first', array('conditions' => $conditions, 'order' => "{$this->column} DESC"));
+    }
+
+    function isInList()
+    {
+        return !empty($this->_ActiveRecordInstance->{$this->column});
+    }
+    
+    /**
+    * This has the effect of moving all the higher items up one.
+    */
+    function decrementPositionsOnHigherItems($position)
+    {
+        return $this->_ActiveRecordInstance->updateAll("{$this->column} = ({$this->column} - 1)", $this->getScopeCondition()." AND {$this->column} <= $position");
+    }
+
+    /**
+    * This has the effect of moving all the lower items up one.
+    */
+    function decrementPositionsOnLowerItems()
+    {
+        if($this->isInList()){
+            $this->_ActiveRecordInstance->updateAll("{$this->column} = ({$this->column} - 1)", $this->getScopeCondition()." AND {$this->column} > ".$this->_ActiveRecordInstance->getAttribute($this->column));
+            return true;
+        }
+        return false;
+    }
-
-    /**
@@ -251 +283 @@
-        return false;
-    }
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    function removeFromList()
-    {
@@ -269 +308 @@
-    }
-
-
-    function incrementPosition()
-    {
@@ -317 +355 @@
-        return false;
-    }
-
-
-    function addToListTop()
@@ -336 +373 @@
-        // True condition in case we don't have a scope
-        }elseif(empty($this->scope_condition) && empty($this->scope)){
-substr($this->_ActiveRecordInstance->_db->databaseType,0,4) == 'post
+$this->_ActiveRecordInstance->_db->type() == 'postgre
-        }elseif (!empty($this->scope)){
-            $this->setScopeCondition(join(' AND ',array_map(array(&$this,'getScopedColumn'),(array)$this->scope)));
@@ -364 +401 @@
-        }
-    }
-
-
-    /**
-    * This has the effect of moving all the higher items up one.
-    */
-    function decrementPositionsOnHigherItems($position)
-    {
-        return $this->_ActiveRecordInstance->updateAll("{$this->column} = ({$this->column} - 1)", $this->getScopeCondition()." AND {$this->column} <= $position");
-    }
-
-    /**
-    * This has the effect of moving all the lower items down one.
-    */
-    function incrementPositionsOnLowerItems($position)
-    {
-        return $this->_ActiveRecordInstance->updateAll("{$this->column} = ({$this->column} + 1)", $this->getScopeCondition()." AND {$this->column} >= $position");
-    }
-
-    function incrementPositionsOnAllItems()
-    {
-        return $this->_ActiveRecordInstance->updateAll("{$this->column} = ({$this->column} + 1)",  $this->getScopeCondition());
-    }
-
-
-
-    /**
-    * This function saves the object using save() before inserting it into the list
-    */
-    function insertAtPosition($position)
-    {
-        $this->_ActiveRecordInstance->transactionStart();
-        if($this->_ActiveRecordInstance->isNewRecord()){
-            $this->_ActiveRecordInstance->save();
-        }
-        $this->removeFromList();
-        $this->incrementPositionsOnLowerItems($position);
-
-        $this->_ActiveRecordInstance->updateAttribute($this->column, $position);
-        if($this->_ActiveRecordInstance->transactionHasFailed()){
-            $this->_ActiveRecordInstance->transactionComplete();
-            return false;
-        }
-
-        $this->_ActiveRecordInstance->transactionComplete();
-        return true;
-    }
-}
-

branches/kaste/framework/lib/AkActiveRecord/AkActsAsNestedSet.php

@@ -158 +158 @@
-            // True condition in case we don't have a scope
-        }elseif(empty($this->scope_condition) && empty($this->scope)){
-substr($this->_ActiveRecordInstance->_db->databaseType,0,4) == 'post
+$this->_ActiveRecordInstance->_db->type() == 'postgre
-        }elseif (!empty($this->scope)){
-            $this->setScopeCondition(join(' AND ',array_map(array(&$this,'getScopedColumn'),(array)$this->scope)));

branches/kaste/framework/lib/AkActiveRecord/AkActsAsTree.php

@@ -166 +166 @@
-        // True condition in case we don't have a scope
-        }elseif(empty($this->scope_condition) && empty($this->scope)){
-substr($this->_ActiveRecordInstance->_db->databaseType,0,4) == 'post
+$this->_ActiveRecordInstance->_db->type() == 'postgre
-        }elseif (!empty($this->scope)){
-            $this->setScopeCondition(join(' AND ',array_diff(array_map(array(&$this,'getScopedColumn'),(array)$this->scope),array(''))));

branches/kaste/framework/lib/AkActiveRecord/AkHasAndBelongsToMany.php

@@ -603 +603 @@
-        $options = $this->getOptions($this->association_id);
-        if(empty($options['finder_sql'])){
-sqlite = substr($this->Owner->_db->databaseType,0,6
+is_sqlite = $this->Owner->_db->type(
-            $options['finder_sql'] = "SELECT {$options['table_name']}.* FROM {$options['table_name']} ".
-
-
-($
-
-
+    
+    
+    ($is_
+    
+    
-        }
-        if(empty($options['counter_sql'])){

branches/kaste/framework/lib/AkDbManager.php

@@ -40 +40 @@
-        }
-        
-
+->connection
-        $sqlarray = $dict->CreateTableSQL($table_name, $table_fields, $table_options);
-        $dict->ExecuteSQLArray($sqlarray);

branches/kaste/framework/lib/AkInstaller.php

@@ -36 +36 @@
-    {
-        if(empty($db_connection)){
-::db
+DbAdapter::getConnection
-        }else {
-            $this->db =& $db_connection;
-        }
-
+
+        $this->db->connection->debug = $this->debug;
+        //$this->db->debug = $this->debug;
+
+        $this->data_dictionary = NewDataDictionary($this->db->connection);
-        $this->available_tables = $this->getAvailableTables();
-
-        $this->db->debug =& $this->debug;
-
-        $this->data_dictionary = NewDataDictionary($this->db);
-    }
-
@@ -77 +78 @@
-            $this->vervose = false;
-        }elseif(!empty($this->vervose) && AK_ENVIRONMENT == 'development'){
-
+connection->
-        }
-
@@ -233 +234 @@
-    function renameColumn($table_name, $old_column_name, $new_column_name)
-    {
-!strstr($this->db->databaseType,'mysql')
+$this->db->type() != 'mysql'
-            trigger_error(Ak::t('Column renaming is only supported when using MySQL databases'), E_USER_ERROR);
-        }
@@ -510 +511 @@
-    function _requiresSequenceTable($column_string)
-    {
-preg_match('/mysql|postgres/', $this->db->databaseType
+in_array($this->db->type(),array('mysql','postgre')
-            return false;
-        }

branches/kaste/framework/lib/constants.php

@@ -22 +22 @@
-if(AK_ENVIRONMENT != 'setup'){
-    $akdb = $database_settings[strtolower(AK_ENVIRONMENT)];
+    $GLOBALS['default_database_settings'] = $database_settings[strtolower(AK_ENVIRONMENT)];
-    $dsn = $akdb['type'] == 'sqlite' ?
-    'sqlite://'.urlencode($akdb['database_file']).'/?persist' :
@@ -112 +113 @@
-@ini_set("include_path",(AK_LIB_DIR.PATH_SEPARATOR.AK_MODELS_DIR.PATH_SEPARATOR.AK_CONTRIB_DIR.DS.'pear'.PATH_SEPARATOR.ini_get("include_path")));
-defined('AK_PHP5') ? null : define('AK_PHP5', version_compare(PHP_VERSION, '5', '>=') == 1 ? true : false);
+/* +++++++++++++ PHP5 ++++++++++++  */ if (!AK_PHP5) die('This branch is PHP5 only right now!');
-
-if(!AK_CLI && AK_WEB_REQUEST){

branches/kaste/framework/test/fixtures/config/config.php

@@ -43 +43 @@
-    include_once(AK_LIB_DIR.DS.'Ak.php');
-    Ak::db(&$dsn);
+    //require_once(AK_LIB_DIR.DS.'AkActiveRecord'.DS.'AkDbAdapter.php');
+    //AkDbAdapter::getConnection($GLOBALS['default_database_settings']);
-}
-

branches/kaste/framework/test/unit/lib/AkActiveRecord/AkActsAsList.php

@@ -100 +100 @@
-        }
-
-
+->connection
-        $sqlarray = $dict->CreateTableSQL($table['table_name'], $table['fields'], $table['table_options']);
-        $dict->ExecuteSQLArray($sqlarray);
@@ -171 +171 @@
-    {
-        $TodoItems =& new AkTestTodoItem();
-substr($TodoItems->_db->databaseType,0,4) == 'post
+$TodoItems->_db->type() == 'postgre
-        $TodoItems->list->setScopeCondition('true');
-        $this->assertEqual($TodoItems->list->getScopeCondition(), 'true');

branches/kaste/framework/test/unit/lib/AkActiveRecord/AkActsAsNestedSet.php

@@ -111 +111 @@
-        }
-
-
+->connection
-        $sqlarray = $dict->CreateTableSQL($table['table_name'], $table['fields'], $table['table_options']);
-        $dict->ExecuteSQLArray($sqlarray);
@@ -183 +183 @@
-    {
-        $Categories =& new AkTestNestedCategory();
-substr($Categories->_db->databaseType,0,4) == 'post
+$Categories->_db->type() == 'postgre
-        $Categories->nested_set->setScopeCondition('true');
-        $this->assertEqual($Categories->nested_set->getScopeCondition(), 'true');

branches/kaste/framework/test/unit/lib/AkActiveRecord/AkActsAsTree.php

@@ -124 +124 @@
-        }
-
-
+->connection
-        $sqlarray = $dict->CreateTableSQL($table['table_name'], $table['fields'], $table['table_options']);
-        $dict->ExecuteSQLArray($sqlarray);
@@ -194 +194 @@
-    {
-        $Categories =& new AkTestCategory();
-substr($Categories->_db->databaseType,0,4) == 'post
+$Categories->_db->type() == 'postgre
-        $Categories->tree->setScopeCondition('true');
-        $this->assertEqual($Categories->tree->getScopeCondition(), 'true');

branches/kaste/framework/test/unit/lib/AkActiveRecord/AkObserver.php

@@ -225 +225 @@
-        }
-
-
+->connection
-        $sqlarray = $dict->CreateTableSQL($table['table_name'], $table['fields'], $table['table_options']);
-        $dict->ExecuteSQLArray($sqlarray);

branches/kaste/framework/test/unit/lib/AkActiveRecord/AkValidation.php

@@ -138 +138 @@
-        }
-
-
+->connection
-        $sqlarray = $dict->CreateTableSQL($table['table_name'], $table['fields'], $table['table_options']);
-        $dict->ExecuteSQLArray($sqlarray);

branches/kaste/framework/test/unit/lib/AkActiveRecord/_AkActiveRecord_1.php

@@ -209 +209 @@
-        }
-
-
+->connection
-        $sqlarray = $dict->CreateTableSQL($table['table_name'], $table['fields'], $table['table_options']);
-        $dict->ExecuteSQLArray($sqlarray);
@@ -217 +217 @@
-        }
-        
-strstr($db->databaseType,
+($db->type() == 
-
-        $this->_testing_model_databases_to_delete[] = $table_name;
@@ -233 +233 @@
-        foreach ($this->_testing_model_databases_to_delete as $table_name){
-            $db->Execute('DROP TABLE '.$table_name);
-strstr($db->databaseType,
+($db->type() == 
-        }
-    }

branches/kaste/framework/test/unit/lib/AkActiveRecord/_AkActiveRecord_locking.php

@@ -107 +107 @@
-        }
-
-
+->connection
-        $sqlarray = $dict->CreateTableSQL($table['table_name'], $table['fields'], $table['table_options']);
-        $dict->ExecuteSQLArray($sqlarray);

branches/kaste/framework/test/unit/lib/AkInstaller.php

@@ -26 +26 @@
-    function Test_setup_expected_returns()
-    {
-
-
-
-
-
-
-
+
-
-        switch ($db_type) {