Changeset 5637 for trunk/prototype/services/PostgreSQL.php

Timestamp:

03/06/12 02:03:17 (12 years ago)

Author:

cristiano

Message:

Ticket #2497 - Nova estrategia para o salvamento automatico de rascunhos

File:

• trunk/prototype/services/PostgreSQL.php (modified) (4 diffs)

trunk/prototype/services/PostgreSQL.php

@@ -18 +18 @@
     }
 
-   public function read ( $uri, $justthese = false ){
+   public function read ( $uri, $justthese = false , $criteria = false){
       
-      $map =  Config::get($uri['concept'], 'PostgreSQL.mapping');
-       
+      $map =  Config::get($uri['concept'], 'PostgreSQL.mapping');   
       $justthese = self::parseJustthese($justthese, $map);
-
-      return $this->execResultSql( 'SELECT '.$justthese['select'].' FROM '. (Config::get($uri['concept'],'PostgreSQL.concept')) .' WHERE id = \''.addslashes( $uri['id'] ).'\'', true );
+      $criteria = ($criteria !== false) ? $this->parseCriteria ( $criteria , $map , ' WHERE id = \''.addslashes( $uri['id'] ).'\'') : '';
+      
+      return $this->execResultSql( 'SELECT '.$justthese['select'].' FROM '. (Config::get($uri['concept'],'PostgreSQL.concept')) .$criteria , true );
     }
         
@@ -174 +174 @@
     }
         
-    private static function parseCriteria( $criteria  , &$map ){               
-            
-            $result = '';
+    private static function parseCriteria( $criteria  , &$map , $query = '' ){               
         
             if( isset($criteria["filter"]) && $criteria["filter"] !== NULL )
@@ -190 +188 @@
                   *         array( '=' , 'campo' , 'valor' )
                 */
-
-                    $result .= 'WHERE ('.self::parseFilter( $criteria['filter'] , $map).')';
+                $query .= ($query === '') ?  'WHERE ('.self::parseFilter( $criteria['filter'] , $map).')' : ' AND ('.self::parseFilter( $criteria['filter'] , $map).')';
             }
             /*
@@ -200 +197 @@
             {
                 foreach ($criteria["join"] as $i => $v)
-                    $result .= ' AND '.$i.' = '.$v.' ';
+                    $query .= ' AND '.$i.' = '.$v.' ';
             }
             
             if( isset($criteria["group"]) )
             {
-                    $result .= ' GROUP BY '.( is_array($criteria["group"]) ? implode(', ', $criteria["group"]) : $criteria["group"] ).' ';
+                    $query .= ' GROUP BY '.( is_array($criteria["group"]) ? implode(', ', $criteria["group"]) : $criteria["group"] ).' ';
             }
             
             if( isset($criteria["order"]) )
             {
-                    $result .= ' ORDER BY '.self::parseOrder( $criteria["order"], $map ).' ';
+                    $query .= ' ORDER BY '.self::parseOrder( $criteria["order"], $map ).' ';
             }
             if( isset($criteria["limit"]) )
             {
-                    $result .= ' LIMIT '. $criteria["limit"] .' ';
+                    $query .= ' LIMIT '. $criteria["limit"] .' ';
             }
             if( isset($criteria["offset"]) )
             {
-                    $result .= ' OFFSET '. $criteria["offset"] .' ';
-            }
-            
-            return $result;
+                    $query .= ' OFFSET '. $criteria["offset"] .' ';
+            }
+            
+            return $query;
     }