(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
(defmethod database-query-result-set ((query-expression string)
(database postgresql-database)
- &key full-set types)
+ &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