From: Russ Tyndall <russ@acceleration.net>
Date: Tue, 29 Sep 2009 15:46:06 +0000 (-0400)
Subject: fixing bugs from my first run through on clsql-postgresql-socket3
X-Git-Url: http://git.kpe.io/?a=commitdiff_plain;h=9f2b1f47684151e0706d51540ab5424c005f3184;p=clsql.git

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

diff --git a/clsql-postgresql-socket3.asd b/clsql-postgresql-socket3.asd
index 3c069bd..eed7560 100644
--- 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 8fa690c..4882527 100644
--- 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 edebf0b..9e9a879 100644
--- 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))))