Changeset 227 for trunk/trax/vendor/trax/active_record.php

Timestamp:

07/09/06 14:53:36 (6 years ago)

Author:

john

Message:

added PHP Shell an interactive shell to interact with your apps models

Files:

• trunk/trax/vendor/trax/active_record.php (modified) (3 diffs)

trunk/trax/vendor/trax/active_record.php

@@ -1127 +1127 @@
         //          .', ' . (is_null($joins)?'null':$joins).')');
 
+        $offset = null;
+        $per_page = null;
+
+        # this is if they passed in an associative array to emulate
+        # named parameters.
+        if(is_array($conditions)) {
+            if(@array_key_exists("per_page", $conditions) && !is_numeric($conditions['per_page'])) {
+                extract($conditions); 
+                $per_page = 0;   
+            } else {
+                extract($conditions);     
+            }
+            # If conditions wasn't in the array set it to null
+            if(is_array($conditions)) {
+                $conditions = null;    
+            }  
+        }
+
         # Test source of SQL for query
         if(stristr($conditions, "SELECT")) {
@@ -1133 +1151 @@
         } else {
             # SQL will be built from specifications in argument
-            $sql  = "SELECT * FROM ".$this->table_name." ";
-            
-            # this is if they passed in an associative array to emulate
-            # named parameters.
-            if(is_array($conditions)) {
-                if(@array_key_exists("per_page", $conditions) && !is_numeric($conditions['per_page'])) {
-                    extract($conditions); 
-                    $per_page = 0;   
-                } else {
-                    extract($conditions);     
-                }
-                # If conditions wasn't in the array set it to null
-                if(is_array($conditions)) {
-                    $conditions = null;    
-                }  
-            }
+            $sql  = "SELECT * FROM ".$this->table_name." ";         
             
             # If join specified, include it
@@ -1265 +1268 @@
      */
     function find($id, $order = null, $limit = null, $joins = null) {
+        $find_all = false;
         if(is_array($id)) {
             if($id[0]) {