use file-enable in tests to make it harder to get the syntax enable/disabling wrong

diff --git a/tests/ds-artists.lisp b/tests/ds-artists.lisp
index 4637fde97a31919d45c45d2d35a3ef2d8a327285..6b657058d48c2e2f6d36d62313d66bf5b52591b8 100644 (file)
--- a/tests/ds-artists.lisp
+++ b/tests/ds-artists.lisp
@@ -1,6 +1,6 @@
 (in-package #:clsql-tests)
 
-#.(clsql:locally-enable-sql-reader-syntax)
+(clsql-sys:file-enable-sql-reader-syntax)
 
 (defparameter artist1 nil)
 
@@ -34,4 +34,3 @@
                (mapc #'clsql-sys:drop-sequence
                      (list "artist_artist_id_seq"))))))
 
-#.(clsql:restore-sql-reader-syntax-state)

diff --git a/tests/ds-employees.lisp b/tests/ds-employees.lisp
index 6c464d13bd1588d53c9f8695c534da644e4f4041..7c11874617b3957e08f5a8814d9abd46c1e54a25 100644 (file)
--- a/tests/ds-employees.lisp
+++ b/tests/ds-employees.lisp
@@ -1,6 +1,6 @@
 (in-package #:clsql-tests)
 
-#.(clsql:locally-enable-sql-reader-syntax)
+(clsql-sys:file-enable-sql-reader-syntax)
 (defparameter company1 nil)
 (defparameter employee1 nil)
 (defparameter employee2 nil)
@@ -394,5 +394,3 @@
               (ignore-errors
                 (clsql-sys:execute-command "DROP TABLE ea_join")))))
 
-#.(clsql:restore-sql-reader-syntax-state)
-

diff --git a/tests/ds-nodes.lisp b/tests/ds-nodes.lisp
index 50c6aea08b0de79b26f73938e458996f8a8af03f..016c5a7518a5f30a8985865968848a0999eec125 100644 (file)
--- a/tests/ds-nodes.lisp
+++ b/tests/ds-nodes.lisp
@@ -1,6 +1,6 @@
 (in-package #:clsql-tests)
 
-#.(clsql:locally-enable-sql-reader-syntax)
+(clsql-sys:file-enable-sql-reader-syntax)
 
 (defparameter basenode nil)
 (defparameter derivednode1 nil)
@@ -121,4 +121,3 @@
                         theme_theme_id_seq nodeuser_user_id_seq)
                       )))))
 
-#.(clsql:restore-sql-reader-syntax-state)

diff --git a/tests/test-fddl.lisp b/tests/test-fddl.lisp
index 04d310ec86454fadfe7e22463bc76c10ff2e3f8c..8a6ae887229e08f0932ee532d1d6beb9a115e807 100644 (file)
--- a/tests/test-fddl.lisp
+++ b/tests/test-fddl.lisp
@@ -16,8 +16,7 @@
 
 
 (in-package #:clsql-tests)
-
-#.(clsql:locally-enable-sql-reader-syntax)
+(clsql-sys:file-enable-sql-reader-syntax)
 
 (def-dataset *ds-fddl*
   (:setup (lambda ()
@@ -450,5 +449,3 @@ B varchar(32))")
   (nil (t nil) t (t nil)))
 
   ))
-
-#.(clsql:restore-sql-reader-syntax-state)

diff --git a/tests/test-fdml.lisp b/tests/test-fdml.lisp
index e9505b2788ba2f54fa8e8c9e79201c7cdce2a8b3..dd8336be95ed0d0df92477a873b2eaceea2824ea 100644 (file)
--- a/tests/test-fdml.lisp
+++ b/tests/test-fdml.lisp
@@ -16,8 +16,7 @@
 
 (in-package #:clsql-tests)
 
-#.(clsql:locally-enable-sql-reader-syntax)
-
+(clsql-sys:file-enable-sql-reader-syntax)
 ;;started defining an independent dataset that doesn't depend on the view-classes
 ;; but there is a *lot* of stuff in the file assuming that dataset.
 ;; (def-dataset *ds-fdml*
@@ -778,4 +777,3 @@
 
 ))
 
-#.(clsql:restore-sql-reader-syntax-state)

diff --git a/tests/test-internal.lisp b/tests/test-internal.lisp
index 1416862fc27c308a04c2791c9cd07e0e42f2df72..8ee2b031c6df7986a63d89a2125bd915c1167309 100644 (file)
--- a/tests/test-internal.lisp
+++ b/tests/test-internal.lisp
@@ -15,6 +15,7 @@
 ;;;; *************************************************************************
 
 (in-package #:clsql-tests)
+(clsql-sys:file-enable-sql-reader-syntax)
 
 (setq *rt-internal*
   '(
@@ -39,7 +40,6 @@
       "SELECT 'FOO' FROM BAR WHERE ID='Match?''?' AND CODE=$1")
 
     (deftest :int/output-caching/1
-     #.(locally-enable-sql-reader-syntax)
      ;; ensure that key generation and matching is working
      ;; so that this table doesnt balloon (more than designed)
      (list
@@ -60,7 +60,6 @@
      (1 2 2))
 
     (deftest :int/output-caching/2
-     #.(locally-enable-sql-reader-syntax)
      ;; ensure that we can disable the output cache and
      ;; still have everything work
      (let ((clsql-sys::*output-hash*))

diff --git a/tests/test-ooddl.lisp b/tests/test-ooddl.lisp
index cfd678cb6fcd387b1c9abe2b631cde11e1417fa7..5be105c0f27ed24892507779c7e7347f03fed421 100644 (file)
--- a/tests/test-ooddl.lisp
+++ b/tests/test-ooddl.lisp
@@ -17,7 +17,7 @@
 
 (in-package #:clsql-tests)
 
-#.(clsql:locally-enable-sql-reader-syntax)
+(clsql-sys:file-enable-sql-reader-syntax)
 
 
 (def-view-class big ()
@@ -184,5 +184,4 @@
 
 ))
 
-#.(clsql:restore-sql-reader-syntax-state)
 

diff --git a/tests/test-oodml.lisp b/tests/test-oodml.lisp
index e1a9807db17459f4fccf3ef09df7812731b40dcc..4848075cf30e5bded8a72e3e2c6f80686dcaf6c7 100644 (file)
--- a/tests/test-oodml.lisp
+++ b/tests/test-oodml.lisp
@@ -15,7 +15,8 @@
 
 (in-package #:clsql-tests)
 
-#.(clsql:locally-enable-sql-reader-syntax)
+(clsql-sys:file-enable-sql-reader-syntax)
+
 
 (setq *rt-oodml*
       '(
@@ -1155,6 +1156,3 @@
   t)
 ))
 
-
-
-#.(clsql:restore-sql-reader-syntax-state)

diff --git a/tests/test-syntax.lisp b/tests/test-syntax.lisp
index 6cb1c0c1ce1d26df8a76f39b4ba234d18fd23673..ed1f4817c604f3926a84304afe1b93e2928932dd 100644 (file)
--- a/tests/test-syntax.lisp
+++ b/tests/test-syntax.lisp
@@ -14,7 +14,7 @@
 
 (in-package #:clsql-tests)
 
-#.(clsql:locally-enable-sql-reader-syntax)
+(clsql-sys:file-enable-sql-reader-syntax)
 
 
 (setq *rt-syntax*
@@ -424,5 +424,3 @@
                     (test test-out expected-result)
                     "Test:~s didnt match ~S"
                     test-out expected-result))))
-
-#.(clsql:restore-sql-reader-syntax-state)

diff --git a/tests/test-time.lisp b/tests/test-time.lisp
index 050e07fd380d3e9263c8f47f0795bac233ba720d..374ad9503fa9c5bac2285c86ec44b427f221087d 100644 (file)
--- a/tests/test-time.lisp
+++ b/tests/test-time.lisp
@@ -5,7 +5,7 @@
 ;;; Test time functions (time.lisp)
 
 (in-package #:clsql-tests)
-#.(clsql-sys:locally-enable-sql-reader-syntax)
+(clsql-sys:file-enable-sql-reader-syntax)
 
 (def-view-class datetest ()
   ((testtimetz :column "testtimetz"
@@ -440,4 +440,4 @@
 ))
 
 
-#.(clsql-sys:locally-disable-sql-reader-syntax)
+