Pgsql encoder

DynamicActiveQuery.php

@@ -216,7 +216,7 @@ public function createCommand($db = null)
             % (`?) \(! \s*?
                 ( [a-z_\x7f-\xff][a-z0-9_\x7f-\xff]* (?: \. [^.|\s]+)* )
                 (?:  \| (binary (?:\(\d+\))? | char (?:\(\d+\))? | time (?:\(\d+\))? | datetime (?:\(\d+\))? | date
-                        | decimal (?:\(\d\d?(?:,\d\d?)?\))?  | double (?:\(\d\d?,\d\d?\))?
+                        | decimal (?:\(\d\d?(?:,\d\d?)?\))?  | double (?:\(\d\d?,\d\d?\))? | numeric? | text ? |
                         | int(eger)? | (?:un)? signed (?:\s+int(eger)?)?)  )?
             \s*? !\) \1 %ix
 REGEXP;

DynamicActiveRecord.php

@@ -154,9 +154,9 @@ public function getAttribute($name)
                 return null;
             }
             $ref = &$ref[$key];
-        }
-
-        return $ref;
+        }  
+        
+         return $ref;
     }
 
     /**

encoder/EncoderInterface.php

@@ -19,7 +19,7 @@ interface EncoderInterface
      *
      * @return string a SQL expression
      */
-    public function dynamicAttributeExpression($name, $type = 'char');
+    public function dynamicAttributeExpression($name, $type);
 
     /**
      * Generates an SQL expression to select value of the dynamic column.

encoder/PgsqlEncoder.php

@@ -19,16 +19,34 @@ class PgsqlEncoder extends BaseEncoder
      *
      * @return string a SQL expression
      */
-    public function dynamicAttributeExpression($name, $type = 'char')
+        public function dynamicAttributeExpression($name, $type=null)
     {
         $modelClass = $this->modelClass;
-        $sql = '[[' . $modelClass::dynamicColumn() . ']]';
-        foreach (explode('.', $name) as $column) {
-            $sql = "($sql->'$column' AS $type)";
+        $sqlarray=  explode('|', $name);
+      //  $sql=$sqlarray[0];
+        if (isset($sqlarray[1]))
+        {
+            $type=$sqlarray[1];
         }
-
-        return $sql;
+       // $sql = '[[' . $modelClass::dynamicColumn() . ']]';
+        $sql=str_replace(".","','",$sqlarray[0]);
+    if (!isset($type))  
+    { return 'jsonb_extract_path('.$modelClass::dynamicColumn().',\''.$sql.'\')::jsonb';}
+    else if ($type=='text' || $type=='char')
+    { return 'jsonb_extract_path_text('.$modelClass::dynamicColumn().',\''.$sql.'\')';}
+    else 
+    { return 'jsonb_extract_path('.$modelClass::dynamicColumn().',\''.$sql.'\')::jsonb::text::'.$type;}
     }
+//    public function dynamicAttributeExpression($name, $type = 'char')
+//    {
+//        $modelClass = $this->modelClass;
+//        $sql = '[[' . $modelClass::dynamicColumn() . ']]';
+//        foreach (explode('.', $name) as $column) {
+//            $sql = "($sql->'$column' AS $type)";
+//        }
+//
+//        return $sql;
+//    }
 
     /**
      * Generates an SQL expression to select value of the dynamic column.
@@ -44,7 +62,7 @@ public function dynamicColumnExpression()
     /**
      * Creates a dynamic column SQL expression representing the given attributes.
      *
-     * @param array $attributes the dynamic attributes, which may be nested
+     * @param array $attributes the dynamic attributes, which may be json encoded
      *
      * @return null|\yii\db\Expression
      */
@@ -56,10 +74,12 @@ public function encodeDynamicColumn($attributes) {
         $params = [];
 
         // todo For now we only have Maria. Add PgSQL and generic JSON.
-        static::encodeDynamicAttributeArray($attributes);
-        $sql = static::dynColSqlMaria($attributes, $params);
-
-        return new \yii\db\Expression($sql, $params);
+         static::encodeDynamicAttributeArray($attributes);
+       $sql = json_encode($attributes); //simply encode attributes
+      // $sql = static::dynColSqlMaria($attributes, $params);
+       $sql='\''.$sql.'\''; //simply add ' ' before and after so pg accepts the value
+       return new \yii\db\Expression('(select CAST ('.$sql.' AS JSONB))', $params);
+
     }
 
     /**
@@ -92,10 +112,10 @@ function ($matches) {
 
         return $decoded;
     }
-
+    
     /**
      * Creates the SQL and parameter bindings for setting dynamic attributes
-     * in a DB record as Dynamic Columns in Maria.
+     * in a DB record as Dynamic Columns in Postgres.
      *
      * @param array $attrs the dynamic attributes, which may be nested
      * @param array $params expression parameters for binding, passed by reference
@@ -113,12 +133,10 @@ private static function dynColSqlMaria(array $attrs, & $params)
             if ($value === [] || $value === null) {
                 continue;
             }
-
             $phKey = static::placeholder();
             $phValue = static::placeholder();
             $sql[] = $phKey;
             $params[$phKey] = $key;
-
             if ($value instanceof ValueExpression || is_float($value)) {
                 $sql[] = $value;
             } elseif (is_scalar($value)) {
@@ -128,7 +146,104 @@ private static function dynColSqlMaria(array $attrs, & $params)
                 $sql[] = static::dynColSqlMaria($value, $params);
             }
         }
-
-        return $sql === [] ? 'null' : 'json_build_object(' . implode(',', $sql) . ')::jsonb';
+       return $sql === [] ? 'null' : 'json_build_object(' . implode(',', $sql) . ')::jsonb';
+    //  return $sql === [] ? 'null' : '[' . implode(',', $sql) .']';
+       // return json_encode($sql);
     }
+        /**
+     * Creates the SQL and parameter bindings for setting dynamic attributes
+     * in a DB record as Dynamic Columns in Maria.
+     *
+     * @param array $attrs the dynamic attributes, which may be nested
+     * @param array $params expression parameters for binding, passed by reference
+     *
+     * @return string SQL for a DB Expression
+     * @throws \yii\base\Exception
+     */
+//        private static function jsonbColSqlPg(array $attrs, & $params)
+//    {
+//        $sql = [];
+//       $sql[]=$attrs;
+//                
+//        foreach ($attrs as $value) 
+//            {
+//             if (is_array($value))
+//             {
+//                 foreach($value as $val)
+//                  { do 
+//                      if (is_array($val))
+//                   {
+//                     $val=array_shift($val);
+//                     $sql[]=json_encode($val);
+//                   }
+//                   else {$sql[]=$val;}
+//                   while (is_array($val));
+//                 }
+//                 
+//             }
+//            
+//            else
+//             {
+//             $sql[]=$value;
+//             }
+//            }
+
+//            if (is_object($value) && !($value instanceof ValueExpression)) {
+//                $value = method_exists($value, 'toArray') ? $value->toArray() : (array) $value;
+//            }
+//            if ($value === [] || $value === null) {
+//                continue;
+//            }
+//
+////            $phKey = static::placeholder();
+////            $phValue = static::placeholder();
+////            $sql[] = $phKey;
+////            $params[$phKey] = $key;
+//
+//            if ($value instanceof ValueExpression || is_float($value)) {
+//                $sql[] = $value;
+//            } elseif (is_scalar($value)) {
+//                $sql[] = $phValue;
+//                $params[$phValue] = $value;
+//            } elseif (is_array($value)) {
+//                $sql[] = static::dynColSqlMaria($value, $params);
+//            }
+//        }
+        // $sql=  json_encode($sql);
+    //   $sql=  json_encode(array_values($sql));
+      // $sqlval=new \stdClass();
+     //  $sql=  array_shift($sql);
+     // $sql= array_shift($sql);
+//      $sqlval=(object) array($sql);
+//      $sqlexpr=  json_encode($sqlval);
+//        return $sql === [] ? 'null' : $sqlexpr;
+//    }
+//    private static function dynColSqlMaria(array $attrs, & $params)
+//    {
+//        $sql = [];
+//        foreach ($attrs as $key => $value) {
+//            if (is_object($value) && !($value instanceof ValueExpression)) {
+//                $value = method_exists($value, 'toArray') ? $value->toArray() : (array) $value;
+//            }
+//            if ($value === [] || $value === null) {
+//                continue;
+//            }
+//
+//            $phKey = static::placeholder();
+//            $phValue = static::placeholder();
+//            $sql[] = $phKey;
+//            $params[$phKey] = $key;
+//
+//            if ($value instanceof ValueExpression || is_float($value)) {
+//                $sql[] = $value;
+//            } elseif (is_scalar($value)) {
+//                $sql[] = $phValue;
+//                $params[$phValue] = $value;
+//            } elseif (is_array($value)) {
+//                $sql[] = static::dynColSqlMaria($value, $params);
+//            }
+//        }
+//
+//        return $sql === [] ? 'null' : 'json_build_object(' . implode(',', $sql) . ')::jsonb';
+//    }
 }