Add r\tableCreate r\tableList r\tableDrop shortcuts using default dat…

…abase. ( rethinkdb/rethinkdb#46 )
delectable-press · May 8, 2013 · d8c5a9a · d8c5a9a
1 parent c931253
commit d8c5a9a
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 8 deletions.
diff --git a/src/rdb/global.php b/src/rdb/global.php
@@ -35,6 +35,16 @@ function table($tableName, $useOutdated = null)
     return new Table(null, $tableName, $useOutdated);
 }
 
+function tableCreate($tableName, $options = null) {
+    return new TableCreate(null, $tableName, $options);
+}
+function tableDrop($tableName) {
+    return new TableDrop(null, $tableName);
+}
+function tableList() {
+    return new TableList(null);
+}
+
 function count()
 {
     $object = array('COUNT' => new BoolDatum(true));

diff --git a/src/rdb/queries/tables.php b/src/rdb/queries/tables.php
@@ -2,14 +2,16 @@
 
 class TableList extends ValuedQuery
 {
-    public function __construct(Db $database) {
+    public function __construct($database) {
+        if (isset($database) && !is_a($database, "\\r\\Db")) throw ("Database is not a Db object.");
         $this->database = $database;
     }
 
     public function getPBTerm() {
         $term = new pb\Term();
         $term->set_type(pb\Term_TermType::PB_TABLE_LIST);
-        $term->set_args(0, $this->database->getPBTerm());
+        if (isset($this->database))
+            $term->set_args(0, $this->database->getPBTerm());
         return $term;
     }
 
@@ -18,7 +20,8 @@ public function getPBTerm() {
 
 class TableCreate extends ValuedQuery
 {
-    public function __construct(Db $database, $tableName, $options = null) {
+    public function __construct($database, $tableName, $options = null) {
+        if (isset($database) && !is_a($database, "\\r\\Db")) throw ("Database is not a Db object.");
         if (!\is_string($tableName)) throw new RqlDriverError("Table name must be a string.");
         if (isset($options)) {
             if (!is_array($options)) throw new RqlDriverError("Options must be an array.");
@@ -38,9 +41,12 @@ public function __construct(Db $database, $tableName, $options = null) {
     public function getPBTerm() {
         $term = new pb\Term();
         $term->set_type(pb\Term_TermType::PB_TABLE_CREATE);
-        $term->set_args(0, $this->database->getPBTerm());
+        $i = 0;
+        if (isset($this->database)) {
+            $term->set_args($i++, $this->database->getPBTerm());
+        }
         $subDatum = new StringDatum($this->tableName);
-        $term->set_args(1, $subDatum->getPBTerm());
+        $term->set_args($i++, $subDatum->getPBTerm());
         if (isset($this->options)) {
             $i = 0;
             foreach ($this->options as $key => $val) {
@@ -61,7 +67,8 @@ public function getPBTerm() {
 
 class TableDrop extends ValuedQuery
 {
-    public function __construct(Db $database, $tableName) {
+    public function __construct($database, $tableName) {
+        if (isset($database) && !is_a($database, "\\r\\Db")) throw ("Database is not a Db object.");
         if (!\is_string($tableName)) throw new RqlDriverError("Table name must be a string.");
         $this->database = $database;
         $this->tableName = $tableName;
@@ -70,9 +77,12 @@ public function __construct(Db $database, $tableName) {
     public function getPBTerm() {
         $term = new pb\Term();
         $term->set_type(pb\Term_TermType::PB_TABLE_DROP);
-        $term->set_args(0, $this->database->getPBTerm());
+        $i = 0;
+        if (isset($this->database)) {
+            $term->set_args($i++, $this->database->getPBTerm());
+        }
         $subDatum = new StringDatum($this->tableName);
-        $term->set_args(1, $subDatum->getPBTerm());
+        $term->set_args($i++, $subDatum->getPBTerm());
         return $term;
     }