Changeset 441

Timestamp:

11/17/07 08:12:30 (1 year ago)

Author:

kaste

Message:

Implemented availableTables() and getColumnDetails($table) in AkDbAdapter?, which replace former MetaTables() and MetaColumns().

Files:

• branches/kaste/framework/lib/AkActiveRecord.php (modified) (3 diffs)
• branches/kaste/framework/lib/AkActiveRecord/AkDbAdapter.php (modified) (4 diffs)
• branches/kaste/framework/lib/AkActiveRecord/AkDbAdapter_mysql.php (modified) (2 diffs)
• branches/kaste/framework/lib/AkInstaller.php (modified) (1 diff)
• branches/kaste/framework/lib/AkUnitTest.php (modified) (1 diff)
• branches/kaste/framework/test/unit/lib/AkActiveRecord/AkDbAdapter_schema.php (modified) (3 diffs)
• branches/kaste/framework/test/unit/lib/AkInstaller.php (modified) (3 diffs)
• branches/kaste/framework/test/unit/lib/utils/_Ak_object_inspection.php (modified) (1 diff)

branches/kaste/framework/lib/AkActiveRecord.php

@@ -2052 +2052 @@
-    function hasAttribute ($attribute)
-    {
-
+ // HINT: only used by HasAndBelongsToMany joinObjects, if the table is not present yet!
-        return isset($this->_columns[$attribute]) || (!empty($this->_combinedAttributes) && $this->isCombinedAttribute($attribute));
-    }
@@ -2439 +2439 @@
-                if(empty($_SESSION['__activeRecordColumnsSettingsCache']['available_tables']) || 
-                !AK_ACTIVE_RECORD_ENABLE_PERSISTENCE){
-Meta
+available
-                }
-                $available_tables = $_SESSION['__activeRecordColumnsSettingsCache']['available_tables'];
@@ -2543 +2543 @@
-    {
-        if(empty($_SESSION['__activeRecordColumnsSettingsCache']['database_table_'.$table.'_internals']) || !AK_ACTIVE_RECORD_ENABLE_PERSISTENCE){
-MetaColumn
+getColumnDetail
-        }
-        $cache[$table] = $_SESSION['__activeRecordColumnsSettingsCache']['database_table_'.$table.'_internals'];

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

@@ -40 +40 @@
-    function __destruct()
-    {
-
+//
-        //var_dump(self::$delegated_properties);
-    }
@@ -308 +308 @@
-    }
-      
+    /* TRANSACTIONS */
+    
+    function startTransaction()
+    {
+        return $this->connection->StartTrans();  
+    }
+
+    function stopTransaction()
+    {
+        return $this->connection->CompleteTrans();    
+    }
+    
+    function failTransaction()
+    {
+        return $this->connection->FailTrans();
+    }
+    
+    function hasTransactionFailed()
+    {
+        return $this->connection->HasFailedTrans();
+    }
-    
-    /* SCHEMA */
@@ -316 +337 @@
-    }
-    
-    /* TRANSACTIONS */
-    
-    function startTransaction()
-    {
-        return $this->connection->StartTrans();  
-    }
-
-    function stopTransaction()
-    {
-        return $this->connection->CompleteTrans();    
-    }
-    
-    function failTransaction()
-    {
-        return $this->connection->FailTrans();
-    }
-    
-    function hasTransactionFailed()
-    {
-        return $this->connection->HasFailedTrans();
-    }
-    
-    /* META */
+    
-    function availableTables()
-    {
@@ -346 +346 @@
-    function getColumnDetails($table_name)
-    {
-
-
+
+
+
+
+
+
+
+
+
+
+
-}
-

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

@@ -18 +18 @@
- * @license GNU Lesser General Public License <http://www.gnu.org/copyleft/lesser.html>
- */
-
-/* nothing in here, its more a demo */
-
-class AkDbAdapter_mysql extends AkDbAdapter
@@ -65 +63 @@
-        }
-        $column_type_definition = $column_details['Type'];
-=='NO
+!=='YES
-        if (!empty($column_details['Default'])) $column_type_definition .= " default '".$column_details['Default']."'";
-        return $this->sqlexecute("ALTER TABLE $table_name CHANGE COLUMN $column_name $new_name $column_type_definition");
-    }
-    
+    function availableTables()
+    {
+        return $this->selectValues('SHOW TABLES');
+    }
+    
+    
+    
-}
-?>

branches/kaste/framework/lib/AkInstaller.php

@@ -371 +371 @@
-    {
-        if(empty($this->available_tables)){
-array_diff((array)$this->db->MetaTables(), array('')
+$this->db->availableTables(
-        }
-        return $this->available_tables;

branches/kaste/framework/lib/AkUnitTest.php

@@ -96 +96 @@
-                return false;
-            }
-
+&
-            $installer->dropTable($table_name,array('sequence'=>true));
-            $installer->createTable($table_name,$table_definition);

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

@@ -9 +9 @@
-{
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    {
-        $db =& AkDbAdapter::getConnection();
@@ -18 +49 @@
-        ));
-        $table_name = 'rename_columns';
-
-
-
+_
+_
+_
-        
-        $this->assertError($db->renameColumn($table_name,'not_found','not_here'));
-    }
-    
-
+_
-    {
-        $old = $db->select("SHOW COLUMNS FROM $table_name LIKE '$old_name'");
@@ -38 +69 @@
-    }
-    
-
+s_for
-    {
-        $db =& AkDbAdapter::getConnection();

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

@@ -120 +120 @@
-        ");
-
-MetaColumn
+getColumnDetail
-
-        foreach ($this->expected_for_creating_table as $column=>$details){
@@ -237 +237 @@
-        $this->Installer = new AkInstaller();
-        $this->Installer->createTable('test_defaults','id,name,screen_name string,description,*url,owner_id,modified_at,created_on,is_featured,position,lock_version');
-MetaColumn
+getColumnDetail
-
-        foreach ($this->expected_for_default_types as $column=>$details){
@@ -274 +274 @@
-    {
-        $this->Installer->renameColumn('test_defaults','screen_name','real_name');
+        $this->Installer->dropTable('test_defaults');
-    }
-

branches/kaste/framework/test/unit/lib/utils/_Ak_object_inspection.php

@@ -59 +59 @@
-        require_once(AK_CONTRIB_DIR.'/adodb/adodb.inc.php');
-
-
-
-
-
-
+
-        $this->assertFalse(!$db,'Connecting to the database. Please check your test_config.php file in order to set up a copy of $dns into $GLOBALS["ak_test_db_dns"]');
-$GLOBALS['ak_test_db_dns']
+
-    }
-