projects
/
clsql.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r9185: first effort at support field names in QUERY calls, still needs testing
[clsql.git]
/
db-aodbc
/
aodbc-sql.lisp
diff --git
a/db-aodbc/aodbc-sql.lisp
b/db-aodbc/aodbc-sql.lisp
index 22aa329b4b1c4fc706790e91bb1f6850c8377641..87fd0f3e346bc1926d279811702f5bbd7df60280 100644
(file)
--- a/
db-aodbc/aodbc-sql.lisp
+++ b/
db-aodbc/aodbc-sql.lisp
@@
-74,11
+74,12
@@
(setf (database-aodbc-conn database) nil)
t)
(setf (database-aodbc-conn database) nil)
t)
-(defmethod database-query (query-expression (database aodbc-database) result-types)
+(defmethod database-query (query-expression (database aodbc-database) result-types
field-names
)
#+aodbc-v2
(handler-case
(dbi:sql query-expression :db (database-aodbc-conn database)
#+aodbc-v2
(handler-case
(dbi:sql query-expression :db (database-aodbc-conn database)
- :types result-types)
+ :types result-types
+ :column-names field-names)
(clsql-error (e)
(error e))
(error ()
(clsql-error (e)
(error e))
(error ()
@@
-157,11
+158,11
@@
;;; Sequence functions
(defun %sequence-name-to-table (sequence-name)
;;; Sequence functions
(defun %sequence-name-to-table (sequence-name)
- (concatenate 'string "_
clsql_seq
_" (sql-escape sequence-name)))
+ (concatenate 'string "_
CLSQL_SEQ
_" (sql-escape sequence-name)))
(defun %table-name-to-sequence-name (table-name)
(and (>= (length table-name) 11)
(defun %table-name-to-sequence-name (table-name)
(and (>= (length table-name) 11)
- (string
= (subseq table-name 0 11) "_clsql_seq
_")
+ (string
-equal (subseq table-name 0 11) "_CLSQL_SEQ
_")
(subseq table-name 11)))
(defmethod database-create-sequence (sequence-name
(subseq table-name 11)))
(defmethod database-create-sequence (sequence-name
@@
-185,9
+186,8
@@
(defmethod database-list-sequences ((database aodbc-database)
&key (owner nil))
(declare (ignore owner))
(defmethod database-list-sequences ((database aodbc-database)
&key (owner nil))
(declare (ignore owner))
- (mapcar #'(lambda (s) (%table-name-to-sequence-name (car s)))
- (database-query "SHOW TABLES LIKE '%clsql_seq%'"
- database nil)))
+ (warn "database-list-sequences not implemented for AODBC.")
+ nil)
(defmethod database-list-tables ((database aodbc-database)
&key (owner nil))
(defmethod database-list-tables ((database aodbc-database)
&key (owner nil))