From: Russ Tyndall <russ@acceleration.net>
Date: Tue, 2 Aug 2011 17:29:24 +0000 (-0400)
Subject: use file-enable in tests to make it harder to get the syntax enable/disabling wrong
X-Git-Tag: v6.0.0~2
X-Git-Url: http://git.kpe.io/?p=clsql.git;a=commitdiff_plain;h=2645bad6c8673a32408801e7ea1f8a02a1583d7d

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 4637fde..6b65705 100644
--- 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 6c464d1..7c11874 100644
--- 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 50c6aea..016c5a7 100644
--- 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 04d310e..8a6ae88 100644
--- 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 e9505b2..dd8336b 100644
--- 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 1416862..8ee2b03 100644
--- 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 cfd678c..5be105c 100644
--- 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 e1a9807..4848075 100644
--- 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 6cb1c0c..ed1f481 100644
--- 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 050e07f..374ad95 100644
--- 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)
+