projects
/
clsql.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r9427: 22 May 2004 Kevin Rosenberg
[clsql.git]
/
db-aodbc
/
aodbc-sql.lisp
diff --git
a/db-aodbc/aodbc-sql.lisp
b/db-aodbc/aodbc-sql.lisp
index 02d6d95b63963d93d4cee2450fed6934b2edd8cb..060db96d844d8d98c97c529ec3962292617e6d00 100644
(file)
--- a/
db-aodbc/aodbc-sql.lisp
+++ b/
db-aodbc/aodbc-sql.lisp
@@
-19,19
+19,16
@@
(in-package #:clsql-aodbc)
;; interface foreign library loading routines
(in-package #:clsql-aodbc)
;; interface foreign library loading routines
-(defmethod clsql-
base
:database-type-library-loaded ((database-type (eql :aodbc)))
+(defmethod clsql-
sys
:database-type-library-loaded ((database-type (eql :aodbc)))
"T if foreign library was able to be loaded successfully. "
(when (find-package :dbi) ;; finds Allegro's DBI (AODBC) package
t))
"T if foreign library was able to be loaded successfully. "
(when (find-package :dbi) ;; finds Allegro's DBI (AODBC) package
t))
-(defmethod clsql-
base
:database-type-load-foreign ((databae-type (eql :aodbc)))
+(defmethod clsql-
sys
:database-type-load-foreign ((databae-type (eql :aodbc)))
t)
(when (find-package :dbi)
t)
(when (find-package :dbi)
- (clsql-base:database-type-load-foreign :aodbc))
-
-(defmethod database-initialize-database-type ((database-type (eql :aodbc)))
- t)
+ (clsql-sys:database-type-load-foreign :aodbc))
;; AODBC interface
;; AODBC interface
@@
-62,11
+59,10
@@
(clsql-error (e)
(error e))
(error () ;; Init or Connect failed
(clsql-error (e)
(error e))
(error () ;; Init or Connect failed
- (error '
clsql-connect
-error
+ (error '
sql-connection
-error
:database-type database-type
:connection-spec connection-spec
:database-type database-type
:connection-spec connection-spec
- :errno nil
- :error "Connection failed")))))
+ :message "Connection failed")))))
(defmethod database-disconnect ((database aodbc-database))
#+aodbc-v2
(defmethod database-disconnect ((database aodbc-database))
#+aodbc-v2
@@
-83,11
+79,10
@@
(clsql-error (e)
(error e))
(error ()
(clsql-error (e)
(error e))
(error ()
- (error '
clsql-sql
-error
+ (error '
sql-database-data
-error
:database database
:expression query-expression
:database database
:expression query-expression
- :errno nil
- :error "Query failed"))))
+ :message "Query failed."))))
(defmethod database-execute-command (sql-expression
(database aodbc-database))
(defmethod database-execute-command (sql-expression
(database aodbc-database))
@@
-97,11
+92,10
@@
(clsql-error (e)
(error e))
(error ()
(clsql-error (e)
(error e))
(error ()
- (error '
clsql-sql
-error
+ (error '
sql-database-data
-error
:database database
:expression sql-expression
:database database
:expression sql-expression
- :errno nil
- :error "Execute command failed"))))
+ :error "Execute command failed."))))
(defstruct aodbc-result-set
(query nil)
(defstruct aodbc-result-set
(query nil)
@@
-130,11
+124,10
@@
(clsql-error (e)
(error e))
(error ()
(clsql-error (e)
(error e))
(error ()
- (error '
clsql-sql
-error
+ (error '
sql-database-data
-error
:database database
:expression query-expression
:database database
:expression query-expression
- :errno nil
- :error "Query result set failed"))))
+ :error "Query result set failed."))))
(defmethod database-dump-result-set (result-set (database aodbc-database))
#+aodbc-v2
(defmethod database-dump-result-set (result-set (database aodbc-database))
#+aodbc-v2
@@
-261,8
+254,7
@@
(car (database-query
(concatenate 'string "SELECT last_value,is_called FROM "
table-name)
(car (database-query
(concatenate 'string "SELECT last_value,is_called FROM "
table-name)
- database
- :auto))))
+ database :auto nil))))
(cond
((char-equal (schar (second tuple) 0) #\f)
(database-execute-command
(cond
((char-equal (schar (second tuple) 0) #\f)
(database-execute-command
@@
-281,8
+273,7
@@
(caar (database-query
(concatenate 'string "SELECT last_value FROM "
(%sequence-name-to-table sequence-name))
(caar (database-query
(concatenate 'string "SELECT last_value FROM "
(%sequence-name-to-table sequence-name))
- database
- :auto))))
+ database :auto nil))))
(defmethod database-create (connection-spec (type (eql :aodbc)))
(warn "Not implemented."))
(defmethod database-create (connection-spec (type (eql :aodbc)))
(warn "Not implemented."))
@@
-304,5
+295,5
@@
(defmethod database-initialize-database-type ((database-type (eql :aodbc)))
t)
(defmethod database-initialize-database-type ((database-type (eql :aodbc)))
t)
-(when (clsql-
base
:database-type-library-loaded :aodbc)
- (clsql-
base
:initialize-database-type :database-type :aodbc))
+(when (clsql-
sys
:database-type-library-loaded :aodbc)
+ (clsql-
sys
:initialize-database-type :database-type :aodbc))