- (make-instance 'aodbc-database
- :name (database-name-from-spec connection-spec :aodbc)
- :aodbc-conn
- (dbi:connect :user user
- :password password
- :data-source-name dsn))
- (error () ;; Init or Connect failed
- (error 'clsql-connect-error
- :database-type database-type
- :connection-spec connection-spec
- :errno nil
- :error "Connection failed")))))
-
-(defmethod database-disconnect ((database aodbc-database))
- #+aodbc-v2
- (dbi:disconnect (database-aodbc-conn database))
- (setf (database-aodbc-conn database) nil)
- t)
-
-(defmethod database-query (query-expression (database aodbc-database) types)
- #+aodbc-v2
- (handler-case
- (dbi:sql query-expression :db (database-aodbc-conn database)
- :types types)
- (error ()
- (error 'clsql-sql-error
- :database database
- :expression query-expression
- :errno nil
- :error "Query failed"))))
-
-(defmethod database-execute-command (sql-expression
- (database aodbc-database))
+ (make-instance 'aodbc-database
+ :name (database-name-from-spec connection-spec :aodbc)
+ :database-type :aodbc
+ :dbi-package (find-package '#:dbi)
+ :odbc-conn
+ (dbi:connect :user user
+ :password password
+ :data-source-name dsn))
+ (sql-error (e)
+ (error e))
+ (error () ;; Init or Connect failed
+ (error 'sql-connection-error
+ :database-type database-type
+ :connection-spec connection-spec
+ :message "Connection failed")))))
+
+
+(defmethod database-query (query-expression (database aodbc-database)
+ result-types field-names)