Changeset 429

Timestamp:

11/07/07 12:07:24 (1 year ago)

Author:

kaste

Message:

sql constructors now handle limit and offset clause. Added addLimitAndOffset to AkDbAdapter?. Refactored findBySql and findWithAssociations so they wont delegate limit/offset to the DbAdapter?, but will delegate bindings.

fixed a bug in test/unit/lib/AkActiveRecord/AkDbAdapter.php introduced in [428].

Files:

• branches/kaste/framework/lib/Ak.php (modified) (1 diff)
• branches/kaste/framework/lib/AkActiveRecord.php (modified) (3 diffs)
• branches/kaste/framework/lib/AkActiveRecord/AkAssociatedActiveRecord.php (modified) (7 diffs)
• branches/kaste/framework/lib/AkActiveRecord/AkDbAdapter.php (modified) (1 diff)
• branches/kaste/framework/lib/AkActiveRecord/AkDbAdapter_mysql.php (modified) (1 diff)
• branches/kaste/framework/lib/AkActiveRecord/AkHasOne.php (modified) (2 diffs)
• branches/kaste/framework/test/unit/lib/AkActiveRecord/AkDbAdapter.php (modified) (2 diffs)
• branches/kaste/framework/test/unit/lib/AkActiveRecord/_AkActiveRecord_2.php (modified) (1 diff)

branches/kaste/framework/lib/Ak.php

@@ -67 +67 @@
-        if (empty($dsn) || !is_array($dsn)) $dsn = array();
-        return AkDbAdapter::getConnection($dsn);
+    }
+    
+    /**
+     * @param string $message
+     * @param [OPTIONAL] $fatal triggers even in production-mode
+     */
+    function DeprecateWarning($message,$fatal=false)
+    {
+        if (!$fatal && AK_ENVIRONMENT == 'production') return;
+        if (is_array($message)){
+            //$args = func_get_args();
+            //$message = array_shift($message);
+            trigger_error(Ak::t("DEPRECATED WARNING: ".array_shift($message),$message), E_USER_NOTICE);    
+        } else
+            trigger_error(Ak::t("DEPRECATED WARNING: ".$message), E_USER_NOTICE);    
-    }
-

branches/kaste/framework/lib/AkActiveRecord.php

@@ -987 +987 @@
-    
-        if((!empty($options['include']) && $this->hasAssociations())){
-,  $limit, $offset
+
-        }else{
-, $limit, $offset
+
-        }
-    
@@ -1130 +1130 @@
-    function &findBySql($sql, $limit = null, $offset = null, $bindings = null)
-    {
+        if ($limit || $offset){
+            Ak::DeprecateWarning("You're calling AR::findBySql with \$limit or \$offset parameters. This has been deprecated.");
+            $this->_db->addLimitAndOffset($sql, array('limit'=>$limit,'offset'=>$offset));
+        }
-        if(!isset($this->_activeRecordHasBeenInstantiated)){
-            return Ak::handleStaticCall();
-        }
-
-
-
-
-
-
+
+
+
+
-        
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-        return $objects;
-    }
@@ -1375 +1356 @@
-
-        $sql  .= !empty($options['order']) ? ' ORDER BY  '.$options['order'] : '';
+        
+        $this->_db->addLimitAndOffset($sql,$options);
-
-        return $sql;

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

@@ -229 +229 @@
-    }
-
-, $limit = null, $offset = null
+
-    {
-        $result = false;
@@ -273 +273 @@
-
-        $sql = trim($this->constructFinderSqlWithAssociations($options));
-$sql = substr($sql, -5) == 'AND =' ? substr($sql, 0,-5) : $sql;
+//$sql = substr($sql, -5) == 'AND =' ? substr($sql, 0,-5) : $sql; // never called!
-
-        if(!empty($options['bind']) && is_array($options['bind']) && strstr($sql,'?')){
-            $sql = array_merge(array($sql),$options['bind']);
-        }
-limit, $offset, $
+
-
-        return $result;
@@ -305 +305 @@
-    function constructFinderSqlWithAssociations($options, $include_owner_as_selection = true)
-    {
+        $sql = 'SELECT ';
-        $selection = '';
-        if($include_owner_as_selection){
@@ -310 +311 @@
-                $selection .= '__owner.'.$column_name.' AS __owner_'.$column_name.', ';
-            }
-
-ql  = 'SELECT '.trim($selection.@$options['selection'], ', ').' '.
-    'FROM '.$this->getTableName().' AS __owner '.
-(!empty($options['joins']) ? $options['joins'].' ' : '');
-}else{
-    $sql  = 'SELECT '.$options['selection'].'.* '.
-    'FROM '.$options['selection'].' '.
-    (!empty($options['joins']) ? $options['joins'].' ' : '
-}
+
+election = trim($selection,', ').' '; // never used by the unit tests
+}else{ 
+// used only by HasOne::findAssociated
+    $selection .= $options['selection'].'.* ';
+}
+$sql .= $selection;
+$sql .= 'FROM '.($include_owner_as_selection ? $this->getTableName().' AS __owner ' : $options['selection'].' 
+$sql .= (!empty($options['joins']) ? $options['joins'].' ' : '');
-
-        empty($options['conditions']) ? null : $this->addConditions($sql, $options['conditions']);
@@ -327 +328 @@
-        }
-        $sql  .= !empty($options['order']) ? ' ORDER BY  '.$options['order'] : '';
+        
+        $this->_db->addLimitAndOffset($sql,$options);
-        return $sql;
-    }
@@ -334 +337 @@
-     * @todo Refactor in order to increase performance of associated inclussions
-     */
-
-
-
-
-
-
-
-
-
-
-
+
+
-        $objects = array();
+        $results = $this->_db->sqlexecute ($sql,'find with associations');
+        if (!$results) return $objects;
+
+        $i = 0;
+        $associated_ids = $this->getAssociatedIds();
+        $number_of_associates = count($associated_ids);
-        $_included_results = array(); // Used only in conjuntion with virtual limits for doing find('first',...include'=>...
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-                    }
-                }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-
@@ -439 +411 @@
-        }
-
-
-
-
-
-
-
+
-        return $result;
-    }

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

@@ -183 +183 @@
-    }
-    
+    function addLimitAndOffset(&$sql,$options)
+    {
+        if (isset($options['limit']) && $limit = $options['limit']){
+            $sql .= " LIMIT $limit";
+            if (isset($options['offset']) && $offset = $options['offset']){
+                $sql .= " OFFSET $offset";
+            }
+        }
+        return $sql;
+    }
+    
-    /* DATABASE STATEMENTS - CRUD */
-    

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

@@ -43 +43 @@
-        return 'mysql';
-    }
+
+    function addLimitAndOffset(&$sql,$options)
+    {
+        if (isset($options['limit']) && $limit = $options['limit']){
+            if (isset($options['offset']) && $offset = $options['offset'])
+                $sql .= " LIMIT $offset, $limit";
+            else
+                $sql .= " LIMIT $limit";
+        }
+        return $sql;
+    }
+    
-}
-?>

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

@@ -243 +243 @@
-    function &findAssociated($association_id)
-    {
-
-
-
-
+
-
-        if(empty($this->Owner->$association_id->__activeRecordObject)){
@@ -260 +257 @@
-        'order' => trim($this->Owner->$association_id->_addTableAliasesToAssociatedSql($table_name, $this->Owner->$association_id->getAssociationOption('order')))
-        );
-
-
+
+
+
+
-            $result =& $results[0];
-        }

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

@@ -25 +25 @@
-    function test_execute_should_handle_bindings()
-    {
-AkDbAdapter::getConnection(null,false
+new AkDbAdapter(array()
-        Mock::generate('ADOConnection');
-        $connection =& new MockADOConnection();
@@ -35 +35 @@
-        $db->sqlexecute(array('SELECT * FROM articles WHERE id=?',1));
-    }
+    
+    function test_should_add_limit_and_offset_mysql_style()
+    {
+        $mysql_db =& AkDbAdapter::getConnection(array('type'=>'mysql'),false);
+        $sql = 'SELECT * FROM articles';
+        $mysql_db->addLimitAndOffset($sql,array('limit'=>2,'offset'=>10));
+        $this->assertEqual('SELECT * FROM articles LIMIT 10, 2',$sql);
+        
+        $sql = 'SELECT * FROM articles';
+        $mysql_db->addLimitAndOffset($sql,array('offset'=>10));
+        $this->assertEqual('SELECT * FROM articles',$sql);
+
+        $sql = 'SELECT * FROM articles';
+        $mysql_db->addLimitAndOffset($sql,array('limit'=>10));
+        $this->assertEqual('SELECT * FROM articles LIMIT 10',$sql);
+    }
+
+    function test_should_add_limit_and_offset_common_style()
+    {
+        $mysql_db =& AkDbAdapter::getConnection(array('type'=>'postgre'),false);
+        $sql = 'SELECT * FROM articles';
+        $mysql_db->addLimitAndOffset($sql,array('limit'=>2,'offset'=>10));
+        $this->assertEqual('SELECT * FROM articles LIMIT 2 OFFSET 10',$sql);
+        
+        $sql = 'SELECT * FROM articles';
+        $mysql_db->addLimitAndOffset($sql,array('offset'=>10));
+        $this->assertEqual('SELECT * FROM articles',$sql);
+
+        $sql = 'SELECT * FROM articles';
+        $mysql_db->addLimitAndOffset($sql,array('limit'=>10));
+        $this->assertEqual('SELECT * FROM articles LIMIT 10',$sql);
+    }
-}
-

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

@@ -449 +449 @@
-        $FoundUsers = $Users->findBySql("SELECT * FROM ak_test_users",6);
-        $this->assertEqual(count($FoundUsers), 6);
+        $this->assertErrorPattern("/DEPRECATED WARNING.*findBySql.*/");
-        
-        $FoundUsers = $Users->findBySql("SELECT * FROM ak_test_users",6,6);
-        $this->assertEqual(count($FoundUsers), 3);
-
+
+
+
+
+
+
-    }
-