projects
/
clsql.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r10110: Automated commit for Debian build of clsql upstream-version-3.0.11
[clsql.git]
/
sql
/
generic-odbc.lisp
diff --git
a/sql/generic-odbc.lisp
b/sql/generic-odbc.lisp
index 8601ed624fe019a9a26a7bf243fbb26b7a22e49c..eb3430f4b4d44dea933f031ba790bea31f729a2d 100644
(file)
--- a/
sql/generic-odbc.lisp
+++ b/
sql/generic-odbc.lisp
@@
-1,7
+1,7
@@
;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*-
;;;; *************************************************************************
;;;;
;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*-
;;;; *************************************************************************
;;;;
-;;;; $Id
:
$
+;;;; $Id$
;;;;
;;;; Generic ODBC layer, used by db-odbc and db-aodbc backends
;;;;
;;;;
;;;; Generic ODBC layer, used by db-odbc and db-aodbc backends
;;;;
@@
-27,6
+27,7
@@
(defmethod initialize-instance :after ((db generic-odbc-database)
&rest all-keys)
(defmethod initialize-instance :after ((db generic-odbc-database)
&rest all-keys)
+ (declare (ignore all-keys))
(unless (slot-boundp db 'dbi-package)
(error "dbi-package not specified."))
(let ((pkg (slot-value db 'dbi-package)))
(unless (slot-boundp db 'dbi-package)
(error "dbi-package not specified."))
(let ((pkg (slot-value db 'dbi-package)))
@@
-52,6
+53,11
@@
(db-type (eql :postgresql)))
(if (string= "0" val) nil t))
(db-type (eql :postgresql)))
(if (string= "0" val) nil t))
+(defmethod read-sql-value (val (type (eql 'generalized-boolean))
+ (database generic-odbc-database)
+ (db-type (eql :postgresql)))
+ (if (string= "0" val) nil t))
+
;;; Backend methods
;;; Backend methods
@@
-67,6
+73,7
@@
query-expression :db (odbc-conn database)
:result-types result-types
:column-names field-names)
query-expression :db (odbc-conn database)
:result-types result-types
:column-names field-names)
+ #+ignore
(error ()
(error 'sql-database-data-error
:database database
(error ()
(error 'sql-database-data-error
:database database
@@
-178,8
+185,6
@@
(loop for row in rows
collect (fourth row))))
(loop for row in rows
collect (fourth row))))
-
-
(defmethod database-attribute-type ((attribute string) (table string) (database generic-odbc-database)
&key (owner nil))
(declare (ignore owner))
(defmethod database-attribute-type ((attribute string) (table string) (database generic-odbc-database)
&key (owner nil))
(declare (ignore owner))