r8938: add describe-table

diff --git a/db-postgresql-socket/postgresql-socket-sql.lisp b/db-postgresql-socket/postgresql-socket-sql.lisp
index c304db07e1204c861cdb86c941224ae21d506e6d..2ceb6798bcd83e27d4be61ae761ead66ed08d387 100644 (file)
--- a/db-postgresql-socket/postgresql-socket-sql.lisp
+++ b/db-postgresql-socket/postgresql-socket-sql.lisp
@@ -194,6 +194,7 @@ doesn't depend on UFFI."
                 (make-instance 'postgresql-socket-database
                                :name (database-name-from-spec connection-spec
                                                               database-type)
+                               :database-type :postgresql-socket
                                :connection-spec connection-spec
                                :connection connection)))))
 
@@ -457,5 +458,22 @@ doesn't depend on UFFI."
            t)
        (database-disconnect database)))))
 
+(defmethod database-describe-table ((database postgresql-socket-database) 
+                                   table)
+  (database-query
+   (format nil "select a.attname, t.typname
+                               from pg_class c, pg_attribute a, pg_type t
+                               where c.relname = '~a'
+                                   and a.attnum > 0
+                                   and a.attrelid = c.oid
+                                   and a.atttypid = t.oid"
+           (sql-escape (string-downcase 
+                       (etypecase table
+                         (string table)
+                         (clsql-base-sys::sql-create-table
+                          (symbol-name 
+                           (slot-value table 'clsql-base-sys::name)))))))
+   database :auto))
+
 (when (clsql-base-sys:database-type-library-loaded :postgresql-socket)
   (clsql-base-sys:initialize-database-type :database-type :postgresql-socket))

diff --git a/db-postgresql/postgresql-api.lisp b/db-postgresql/postgresql-api.lisp
index 69719da2ca10760f54916ff8f25211596ee055b1..43b3f20426f7dc3f7da66091e6663f912522dfec 100644 (file)
--- a/db-postgresql/postgresql-api.lisp
+++ b/db-postgresql/postgresql-api.lisp
@@ -52,6 +52,8 @@
 (uffi:def-foreign-type pgsql-conn :pointer-void)
 (uffi:def-foreign-type pgsql-result :pointer-void)
 
+(uffi:def-type pgsql-conn-ptr :pointer-void)
+
 (uffi:def-enum pgsql-ftype
     ((:bytea 17)
      (:int2 21)

diff --git a/db-postgresql/postgresql-sql.lisp b/db-postgresql/postgresql-sql.lisp
index 5355972a63fc26fca77e33c9213f51df30c28ea3..5758730e07f19486a79086b364456f3277a8a080 100644 (file)
--- a/db-postgresql/postgresql-sql.lisp
+++ b/db-postgresql/postgresql-sql.lisp
@@ -79,7 +79,10 @@
 
 (defclass postgresql-database (database)
   ((conn-ptr :accessor database-conn-ptr :initarg :conn-ptr
-            :type pgsql-conn-def)))
+            :type pgsql-conn-def)
+   (lock
+    :accessor database-lock
+    :initform (make-process-lock "conn"))))
 
 (defmethod database-type ((database postgresql-database))
   :postgresql)
@@ -133,6 +136,7 @@
        (make-instance 'postgresql-database
                       :name (database-name-from-spec connection-spec
                                                      database-type)
+                      :database-type :postgresql
                       :connection-spec connection-spec
                       :conn-ptr connection)))))
 
@@ -524,6 +528,50 @@
            t)
        (database-disconnect database)))))
 
+(defmethod database-describe-table ((database postgresql-database) table)
+  (database-query 
+   (format nil "select a.attname, t.typname
+                               from pg_class c, pg_attribute a, pg_type t
+                               where c.relname = '~a'
+                                   and a.attnum > 0
+                                   and a.attrelid = c.oid
+                                   and a.atttypid = t.oid"
+           (sql-escape (string-downcase 
+                       (etypecase table
+                         (string table)
+                         (clsql-base-sys::sql-create-table
+                          (symbol-name 
+                           (slot-value table 'clsql-base-sys::name)))))))
+   database :auto))
+
+(defun %pg-database-connection (connection-spec)
+  (check-connection-spec connection-spec :postgresql
+                        (host db user password &optional port options tty))
+  (macrolet ((coerce-string (var)
+               `(unless (typep ,var 'simple-base-string)
+                 (setf ,var (coerce ,var 'simple-base-string)))))
+    (destructuring-bind (host db user password &optional port options tty)
+        connection-spec
+      (coerce-string db)
+      (coerce-string user)
+      (let ((connection (pqsetdblogin host port options tty db user password)))
+        (declare (type postgresql::pgsql-conn-ptr connection))
+        (unless (eq (pqstatus connection) :connection-ok)
+          ;; Connect failed
+          (error 'clsql-connect-error
+                 :database-type :postgresql
+                 :connection-spec connection-spec
+                 :errno (pqstatus connection)
+                 :error (pqerrormessage connection)))
+        connection))))
+
+(defmethod database-reconnect ((database postgresql-database))
+  (let ((lock (database-lock database)))
+    (with-process-lock (lock "Reconnecting")
+      (with-slots (connection-spec conn-ptr)
+         database
+       (setf conn-ptr (%pg-database-connection connection-spec))
+       database))))
 
 (when (clsql-base-sys:database-type-library-loaded :postgresql)
   (clsql-base-sys:initialize-database-type :database-type :postgresql))