X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=db-postgresql-socket%2Fpostgresql-socket-sql.lisp;h=180b036904613be3a0fa5529737b8dc08e53ffde;hp=7df3dc7de361498165a6b717d9c2b29d7e1c1f45;hb=9bbed78051e80e6ab76ae47834136035602bbbf1;hpb=c4da3cfcbb955395d8a556e1f89aadad696302b7 diff --git a/db-postgresql-socket/postgresql-socket-sql.lisp b/db-postgresql-socket/postgresql-socket-sql.lisp index 7df3dc7..180b036 100644 --- a/db-postgresql-socket/postgresql-socket-sql.lisp +++ b/db-postgresql-socket/postgresql-socket-sql.lisp @@ -2,15 +2,14 @@ ;;;; ************************************************************************* ;;;; FILE IDENTIFICATION ;;;; -;;;; Name: postgresql-socket-sql.sql -;;;; Purpose: High-level PostgreSQL interface using socket -;;;; Programmers: Kevin M. Rosenberg based on -;;;; Original code by Pierre R. Mai -;;;; Date Started: Feb 2002 +;;;; Name: postgresql-socket-sql.sql +;;;; Purpose: High-level PostgreSQL interface using socket +;;;; Authors: Kevin M. Rosenberg based on original code by Pierre R. Mai +;;;; Created: Feb 2002 ;;;; ;;;; $Id$ ;;;; -;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg +;;;; This file, part of CLSQL, is Copyright (c) 2002-2004 by Kevin M. Rosenberg ;;;; and Copyright (c) 1999-2001 by Pierre R. Mai ;;;; ;;;; CLSQL users are granted the rights to distribute and use this software @@ -21,7 +20,7 @@ (in-package #:cl-user) (defpackage :clsql-postgresql-socket - (:use #:common-lisp #:clsql-base-sys #:postgresql-socket) + (:use #:common-lisp #:clsql-base #:postgresql-socket) (:export #:postgresql-socket-database) (:documentation "This is the CLSQL socket interface to PostgreSQL.")) @@ -30,7 +29,7 @@ ;; interface foreign library loading routines -(clsql-base-sys:database-type-load-foreign :postgresql-socket) +(clsql-base:database-type-load-foreign :postgresql-socket) ;; Field type conversion @@ -194,6 +193,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))))) @@ -201,7 +201,7 @@ doesn't depend on UFFI." (close-postgresql-connection (database-connection database)) t) -(defmethod database-query (expression (database postgresql-socket-database) result-types) +(defmethod database-query (expression (database postgresql-socket-database) result-types field-names) (let ((connection (database-connection database))) (with-postgresql-handlers (database expression) (start-query-execution connection expression) @@ -215,17 +215,20 @@ doesn't depend on UFFI." :errno 'missing-result :error "Didn't receive result cursor for query.")) (setq result-types (canonicalize-types result-types cursor)) - (loop for row = (read-cursor-row cursor result-types) - while row - collect row - finally - (unless (null (wait-for-query-results connection)) - (close-postgresql-connection connection) - (error 'clsql-sql-error - :database database - :expression expression - :errno 'multiple-results - :error "Received multiple results for query."))))))) + (values + (loop for row = (read-cursor-row cursor result-types) + while row + collect row + finally + (unless (null (wait-for-query-results connection)) + (close-postgresql-connection connection) + (error 'clsql-sql-error + :database database + :expression expression + :errno 'multiple-results + :error "Received multiple results for query."))) + (when field-names + (mapcar #'car (postgresql-cursor-fields cursor)))))))) (defmethod database-execute-command (expression (database postgresql-socket-database)) @@ -313,22 +316,26 @@ doesn't depend on UFFI." ;;; Object listing -(defmethod database-list-objects-of-type ((database postgresql-socket-database) - type owner) - (let ((owner-clause - (cond ((stringp owner) - (format nil " AND (relowner=(SELECT usesysid FROM pg_user WHERE (usename='~A')))" owner)) - ((null owner) - (format nil " AND (NOT (relowner=1))")) - (t "")))) - (mapcar #'car - (database-query - (format nil - "SELECT relname FROM pg_class WHERE (relkind = '~A')~A" - type - owner-clause) - database nil)))) - +(defun owner-clause (owner) + (cond + ((stringp owner) + (format + nil + " AND (relowner=(SELECT usesysid FROM pg_user WHERE (usename='~A')))" + owner)) + ((null owner) + (format nil " AND (NOT (relowner=1))")) + (t ""))) + +(defun database-list-objects-of-type (database type owner) + (mapcar #'car + (database-query + (format nil + "SELECT relname FROM pg_class WHERE (relkind = '~A')~A" + type + (owner-clause owner)) + database nil nil))) + (defmethod database-list-tables ((database postgresql-socket-database) &key (owner nil)) (database-list-objects-of-type database "r" owner)) @@ -340,7 +347,27 @@ doesn't depend on UFFI." (defmethod database-list-indexes ((database postgresql-socket-database) &key (owner nil)) (database-list-objects-of-type database "i" owner)) - + +(defmethod database-list-table-indexes (table + (database postgresql-socket-database) + &key (owner nil)) + (let ((indexrelids + (database-query + (format + nil + "select indexrelid from pg_index where indrelid=(select relfilenode from pg_class where relname='~A'~A)" + (string-downcase table) + (owner-clause owner)) + database :auto nil)) + (result nil)) + (dolist (indexrelid indexrelids (nreverse result)) + (push + (caar (database-query + (format nil "select relname from pg_class where relfilenode='~A'" + (car indexrelid)) + database nil nil)) + result)))) + (defmethod database-list-attributes ((table string) (database postgresql-socket-database) &key (owner nil)) @@ -355,7 +382,7 @@ doesn't depend on UFFI." (format nil "SELECT attname FROM pg_class,pg_attribute WHERE pg_class.oid=attrelid AND relname='~A'~A" (string-downcase table) owner-clause) - database nil)))) + database nil nil)))) (if result (reverse (remove-if #'(lambda (it) (member it '("cmin" @@ -371,21 +398,22 @@ doesn't depend on UFFI." (defmethod database-attribute-type (attribute (table string) (database postgresql-socket-database) &key (owner nil)) - (let* ((owner-clause - (cond ((stringp owner) - (format nil " AND (relowner=(SELECT usesysid FROM pg_user WHERE usename='~A'))" owner)) - ((null owner) " AND (not (relowner=1))") - (t ""))) - (result - (mapcar #'car - (database-query - (format nil "SELECT pg_type.typname FROM pg_type,pg_class,pg_attribute WHERE pg_class.oid=pg_attribute.attrelid AND pg_class.relname='~A' AND pg_attribute.attname='~A' AND pg_attribute.atttypid=pg_type.oid~A" + (let ((row (car (database-query + (format nil "SELECT pg_type.typname,pg_attribute.attlen,pg_attribute.atttypmod,pg_attribute.attnotnull FROM pg_type,pg_class,pg_attribute WHERE pg_class.oid=pg_attribute.attrelid AND pg_class.relname='~A' AND pg_attribute.attname='~A' AND pg_attribute.atttypid=pg_type.oid~A" (string-downcase table) - (string-downcase attribute) - owner-clause) - database nil)))) - (when result - (intern (string-upcase (car result)) :keyword)))) + (string-downcase attribute) + (owner-clause owner)) + database nil nil)))) + (when row + (values + (ensure-keyword (first row)) + (if (string= "-1" (second row)) + (- (parse-integer (third row) :junk-allowed t) 4) + (parse-integer (second row))) + nil + (if (string-equal "f" (fourth row)) + 1 + 0))))) (defmethod database-create-sequence (sequence-name (database postgresql-socket-database)) @@ -409,7 +437,7 @@ doesn't depend on UFFI." (caar (database-query (format nil "SELECT SETVAL ('~A', ~A)" name position) - database nil))))) + database nil nil))))) (defmethod database-sequence-next (sequence-name (database postgresql-socket-database)) @@ -418,7 +446,7 @@ doesn't depend on UFFI." (caar (database-query (concatenate 'string "SELECT NEXTVAL ('" (sql-escape sequence-name) "')") - database nil))))) + database nil nil))))) (defmethod database-sequence-last (sequence-name (database postgresql-socket-database)) (values @@ -426,30 +454,68 @@ doesn't depend on UFFI." (caar (database-query (concatenate 'string "SELECT LAST_VALUE ('" sequence-name "')") - database nil))))) + database nil nil))))) (defmethod database-create (connection-spec (type (eql :postgresql-socket))) - (error 'clsql-access-error - :connection-spec connection-spec - :database-type type - :error "Unable to create databases on a socket connection.")) + (destructuring-bind (host name user password) connection-spec + (let ((database (database-connect (list host "template1" user password) + type))) + (unwind-protect + (execute-command (format nil "create database ~A" name)) + (database-disconnect database))))) (defmethod database-destroy (connection-spec (type (eql :postgresql-socket))) - (error 'clsql-access-error - :connection-spec connection-spec - :database-type type - :error "Unable to create databases on a socket connection.")) + (destructuring-bind (host name user password) connection-spec + (let ((database (database-connect (list host "template1" user password) + type))) + (unwind-protect + (execute-command (format nil "drop database ~A" name)) + (database-disconnect database))))) + (defmethod database-probe (connection-spec (type (eql :postgresql-socket))) + (when (find (second connection-spec) (database-list connection-spec type) + :key #'car :test #'string-equal) + t)) + +(defmethod database-list (connection-spec (type (eql :postgresql-socket))) (destructuring-bind (host name user password) connection-spec + (declare (ignore name)) (let ((database (database-connect (list host "template1" user password) type))) (unwind-protect - (find name (database-query "select datname from pg_database" - database :auto) - :key #'car :test #'string-equal) - (database-disconnect database))))) + (progn + (setf (slot-value database 'clsql-base::state) :open) + (mapcar #'car (database-query "select datname from pg_database" + database :auto nil))) + (progn + (database-disconnect database) + (setf (slot-value database 'clsql-base::state) :closed)))))) + +(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 table))) + database :auto nil)) + + +;; Database capabilities + +(defmethod db-backend-has-create/destroy-db? ((db-type (eql :postgresql-socket))) + nil) + +(defmethod db-type-has-fancy-math? ((db-type (eql :postgresql-socket))) + t) + +(defmethod db-type-default-case ((db-type (eql :postgresql-socket))) + :lower) -(when (clsql-base-sys:database-type-library-loaded :postgresql-socket) - (clsql-base-sys:initialize-database-type :database-type :postgresql-socket)) +(when (clsql-base:database-type-library-loaded :postgresql-socket) + (clsql-base:initialize-database-type :database-type :postgresql-socket))