Merge pull request #7 from jupitern/development

->setDatabase($db) no longer needed

Author: Nuno Chaves

README.md

@@ -52,7 +52,6 @@ $collection = $db->selectCollection('collectionName');
 
 // insert a record
 $rid = \Jupitern\CosmosDb\QueryBuilder::instance()
-    ->setDatabase($db)
     ->setCollection($collection)
     ->setPartitionKey('country')
     ->save(['id' => '1', 'name' => 'John Doe', 'age' => 22, 'country' => 'Portugal']);
@@ -61,7 +60,6 @@ echo "record inserted: $rid".PHP_EOL;
 
 // insert a record
 $rid = \Jupitern\CosmosDb\QueryBuilder::instance()
-    ->setDatabase($db)
     ->setCollection($collection)
     ->setPartitionKey('country')
     ->save(['id' => '2', 'name' => 'Jane doe', 'age' => 35, 'country' => 'Portugal']);
@@ -70,7 +68,6 @@ echo "record inserted: $rid".PHP_EOL;
 
 // update a record
 $rid = \Jupitern\CosmosDb\QueryBuilder::instance()
-    ->setDatabase($db)
     ->setCollection($collection)
     ->setPartitionKey('country')
     ->save(["_rid" => $rid, 'id' => '2', 'name' => 'Jane Doe Something', 'age' => 36, 'country' => 'Portugal']);
@@ -81,7 +78,6 @@ echo "get one row as array:".PHP_EOL;
 
 // get one row as array
 $res = \Jupitern\CosmosDb\QueryBuilder::instance()
-    ->setDatabase($db)
     ->setCollection($collection)
     ->select("c.id, c.name")
     ->where("c.age > @age and c.country = @country")
@@ -95,7 +91,6 @@ echo "get 5 rows as array with id as array key:".PHP_EOL;
 
 // get top 5 rows as array with id as array key
 $res = \Jupitern\CosmosDb\QueryBuilder::instance()
-    ->setDatabase($db)
     ->setCollection($collection)
     ->select("c.id, c.username")
     ->where("c.age > @age and c.country = @country")
@@ -110,7 +105,6 @@ echo "get rows as array of objects with collection alias and cross partition que
 
 // get rows as array of objects with collection alias and cross partition query
 $res = \Jupitern\CosmosDb\QueryBuilder::instance()
-    ->setDatabase($db)
     ->setCollection($collection)
     ->select("TestColl.id, TestColl.name")
     ->from("TestColl")
@@ -124,7 +118,6 @@ echo "delete one document:".PHP_EOL;
 
 // delete one document that match criteria (single partition)
 $res = \Jupitern\CosmosDb\QueryBuilder::instance()
-    ->setDatabase($db)
     ->setCollection($collection)
     ->setPartitionKey('country')
     ->where("c.age > 30 and c.country = 'Portugal'")
@@ -136,12 +129,11 @@ echo "delete all documents:".PHP_EOL;
 
 // delete all documents that match criteria (cross partition)
 $res = \Jupitern\CosmosDb\QueryBuilder::instance()
-    ->setDatabase($db)
-    ->setPartitionKey('country')
     ->setCollection($collection)
+    ->setPartitionKey('country')
     ->where("c.age > 20")
     ->deleteAll(true);
 
 var_dump($res);
 
-```
+```

examples/example1.php

@@ -13,7 +13,6 @@
 
 // insert a record
 $rid = \Jupitern\CosmosDb\QueryBuilder::instance()
-    ->setDatabase($db)
     ->setCollection($collection)
     ->setPartitionKey('country')
     ->save(['id' => '1', 'name' => 'John Doe', 'age' => 22, 'country' => 'Portugal']);
@@ -22,7 +21,6 @@
 
 // insert a record
 $rid = \Jupitern\CosmosDb\QueryBuilder::instance()
-    ->setDatabase($db)
     ->setCollection($collection)
     ->setPartitionKey('country')
     ->save(['id' => '2', 'name' => 'Jane doe', 'age' => 35, 'country' => 'Portugal']);
@@ -31,7 +29,6 @@
 
 // update a record
 $rid = \Jupitern\CosmosDb\QueryBuilder::instance()
-    ->setDatabase($db)
     ->setCollection($collection)
     ->setPartitionKey('country')
     ->save(["_rid" => $rid, 'id' => '2', 'name' => 'Jane Doe Something', 'age' => 36, 'country' => 'Portugal']);
@@ -42,7 +39,6 @@
 
 // get one row as array
 $res = \Jupitern\CosmosDb\QueryBuilder::instance()
-    ->setDatabase($db)
     ->setCollection($collection)
     ->select("c.id, c.name")
     ->where("c.age > @age and c.country = @country")
@@ -56,7 +52,6 @@
 
 // get top 5 rows as array with id as array key
 $res = \Jupitern\CosmosDb\QueryBuilder::instance()
-    ->setDatabase($db)
     ->setCollection($collection)
     ->select("c.id, c.username")
     ->where("c.age > @age and c.country = @country")
@@ -71,7 +66,6 @@
 
 // get rows as array of objects with collection alias and cross partition query
 $res = \Jupitern\CosmosDb\QueryBuilder::instance()
-    ->setDatabase($db)
     ->setCollection($collection)
     ->select("Users.id, Users.name")
     ->from("Users")
@@ -85,7 +79,6 @@
 
 // delete one document that match criteria
 $res = \Jupitern\CosmosDb\QueryBuilder::instance()
-    ->setDatabase($db)
     ->setCollection($collection)
     ->setPartitionKey('country')
     ->where("c.age > 30 and c.country = 'Portugal'")
@@ -97,7 +90,6 @@
 
 // delete all documents that match criteria
 $res = \Jupitern\CosmosDb\QueryBuilder::instance()
-    ->setDatabase($db)
     ->setPartitionKey('country')
     ->setCollection($collection)
     ->where("c.age > 20")

src/QueryBuilder.php

@@ -22,7 +22,6 @@ class QueryBuilder
 {
 
     /** @var \Jupitern\CosmosDb\CosmosDbDatabase $db */
-    private $db = null;
     private $collection = "";
     private $partitionKey = null;
     private $fields = "";
@@ -49,17 +48,6 @@ public static function instance()
     }
 
 
-    /**
-     * @param CosmosDbDatabase $db
-     * @return $this
-     */
-    public function setDatabase(CosmosDbDatabase $db)
-    {
-        $this->db = $db;
-        return $this;
-    }
-
-
     /**
      * @param CosmosDbCollection $collection
      * @return $this
@@ -244,8 +232,7 @@ public function save($document)
         return $resultObj->_rid ?? null;
     }
 
-    
-    /* delete */
+    /* DELETE */
 
     /**
      * @param boolean $isCrossPartition