;;;; *************************************************************************
;;;; 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
(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."))
;; 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
(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)
: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))
(format nil " AND (NOT (relowner=1))"))
(t "")))
-(defmethod database-list-objects-of-type ((database postgresql-socket-database)
- type owner)
+(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)))
+ database nil nil)))
(defmethod database-list-tables ((database postgresql-socket-database)
&key (owner 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))
+ 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))
+ database nil nil))
result))))
(defmethod database-list-attributes ((table string)
(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"
(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))
(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))
(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
(caar
(database-query
(concatenate 'string "SELECT LAST_VALUE ('" sequence-name "')")
- database nil)))))
+ database nil nil)))))
(defmethod database-create (connection-spec (type (eql :postgresql-socket)))
type)))
(unwind-protect
(progn
- (setf (slot-value database 'clsql-base-sys::state) :open)
+ (setf (slot-value database 'clsql-base::state) :open)
(mapcar #'car (database-query "select datname from pg_database"
- database :auto)))
+ database :auto nil)))
(progn
(database-disconnect database)
- (setf (slot-value database 'clsql-base-sys::state) :closed))))))
+ (setf (slot-value database 'clsql-base::state) :closed))))))
(defmethod database-describe-table ((database postgresql-socket-database)
table)
and a.attrelid = c.oid
and a.atttypid = t.oid"
(sql-escape (string-downcase table)))
- database :auto))
+ database :auto nil))
;; Database capabilities
(defmethod db-type-has-fancy-math? ((db-type (eql :postgresql-socket)))
t)
-(defmethod db-type-default-case ((db-type (eql :postgresql)))
+(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))
projects / clsql.git / blobdiff