Merge

readme.md

@@ -9,4 +9,4 @@ Basic ORM module
 [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/samsonos/php_activerecord/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/samsonos/php_activerecord/?branch=master)
 [![Total Downloads](https://poser.pugx.org/samsonos/php_activerecord/downloads.svg)](https://packagist.org/packages/samsonos/php_activerecord)
 
-Developed by [SamsonOS](http://samsonos.com/)
+Developed by [SamsonOS](http://samsonos.com/)    

src/dbMySQL.php

@@ -231,7 +231,7 @@ protected function protectQueryValue($value)
     }
 
     /** @deprecated Use execute() */
-    public function &simple_query($sql)
+    public function simple_query($sql)
     {
         return $this->query($sql);
     }
@@ -264,11 +264,10 @@ protected function &getQueryFields($className, & $object = null, $straight = fal
             }
 
             // Only add attributes that have value
-            if ($object->$map_attribute != null) {
-                $value = $this->driver->quote($object->$map_attribute);
-                // Добавим значение поля, в зависимости от вида вывывода метода
-                $collection[$map_attribute] = ($straight ? $className::$_table_name . '.' . $map_attribute . '=' : '') . $value;
-            }
+            $value = $object->$map_attribute !== null ? $this->driver->quote($object->$map_attribute) : 'NULL';
+
+            // Добавим значение поля, в зависимости от вида вывывода метода
+            $collection[$map_attribute] = ($straight ? $className::$_table_name . '.' . $map_attribute . '=' : '') . $value;
         }
 
         // Вернем полученную коллекцию
@@ -579,7 +578,7 @@ public function &createObject(
         if (!isset(dbRecord::$instances[$className][$identifier]) || isset($dbData['__Count']) || sizeof($virtualFields)) {
 
             // Create empry dbRecord ancestor and store it to cache
-            dbRecord::$instances[$className][$identifier] = new $className();
+            dbRecord::$instances[$className][$identifier] = new $className($this, new dbQuery());
 
             // Pointer to object
             $object = &dbRecord::$instances[$className][$identifier];

src/dbQuery.php

@@ -406,7 +406,8 @@ public function __construct($entity = 'material')
             $entity = '\samson\activerecord\\'.$entity;
         }
 
-	$this->order = &$this->sorting;
+        $this->order = &$this->sorting;
+        $this->group = &$this->grouping;
 
         // Call parent constructor
         parent::__construct(db());