changed how where clauses are output to ensure that we do not output a "where"

[clsql.git] / clsql.asd

diff --git a/clsql.asd b/clsql.asd
index 0d564b67fdf89de8ab01cad74831a7948531d084..0c9c6546edbad44ce9bfc3244c226152c54d5dab 100644 (file)
--- a/clsql.asd
+++ b/clsql.asd
@@ -27,7 +27,7 @@
 ;; need to load uffi for below perform :after method
 (eval-when (:compile-toplevel :load-toplevel :execute)
   (unless (find-package 'uffi)
-    (asdf:operate 'asdf:load-op 'uffi)))
+    (asdf:operate 'asdf:load-op 'cffi-uffi-compat)))
 
 (defsystem clsql
     :name "CLSQL"
@@ -60,7 +60,7 @@ oriented interface."
                         ((:file "initialize")
                         (:file "database" :depends-on ("initialize"))
                         (:file "recording" :depends-on ("database"))
-                        (:file "pool"))
+                        (:file "pool" :depends-on ("database")))
                         :depends-on (base))
               (:module syntax
                        :pathname ""
@@ -99,9 +99,10 @@ oriented interface."
 (defmethod perform :after ((o load-op) (c (eql (find-system 'clsql))))
   (let* ((init-var (uffi:getenv "CLSQLINIT"))
          (init-file (or (when init-var (probe-file init-var))
-                        (merge-pathnames
-                         (make-pathname :name ".clsql-init" :type "lisp")
-                         (user-homedir-pathname))
+                        (probe-file
+                         (concatenate 'string
+                                      (namestring (user-homedir-pathname))
+                                      ".clsql-init.lisp"))
                         (probe-file "/etc/clsql-init.lisp")
                         #+(or mswin windows win32)
                         (probe-file "c:\\etc\\clsql-init.lisp"))))