;;;; Original code by Pierre R. Mai
;;;; Date Started: Feb 2002
;;;;
-;;;; $Id: postgresql-socket-sql.cl,v 1.2 2002/03/24 18:08:27 kevin Exp $
+;;;; $Id: postgresql-socket-sql.cl,v 1.7 2002/03/27 08:09:25 kevin Exp $
;;;;
;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
;;;; and Copyright (c) 1999-2001 by Pierre R. Mai
(declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0)))
(in-package :cl-user)
-
(defpackage :clsql-postgresql-socket
(:use :common-lisp :clsql-sys :postgresql-socket)
(:export #:postgresql-socket-database)
(in-package :clsql-postgresql-socket)
+;; Field type conversion
+
+(defun canonical-field-type (fields index)
+ "Extracts canonical field type from fields list"
+ (let ((oid (cadr (nth index fields))))
+ (case oid
+ ((#.pgsql-ftype#bytea
+ #.pgsql-ftype#int2
+ #.pgsql-ftype#int4)
+ :int)
+ (#.pgsql-ftype#int8
+ :longlong)
+ ((#.pgsql-ftype#float4
+ #.pgsql-ftype#float8)
+ :double)
+ (otherwise
+ t))))
+
+
+(defun canonicalize-type-list (types num-fields)
+ "Ensure a field type list meets expectations.
+Duplicated from clsql-uffi package so that this interface
+doesn't depend on UFFI."
+ (let ((length-types (length types))
+ (new-types '()))
+ (loop for i from 0 below num-fields
+ do
+ (if (>= i length-types)
+ (push t new-types) ;; types is shorted than num-fields
+ (push
+ (case (nth i types)
+ ((:int :long :double :longlong t)
+ (nth i types))
+ (t
+ t))
+ new-types)))
+ (nreverse new-types)))
+
+(defun canonicalize-types (types cursor)
+ (let* ((fields (postgresql-cursor-fields cursor))
+ (num-fields (length fields)))
+ (cond
+ ((listp types)
+ (canonicalize-type-list types num-fields))
+ ((eq types :auto)
+ (let ((new-types '()))
+ (dotimes (i num-fields)
+ (declare (fixnum i))
+ (push (canonical-field-type fields i) new-types))
+ (nreverse new-types)))
+ (t
+ nil))))
+
(defun convert-to-clsql-warning (database condition)
(warn 'clsql-database-warning :database database
:message (postgresql-condition-message condition)))
(close-postgresql-connection (database-connection database))
t)
-(defmethod database-query (expression (database postgresql-socket-database) field-types)
+(defmethod database-query (expression (database postgresql-socket-database) types)
(let ((connection (database-connection database)))
(with-postgresql-handlers (database expression)
(start-query-execution connection expression)
:expression expression
:errno 'missing-result
:error "Didn't receive result cursor for query."))
- (loop for row = (read-cursor-row cursor)
+ (setq types (canonicalize-types types cursor))
+ (loop for row = (read-cursor-row cursor types)
while row
collect row
finally
(defstruct postgresql-socket-result-set
(done nil)
(cursor nil)
- (field-types nil :type cons))
+ (types nil))
(defmethod database-query-result-set (expression (database postgresql-socket-database)
- &key full-set field-types
+ &key full-set types
)
(declare (ignore full-set))
(let ((connection (database-connection database)))
:error "Didn't receive result cursor for query."))
(values (make-postgresql-socket-result-set
:done nil
- :cursor cursor)
+ :cursor cursor
+ :types (canonicalize-types types cursor))
(length (postgresql-cursor-fields cursor)))))))
(defmethod database-dump-result-set (result-set
list)
(let ((cursor (postgresql-socket-result-set-cursor result-set)))
(with-postgresql-handlers (database)
- (if (copy-cursor-row cursor list)
+ (if (copy-cursor-row cursor
+ list
+ (postgresql-socket-result-set-types
+ result-set))
t
(prog1 nil
(setf (postgresql-socket-result-set-done result-set) t)