X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=db-postgresql-socket%2Fpostgresql-socket-sql.lisp;h=7cb1ebab03738a2559d5d0c55d4d2ae52c193be7;hb=5d6de675e75567edd02a8a175fc2c68ebb0a8597;hp=a9cb8f5ed0536f78234ce77a2089084ba7b54b8b;hpb=8d558ce162d1360f92e4d65d054e2f61c786319e;p=clsql.git diff --git a/db-postgresql-socket/postgresql-socket-sql.lisp b/db-postgresql-socket/postgresql-socket-sql.lisp index a9cb8f5..7cb1eba 100644 --- a/db-postgresql-socket/postgresql-socket-sql.lisp +++ b/db-postgresql-socket/postgresql-socket-sql.lisp @@ -8,7 +8,7 @@ ;;;; Original code by Pierre R. Mai ;;;; Date Started: Feb 2002 ;;;; -;;;; $Id: postgresql-socket-sql.lisp,v 1.2 2003/05/02 03:05:54 kevin Exp $ +;;;; $Id$ ;;;; ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; and Copyright (c) 1999-2001 by Pierre R. Mai @@ -18,15 +18,14 @@ ;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL. ;;;; ************************************************************************* -(declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0))) -(in-package :cl-user) +(in-package #:cl-user) (defpackage :clsql-postgresql-socket - (:use :common-lisp :clsql-base-sys :postgresql-socket) + (:use #:common-lisp #:clsql-base-sys #:postgresql-socket) (:export #:postgresql-socket-database) (:documentation "This is the CLSQL socket interface to PostgreSQL.")) -(in-package :clsql-postgresql-socket) +(in-package #:clsql-postgresql-socket) ;; interface foreign library loading routines @@ -150,7 +149,17 @@ doesn't depend on UFFI." (destructuring-bind (host db user password &optional port options tty) connection-spec (declare (ignore password options tty)) - (concatenate 'string host (if port ":") (if port port) "/" db "/" user))) + (concatenate 'string + (etypecase host + (pathname (namestring host)) + (string host)) + (when port + (concatenate 'string + ":" + (etypecase port + (integer (write-to-string port)) + (string port)))) + "/" db "/" user))) (defmethod database-connect (connection-spec (database-type (eql :postgresql-socket))) @@ -190,7 +199,7 @@ doesn't depend on UFFI." (close-postgresql-connection (database-connection database)) t) -(defmethod database-query (expression (database postgresql-socket-database) types) +(defmethod database-query (expression (database postgresql-socket-database) result-types) (let ((connection (database-connection database))) (with-postgresql-handlers (database expression) (start-query-execution connection expression) @@ -203,8 +212,8 @@ doesn't depend on UFFI." :expression expression :errno 'missing-result :error "Didn't receive result cursor for query.")) - (setq types (canonicalize-types types cursor)) - (loop for row = (read-cursor-row cursor types) + (setq result-types (canonicalize-types result-types cursor)) + (loop for row = (read-cursor-row cursor result-types) while row collect row finally @@ -255,9 +264,9 @@ doesn't depend on UFFI." (cursor nil) (types nil)) -(defmethod database-query-result-set (expression (database postgresql-socket-database) - &key full-set types - ) +(defmethod database-query-result-set ((expression string) + (database postgresql-socket-database) + &key full-set result-types) (declare (ignore full-set)) (let ((connection (database-connection database))) (with-postgresql-handlers (database expression) @@ -274,7 +283,7 @@ doesn't depend on UFFI." (values (make-postgresql-socket-result-set :done nil :cursor cursor - :types (canonicalize-types types cursor)) + :types (canonicalize-types result-types cursor)) (length (postgresql-cursor-fields cursor))))))) (defmethod database-dump-result-set (result-set @@ -300,5 +309,145 @@ doesn't depend on UFFI." (setf (postgresql-socket-result-set-done result-set) t) (wait-for-query-results (database-connection database))))))) +;;; 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)))) + +(defmethod database-list-tables ((database postgresql-socket-database) + &key (owner nil)) + (database-list-objects-of-type database "r" owner)) + +(defmethod database-list-views ((database postgresql-socket-database) + &key (owner nil)) + (database-list-objects-of-type database "v" owner)) + +(defmethod database-list-indexes ((database postgresql-socket-database) + &key (owner nil)) + (database-list-objects-of-type database "i" owner)) + +(defmethod database-list-attributes ((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 attname FROM pg_class,pg_attribute WHERE pg_class.oid=attrelid AND relname='~A'~A" + (string-downcase table) + owner-clause) + database nil)))) + (if result + (reverse + (remove-if #'(lambda (it) (member it '("cmin" + "cmax" + "xmax" + "xmin" + "oid" + "ctid" + ;; kmr -- added tableoid + "tableoid") :test #'equal)) + result))))) + +(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" + (string-downcase table) + (string-downcase attribute) + owner-clause) + database nil)))) + (when result + (intern (string-upcase (car result)) :keyword)))) + +(defmethod database-create-sequence (sequence-name + (database postgresql-socket-database)) + (database-execute-command + (concatenate 'string "CREATE SEQUENCE " (sql-escape sequence-name)) + database)) + +(defmethod database-drop-sequence (sequence-name + (database postgresql-socket-database)) + (database-execute-command + (concatenate 'string "DROP SEQUENCE " (sql-escape sequence-name)) database)) + +(defmethod database-list-sequences ((database postgresql-socket-database) + &key (owner nil)) + (database-list-objects-of-type database "S" owner)) + +(defmethod database-set-sequence-position (name (position integer) + (database postgresql-socket-database)) + (values + (parse-integer + (caar + (database-query + (format nil "SELECT SETVAL ('~A', ~A)" name position) + database nil))))) + +(defmethod database-sequence-next (sequence-name + (database postgresql-socket-database)) + (values + (parse-integer + (caar + (database-query + (concatenate 'string "SELECT NEXTVAL ('" (sql-escape sequence-name) "')") + database nil))))) + +(defmethod database-sequence-last (sequence-name (database postgresql-socket-database)) + (values + (parse-integer + (caar + (database-query + (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-socket-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-socket-database)) + (when val ;; typecast it so it uses the indexes + (make-instance 'clsql-sys::sql-typecast-exp + :modifier 'int8 + :components val))) +|# + (when (clsql-base-sys:database-type-library-loaded :postgresql-socket) (clsql-base-sys:initialize-database-type :database-type :postgresql-socket))