Changeset 1287

Timestamp:

04/26/09 11:32:27 (1 year ago)

Author:

arnoschn

Message:

fixing a stupid Ak::compat() call.

= adding a $optionswrap? to finders.

Works as follows:

$optionswrap? = 'SELECT * FROM ({query}) a GROUP BY something";

the generated finder query is inserted for {query}.

SELECT * FROM (SELECT * FROM ... WHERE ...) a GROUP BY something";

this allows you to do group bys and still define the order of a date for example.

= added join-table columns to habtm sql generation, so you can use it in the "wrap" sql.

useful if you have information on the join class and you want to buildl conditions on that.

Files:

• trunk/lib/AkActiveRecord.php (modified) (6 diffs)
• trunk/lib/AkActiveRecord/AkAssociatedActiveRecord.php (modified) (2 diffs)
• trunk/lib/AkActiveRecord/AkAssociations/AkHasAndBelongsToMany.php (modified) (1 diff)

trunk/lib/AkActiveRecord.php

@@ -1 +1 @@
-<?php
-
+
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
@@ -965 +965 @@
-        }else{
-            $sql = $this->constructFinderSql($options);
+            if (isset($options['wrap'])) {
+                $sql = str_replace('{query}',$sql,$options['wrap']);
+            }
-            if(!empty($options['bind']) && is_array($options['bind']) && strstr($sql,'?')){
-                $sql = array_merge(array($sql),$options['bind']);
@@ -1002 +1005 @@
-                    $options['conditions'] = $table_name.'.'.$this->getPrimaryKey().' = '.$ids[0].(empty($conditions)?'':' AND '.$conditions);
-                } else {
+                    Ak::compat('stripos');
-                    if (false!==($pos=stripos($conditions,' WHERE '))) {
-                        $before_where = substr($conditions,0, $pos);
@@ -1024 +1028 @@
-                    $options['conditions'] = $ids_condition.(empty($conditions)?'':' AND '.$conditions);
-                } else {
+                    Ak::compat('stripos');
-                    if (false!==($pos=stripos($conditions,' WHERE '))) {
-                        $before_where = substr($conditions,0, $pos);
@@ -1054 +1059 @@
-            return false;
-        }
-
+wrap','
-        foreach (array_keys($options) as $key){
-            if (!in_array($key,$valid_keys)){
@@ -1411 +1416 @@
-                }
-            } else {
+                Ak::compat('stripos');
-                if (($wherePos=stripos($sql,'WHERE'))!==false) {
-                    if (!empty($type_condition)) {

trunk/lib/AkActiveRecord/AkAssociatedActiveRecord.php

@@ -239 +239 @@
-        $result = false;
-        $options ['include'] = Ak::toArray($options ['include']);
-
+
-        $included_associations = array ();
-        $included_association_options = array ();
@@ -343 +343 @@
-        
-        $sql = preg_replace('/,\s*,/',' , ',$sql);
-
+
+
+
+
+
-        if (! empty($options ['bind']) && is_array($options ['bind']) && strstr($sql, '?')) {
-            $sql = array_merge(array ($sql ), $options ['bind']);

trunk/lib/AkActiveRecord/AkAssociations/AkHasAndBelongsToMany.php

@@ -782 +782 @@
-        }
-
+        
+        $join_class = $association_options['join_class_name'];
+        Ak::import($join_class);
+        $join_obj = new $join_class;
+        $join_class_columns = array_keys($join_obj->getColumns());
+        foreach ($join_class_columns as $column_name){
+            $finder_options['selection'] .= $parent_handler_name.'__'.$handler_name.'__'.$join_class.'.'.$column_name.' AS '.$selection_parenthesis.$prefix.'['.$handler_name.']'.($pluralize?'[@'.$pk.']':'').'['.$join_class.']['.$column_name.']'.$selection_parenthesis.', ';
+        }
+        
-        $finder_options['selection'] = trim($finder_options['selection'], ', ');
-