fixing bugs from my first run through on clsql-postgresql-socket3

diff --git a/clsql-postgresql-socket3.asd b/clsql-postgresql-socket3.asd
index 3c069bd5c69b32d339f56f706ff5a7f7e49084a0..eed756048138314abb94828d92d5f04167e8a6ba 100644 (file)
--- a/clsql-postgresql-socket3.asd
+++ b/clsql-postgresql-socket3.asd
@@ -29,13 +29,10 @@
   :description "Common Lisp SQL PostgreSQL Socket Driver"
   :long-description "cl-sql-postgresql-socket package provides a database driver to the PostgreSQL database via a socket interface."
 
-  :depends-on (clsql cffi-uffi-compat md5 #+sbcl sb-bsd-sockets)
+  :depends-on (clsql cffi-uffi-compat md5 :cl-postgres #+sbcl sb-bsd-sockets)
   :components
-  ((:module :db-postgresql-socket
-           :components
-           ((:file "package")
-            (:file "api"
-                   :depends-on ("package"))
-            (:file "sql"
-                   :depends-on ("api")))
-           :depends-on (:cl-postgres))))
+  ((:module :db-postgresql-socket3
+           :serial T
+           :components ((:file "package")
+                        (:file "api")
+                        (:file "sql")))))

diff --git a/db-postgresql-socket3/api.lisp b/db-postgresql-socket3/api.lisp
index 8fa690cf20006c9b3805b44c64d9827a27814117..488252768ba922b43306a8bec995e0b92737fb18 100644 (file)
--- a/db-postgresql-socket3/api.lisp
+++ b/db-postgresql-socket3/api.lisp
@@ -23,7 +23,7 @@
   t)
 
 (defmethod clsql-sys:database-type-library-loaded ((database-type
-                                          (eql :postgresql-socket)))
+                                          (eql :postgresql-socket3)))
   "T if foreign library was able to be loaded successfully. Always true for
 socket interface"
   t)
\ No newline at end of file

diff --git a/db-postgresql-socket3/sql.lisp b/db-postgresql-socket3/sql.lisp
index edebf0b456dfa4a4bad15c72db142da306d0f8b6..9e9a879bd20b03127053cd89049c1d910fa8b494 100644 (file)
--- a/db-postgresql-socket3/sql.lisp
+++ b/db-postgresql-socket3/sql.lisp
@@ -20,8 +20,8 @@
 (in-package #:cl-user)
 
 (defpackage :clsql-postgresql-socket3
-    (:use #:common-lisp #:clsql-sys #:postgresql-socket)
-    (:export #:postgresql-socket-database)
+    (:use #:common-lisp #:clsql-sys #:postgresql-socket3)
+    (:export #:postgresql-socket3-database)
     (:documentation "This is the CLSQL socket interface to PostgreSQL."))
 
 (in-package #:clsql-postgresql-socket3)
@@ -191,13 +191,13 @@
       (values *cursor* (length (fields *cursor*))))))
 
 (defmethod database-dump-result-set (result-set
-                                     (database postgresql-socket-database))
+                                     (database postgresql-socket3-database))
   (unless (done result-set)
     (loop :while (funcall (next-row result-set))))
   T)
 
 (defmethod database-store-next-row (result-set
-                                    (database postgresql-socket-database)
+                                    (database postgresql-socket3-database)
                                     list)
   (when (and (not (done result-set))
             (setf (done result-set) (funcall (next-row result-set))))