Adding tests for Issue #6

Respect parameter formatting style in inclause filter

jinjasql/core.py

@@ -12,10 +12,14 @@
     from ordereddict import OrderedDict
 
 from threading import local
-import random
+from random import Random
 
 _thread_local = local()
 
+# This is mocked in unit tests for deterministic behaviour
+random = Random()
+
+
 class JinjaSqlException(Exception):
     pass
 

run_tests

@@ -2,7 +2,9 @@
 
 import unittest
 from tests import all_tests
+import sys
 
 if __name__ == "__main__":
     tests = all_tests()
-    results = unittest.TextTestRunner().run(tests)
+    ret = not unittest.TextTestRunner().run(tests).wasSuccessful()
+    sys.exit(ret)

tests/yaml/macros.yaml

@@ -4,7 +4,7 @@ template: >
     SELECT project, timesheet, hours
     FROM timesheet
     WHERE project_id = {{request.project_id}} 
-    and user_id =  {{ session.user_id }}
+    and user_id = {{ session.user_id }}
 expected_sql: 
     format: >
         SELECT project, timesheet, hours
@@ -35,7 +35,18 @@ expected_sql:
     format: >
         select * from timesheet 
         where day in (%s,%s,%s,%s,%s)
-
+    qmark: >
+        select * from timesheet 
+        where day in (?,?,?,?,?)
+    numeric: >
+        select * from timesheet 
+        where day in (:1,:2,:3,:4,:5)
+    numeric: >
+        select * from timesheet 
+        where day in (:1,:2,:3,:4,:5)
+    numeric: >
+        select * from timesheet 
+        where day in (:1,:2,:3,:4,:5)
 ---
 name: test_macros
 template: >