Fixes #1005, printing of r.table_list()

rethinkdb · Jun 13, 2013 · c2fee13 · c2fee13
1 parent 8768cb1
commit c2fee13
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 3 deletions.
diff --git a/drivers/python/rethinkdb/ast.py b/drivers/python/rethinkdb/ast.py
@@ -797,14 +797,26 @@ class TableCreate(RqlMethodQuery):
     tt = p.Term.TABLE_CREATE
     st = "table_create"
 
+class TableCreateTL(RqlTopLevelQuery):
+    tt = p.Term.TABLE_CREATE
+    st = "table_create"
+
 class TableDrop(RqlMethodQuery):
     tt = p.Term.TABLE_DROP
     st = "table_drop"
 
+class TableDropTL(RqlTopLevelQuery):
+    tt = p.Term.TABLE_DROP
+    st = "table_drop"
+
 class TableList(RqlMethodQuery):
     tt = p.Term.TABLE_LIST
     st = "table_list"
 
+class TableListTL(RqlTopLevelQuery):
+    tt = p.Term.TABLE_LIST
+    st = "table_list"
+
 class IndexCreate(RqlMethodQuery):
     tt = p.Term.INDEX_CREATE
     st = 'index_create'

diff --git a/drivers/python/rethinkdb/query.py b/drivers/python/rethinkdb/query.py
@@ -33,13 +33,13 @@ def db_list():
     return DbList()
 
 def table_create(table_name, primary_key=(), datacenter=(), cache_size=(), durability=()):
-    return TableCreate(table_name, primary_key=primary_key, datacenter=datacenter, cache_size=cache_size, durability=durability)
+    return TableCreateTL(table_name, primary_key=primary_key, datacenter=datacenter, cache_size=cache_size, durability=durability)
 
 def table_drop(table_name):
-    return TableDrop(table_name)
+    return TableDropTL(table_name)
 
 def table_list():
-    return TableList()
+    return TableListTL()
 
 def branch(predicate, true_branch, false_branch):
     return Branch(predicate, true_branch, false_branch)

diff --git a/test/rql_test/src/regression/1005.yaml b/test/rql_test/src/regression/1005.yaml
@@ -0,0 +1,19 @@
+desc: Regression test for issue #1005.
+tests:
+    - py: r.expr(str(r.table_list()))
+      ot: "r.table_list()"
+
+    - py: r.expr(str(r.table_create('a')))
+      ot: "r.table_create('a')"
+
+    - py: r.expr(str(r.table_drop('a')))
+      ot: "r.table_drop('a')"
+
+    - py: r.expr(str(r.db('a').table_list()))
+      ot: "r.db('a').table_list()"
+
+    - py: r.expr(str(r.db('a').table_create('a')))
+      ot: "r.db('a').table_create('a')"
+
+    - py: r.expr(str(r.db('a').table_drop('a')))
+      ot: "r.db('a').table_drop('a')"