(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)
(declare (ignore password options tty))
(concatenate 'string
(etypecase host
+ (null "localhost")
(pathname (namestring host))
(string host))
(when port
(make-instance 'postgresql-database
:name (database-name-from-spec connection-spec
database-type)
+ :database-type :postgresql
:connection-spec connection-spec
:conn-ptr connection)))))
(setf (database-conn-ptr database) nil)
t)
-(defmethod database-query (query-expression (database postgresql-database) types)
+(defmethod database-query (query-expression (database postgresql-database) result-types)
(let ((conn-ptr (database-conn-ptr database)))
(declare (type pgsql-conn-def conn-ptr))
(uffi:with-cstring (query-native query-expression)
nil)
(#.pgsql-exec-status-type#tuples-ok
(let ((num-fields (PQnfields result)))
- (setq types
- (canonicalize-types types num-fields
+ (setq result-types
+ (canonicalize-types result-types num-fields
result))
(loop for tuple-index from 0 below (PQntuples result)
collect
(if (zerop (PQgetisnull result tuple-index i))
(convert-raw-field
(PQgetvalue result tuple-index i)
- types i)
+ result-types i)
nil)))))
(t
(error 'clsql-sql-error
(num-fields 0 :type integer)
(tuple-index 0 :type integer))
-(defmethod database-query-result-set (query-expression (database postgresql-database)
- &key full-set types)
+(defmethod database-query-result-set ((query-expression string)
+ (database postgresql-database)
+ &key full-set result-types)
(let ((conn-ptr (database-conn-ptr database)))
(declare (type pgsql-conn-def conn-ptr))
(uffi:with-cstring (query-native query-expression)
:num-fields (PQnfields result)
:num-tuples (PQntuples result)
:types (canonicalize-types
- types
+ result-types
(PQnfields result)
result))))
(if full-set
(concatenate 'string "SELECT LAST_VALUE ('" sequence-name "')")
database nil)))))
-
-;; Functions depending upon high-level CommonSQL classes/functions
-#|
-(defmethod database-output-sql ((expr clsql-sys::sql-typecast-exp)
- (database postgresql-database))
- (with-slots (clsql-sys::modifier clsql-sys::components)
- expr
- (if clsql-sys::modifier
- (progn
- (clsql-sys::output-sql clsql-sys::components database)
- (write-char #\: clsql-sys::*sql-stream*)
- (write-char #\: clsql-sys::*sql-stream*)
- (write-string (symbol-name clsql-sys::modifier)
- clsql-sys::*sql-stream*)))))
-
-(defmethod database-output-sql-as-type ((type (eql 'integer)) val
- (database postgresql-database))
- (when val ;; typecast it so it uses the indexes
- (make-instance 'clsql-sys::sql-typecast-exp
- :modifier 'int8
- :components val)))
-|#
+(defmethod database-create (connection-spec (type (eql :postgresql)))
+ (destructuring-bind (host name user password) connection-spec
+ (declare (ignore user password))
+ (multiple-value-bind (output status)
+ (clsql-base-sys:command-output "createdb -h~A ~A"
+ (if host host "localhost")
+ name)
+ (if (or (not (zerop status))
+ (search "database creation failed: ERROR:" output))
+ (error 'clsql-access-error
+ :connection-spec connection-spec
+ :database-type type
+ :error
+ (format nil "database-create failed: ~A"
+ output))
+ t))))
+
+(defmethod database-destroy (connection-spec (type (eql :postgresql)))
+ (destructuring-bind (host name user password) connection-spec
+ (declare (ignore user password))
+ (multiple-value-bind (output status)
+ (clsql-base-sys:command-output "dropdb -h~A ~A"
+ (if host host "localhost")
+ name)
+ (if (or (not (zerop status))
+ (search "database removal failed: ERROR:" output))
+ (error 'clsql-access-error
+ :connection-spec connection-spec
+ :database-type type
+ :error
+ (format nil "database-destory failed: ~A"
+ output))
+ t))))
+
+
+(defmethod database-probe (connection-spec (type (eql :postgresql)))
+ (destructuring-bind (host name user password) connection-spec
+ (let ((database (database-connect (list host "template1" user password)
+ type)))
+ (unwind-protect
+ (when
+ (find name (database-query "select datname from pg_database"
+ database :auto)
+ :key #'car :test #'string-equal)
+ 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))
projects / clsql.git / blobdiff