Merge pull request #332 from avbdr/master

fixes

Author: avbdr

MysqliDb.php

@@ -396,7 +396,7 @@ public function rawQueryValue ($query, $bindParams = null) {
      */
     public function query($query, $numRows = null)
     {
-        $this->_query = filter_var($query, FILTER_SANITIZE_STRING);
+        $this->_query = $query;
         $stmt = $this->_buildQuery($numRows);
         $stmt->execute();
         $this->_stmtError = $stmt->error;
@@ -694,7 +694,7 @@ public function join($joinTable, $joinCondition, $joinType = '')
             die ('Wrong JOIN type: '.$joinType);
 
         if (!is_object ($joinTable))
-            $joinTable = self::$prefix . filter_var($joinTable, FILTER_SANITIZE_STRING);
+            $joinTable = self::$prefix . $joinTable;
 
         $this->_join[] = Array ($joinType,  $joinTable, $joinCondition);
 

dbObject.php

@@ -11,6 +11,9 @@
  * @version   2.2
  *
  * @method int count ()
+ * @method dbObject ArrayBuilder()
+ * @method dbObject JsonBuilder()
+ * @method dbObject ObjectBuilder()
  * @method mixed byId (string $id, mixed $fields)
  * @method mixed get (mixed $limit, mixed $fields)
  * @method mixed getOne (mixed $fields)
@@ -181,21 +184,19 @@ public function __unset ($name) {
      *
      * @return dbObject
      */
-    public static function JsonBuilder () {
-        $obj = new static;
-        $obj->returnType = 'Json';
-        return $obj;
+    private function JsonBuilder () {
+        $this->returnType = 'Json';
+        return $return;
     }
 
     /**
      * Helper function to create dbObject with Array return type
      *
      * @return dbObject
      */
-    public static function ArrayBuilder () {
-        $obj = new static;
-        $obj->returnType = 'Array';
-        return $obj;
+    private function ArrayBuilder () {
+        $this->returnType = 'Array';
+        return $this;
     }
 
     /**
@@ -204,8 +205,9 @@ public static function ArrayBuilder () {
      *
      * @return dbObject
      */
-    public static function ObjectBuilder () {
-        return new static;
+    private function ObjectBuilder () {
+        $this->returnType = 'Object';
+        return $this;
     }
 
     /**
@@ -297,7 +299,7 @@ public function delete () {
      *
      * @return dbObject|array
      */
-    private function byId ($id, $fields = null) {
+    protected function byId ($id, $fields = null) {
         $this->db->where (MysqliDb::$prefix . $this->dbTable . '.' . $this->primaryKey, $id);
         return $this->getOne ($fields);
     }
@@ -310,7 +312,7 @@ private function byId ($id, $fields = null) {
      *
      * @return dbObject
      */
-    private function getOne ($fields = null) {
+    protected function getOne ($fields = null) {
         $this->processHasOneWith ();
         $results = $this->db->ArrayBuilder()->getOne ($this->dbTable, $fields);
         if ($this->db->count == 0)
@@ -340,7 +342,7 @@ private function getOne ($fields = null) {
      *
      * @return array Array of dbObjects
      */
-    private function get ($limit = null, $fields = null) {
+    protected function get ($limit = null, $fields = null) {
         $objects = Array ();
         $this->processHasOneWith ();
         $results = $this->db->ArrayBuilder()->get ($this->dbTable, $limit, $fields);
@@ -409,9 +411,11 @@ private function join ($objectName, $key = null, $joinType = 'LEFT') {
      *
      * @return int
      */
-    private function count () {
+    protected function count () {
         $res = $this->db->ArrayBuilder()->getValue ($this->dbTable, "count(*)");
-        return $res['cnt'];
+        if (!$res)
+            return 0;
+        return $res;
     }
 
     /**
@@ -608,6 +612,9 @@ private function validate ($data) {
                 case "int":
                     $regexp = "/^[0-9]*$/";
                     break;
+                case "double":
+                    $regexp = "/^[0-9\.]*$/";
+                    break;
                 case "bool":
                     $regexp = '/^[yes|no|0|1|true|false]$/i';
                     break;

tests/dbObjectTests.php

@@ -141,6 +141,12 @@ function createTable ($name, $data) {
     exit;
 }
 
+$products = product::with('userId')->ArrayBuilder()->get(2);
+if (!is_array ($products[0]['userId']) || !is_array ($products[1]['userId'])) {
+    echo "Error in with processing in get";
+    exit;
+}
+
 $depts = product::join('user')->orderBy('`products`.id', 'desc')->get(5);
 foreach ($depts as $d) {
     if (!is_object($d)) {