fix test_threaded and minor tweaks

Author: ba0f3

private/connection.nim

@@ -100,13 +100,13 @@ proc addOption*(r: RethinkClient, k: string, v: MutableDatum) =
   ## Set a global option
   r.options.add((k, v))
 
-proc use*(r: RethinkClient, s: string) =
+proc use*(r: RethinkClient, s: string): RethinkClient {.discardable.} =
   ## Change the default database on this connection.
-  var term: RqlQuery
-  new(term)
+  var term = new(RqlQuery)
   term.tt = DB
   term.args = @[newDatum(s)]
   r.addOption("db", term.toDatum)
+  result = r
 
 proc newRethinkClient*(address = "127.0.0.1", port = Port(28015), db: string = ""): RethinkClient =
   ## Init new client instance
@@ -123,6 +123,11 @@ proc newRethinkClient*(address = "127.0.0.1", port = Port(28015), db: string = "
 
   if db != "":
     result.use(db)
+
+template R*(address = "127.0.0.1", port = Port(28015), db: string = ""): RethinkClient =
+  ## Alias for `newRethinkClient`
+  newRethinkClient(address, port, db)
+
 when not compileOption("threads"):
   proc handshake(r: RethinkClient) {.async.} =
     when defined(debug):
@@ -275,7 +280,7 @@ when not compileOption("threads"):
 
     result = newResponse(buf, token)
 
-  proc connect*(r: RethinkClient, username = "admin", password: string = ""): Future[void] {.async.} =
+  proc connect*(r: RethinkClient, username = "admin", password: string = ""): Future[RethinkClient] {.discardable, async.} =
     ## Create a new connection to the database server
     if not r.isConnected:
       if r.username != username:
@@ -287,6 +292,7 @@ when not compileOption("threads"):
       await r.sock.connect(r.address, r.port)
       r.sockConnected = true
       await r.handshake()
+    result = r
 
   proc reconnect*(r: RethinkClient) {.async.} =
     ## Close and reopen a connection
@@ -348,7 +354,7 @@ else:
       echo "<<< ", buf
     newResponse(buf, token)
 
-  proc connect*(r: RethinkClient, username = "admin", password: string = "") =
+  proc connect*(r: RethinkClient, username = "admin", password: string = ""): RethinkClient {.discardable.} =
     ## Create a new connection to the database server
     if not r.isConnected:
       if r.username != username:
@@ -360,6 +366,7 @@ else:
       r.sock.connect(r.address, r.port)
       r.sockConnected = true
       r.handshake()
+    result = r
 
   proc reconnect*(r: RethinkClient) =
     ## Close and reopen a connection

private/ql2.nim

@@ -5,7 +5,7 @@ const
 
 type
   ResponseType* = enum
-    SUCCESS_ATOM      = 1,  ## Query returned a single RQL datatype.
+    SUCCESS_ATOM      = 1, ## Query returned a single RQL datatype.
     SUCCESS_SEQUENCE  = 2, ## Query returned a sequence of RQL datatypes.
     SUCCESS_PARTIAL   = 3, ## Query returned a partial sequence of RQL
                            ## datatypes.  If you send a [CONTINUE] query with

private/rql.nim

@@ -17,8 +17,9 @@ proc row*[T: RethinkClient|RqlQuery](r: T): RqlQuery =
   #raise newException(RqlDriverError, "'r.row' is not callable, use 'r.row[...]' instead")
 
 
-proc repl*(r: RethinkClient) =
+proc repl*(r: RethinkClient): RethinkClient {.discardable.} =
   defaultClient = r
+  result = r
 
 when not compileOption("threads"):
   proc run*(r: RqlQuery, c: RethinkClient = nil, readMode = "single",

private/utils.nim

@@ -6,25 +6,18 @@ template NEW_QUERY*(t: TermType): void =
   result = newQuery(t)
 
 template NEW_QUERY*(t: TermType, a1: typed): void =
-  result = newQuery(t)
-  result.addArg(a1)
+  result = newQuery(t).addArg(a1)
 
 template NEW_QUERY*(t: TermType, a1, a2: typed): void =
-  result = newQuery(t)
-  result.addArg(a1)
-  result.addArg(a2)
+  result = newQuery(t).addArg(a1).addArg(a2)
 
 template NEW_QUERY*(t: TermType, a1, a2, a3: typed): void =
-  result = newQuery(t)
-  result.addArg(a1)
-  result.addArg(a2)
-  result.addArg(a3)
+  result = newQuery(t).addArg(a1).addArg(a2).addArg(a3)
 
 proc newQuery*(tt: TermType): RqlQuery {.inline.} =
-  new result
+  result = new(RqlQuery)
   result.tt = tt
 
-
 proc newDatum*[T](t: T): RqlQuery =
   when t is RqlQuery:
     result = t
@@ -33,14 +26,12 @@ proc newDatum*[T](t: T): RqlQuery =
   else:
     result = RqlQuery(tt: DATUM, value: t.toDatum)
 
-proc `@`*[T](t: T): RqlQUery =
-  newDatum(t)
-
-proc addArg*[T](r: RqlQuery, t: T) =
+proc addArg*[T](r: RqlQuery, t: T): RqlQuery {.discardable.} =
   when t is RqlQuery:
     r.args.add(t)
   else:
     r.args.add(newDatum(t))
+  result = r
 
 proc setOption*(r: RqlQuery, k: string, v: RqlQuery) {.noSideEffect, inline.} =
   r.optargs.add((k, v))

rethinkdb.nimble

@@ -5,4 +5,4 @@ license       = "MIT"
 
 skipDirs      = @["tests", "bench"]
 
-requires "nim >= 1.0.4", "struct >= 0.1.2", "scram >= 0.1.1"
+requires "nim >= 1.0.4", "struct >= 0.2.1", "scram >= 0.1.1"

tests/test_db.nim

@@ -3,11 +3,9 @@ import ../rethinkdb
 
 randomize()
 
-let db = "test_db_" & $random(9999)
+let db = "test_db_" & $rand(9999)
 var ret: JsonNode
-let r = newRethinkClient()
-r.connect()
-r.repl()
+let r = R.connect().repl()
 
 
 suite "database manipulation tests":

tests/test_geo.nim

@@ -1,11 +1,9 @@
 import unittest, json, random
 import ../rethinkdb
 
-let r = newRethinkClient()
-r.connect()
-r.repl()
+let r = R.connect().repl()
 randomize()
-let db = "test_geo_" & $random(9999)
+let db = "test_geo_" & $rand(9999)
 let table = "nodes"
 
 discard r.dbCreate(db).run()

tests/test_lambdas.nim

@@ -1,12 +1,10 @@
 import unittest, json, random
 import ../rethinkdb
 
-let r = newRethinkClient()
-r.connect()
-r.repl()
+let r = R.connect().repl()
 
 randomize()
-let db = "test_lambda_" & $random(9999)
+let db = "test_lambda_" & $rand(9999)
 let table = "SuperHeroes"
 
 discard r.dbCreate(db).run()

tests/test_math_logic.nim

@@ -1,9 +1,7 @@
 import unittest, json
 import ../rethinkdb
 
-let r = newRethinkClient()
-r.connect()
-r.repl()
+let r = R.connect().repl()
 
 suite "math and logic tests":
   test "add":

tests/test_ordering.nim

@@ -1,12 +1,10 @@
 import unittest, json, random
 import ../rethinkdb
 
-let r = newRethinkClient()
-r.connect()
-r.repl()
+let r = R.connect().repl()
 
 randomize()
-let db = "test_lambda_" & $random(9999)
+let db = "test_lambda_" & $rand(9999)
 let table = "SuperHeroes"
 
 r.dbCreate(db).run()