projects
/
clsql.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Another test that depends on auto-increment
[clsql.git]
/
db-odbc
/
odbc-ff-interface.lisp
diff --git
a/db-odbc/odbc-ff-interface.lisp
b/db-odbc/odbc-ff-interface.lisp
index a7153c8660600a5d7260a967d060a6aee1cbc8ea..0fa0824f008ef5bb68a9b062a0032a7a055cc800 100644
(file)
--- a/
db-odbc/odbc-ff-interface.lisp
+++ b/
db-odbc/odbc-ff-interface.lisp
@@
-6,8
+6,6
@@
;;;; Purpose: Function definitions for UFFI interface to ODBC
;;;; Author: Kevin M. Rosenberg
;;;;
;;;; Purpose: Function definitions for UFFI interface to ODBC
;;;; Author: Kevin M. Rosenberg
;;;;
-;;;; $Id$
-;;;;
;;;; This file, part of CLSQL, is Copyright (c) 2004 by Kevin M. Rosenberg
;;;; and Copyright (C) Paul Meurer 1999 - 2001. All rights reserved.
;;;;
;;;; This file, part of CLSQL, is Copyright (c) 2004 by Kevin M. Rosenberg
;;;; and Copyright (C) Paul Meurer 1999 - 2001. All rights reserved.
;;;;
@@
-23,7
+21,7
@@
(def-foreign-type string-ptr (* :unsigned-char))
(def-type long-ptr-type (* #.$ODBC-LONG-TYPE))
(def-foreign-type string-ptr (* :unsigned-char))
(def-type long-ptr-type (* #.$ODBC-LONG-TYPE))
-;;
odbc v
3
+;;
ODBC
3
(def-function "SQLAllocHandle"
((handle-type :short)
(input-handle sql-handle)
(def-function "SQLAllocHandle"
((handle-type :short)
(input-handle sql-handle)
@@
-31,6
+29,14
@@
:module "odbc"
:returning :short)
:module "odbc"
:returning :short)
+;; ODBC3 version of SQLFreeStmt, SQLFreeConnect, and SSQLFreeStmt
+(def-function "SQLFreeHandle"
+ ((handle-type :short) ; HandleType
+ (input-handle sql-handle)) ; Handle
+ :module "odbc"
+ :returning :short) ; RETCODE_SQL_API
+
+
;; deprecated
(def-function "SQLAllocEnv"
((*phenv sql-handle-ptr) ; HENV FAR *phenv
;; deprecated
(def-function "SQLAllocEnv"
((*phenv sql-handle-ptr) ; HENV FAR *phenv
@@
-50,7
+56,7
@@
((hdbc sql-handle) ; HDBC hdbc
(*szDSN :cstring) ; UCHAR FAR *szDSN
(cbDSN :short) ; SWORD cbDSN
((hdbc sql-handle) ; HDBC hdbc
(*szDSN :cstring) ; UCHAR FAR *szDSN
(cbDSN :short) ; SWORD cbDSN
- (*szUID :cstring) ; UCHAR FAR *szUID
+ (*szUID :cstring) ; UCHAR FAR *szUID
(cbUID :short) ; SWORD cbUID
(*szAuthStr :cstring) ; UCHAR FAR *szAuthStr
(cbAuthStr :short) ; SWORD cbAuthStr
(cbUID :short) ; SWORD cbUID
(*szAuthStr :cstring) ; UCHAR FAR *szAuthStr
(cbAuthStr :short) ; SWORD cbAuthStr
@@
-61,7
+67,7
@@
(def-function "SQLDriverConnect"
((hdbc sql-handle) ; HDBC hdbc
(hwnd sql-handle) ; SQLHWND hwnd
(def-function "SQLDriverConnect"
((hdbc sql-handle) ; HDBC hdbc
(hwnd sql-handle) ; SQLHWND hwnd
- (*szConnStrIn
string-ptr)
; UCHAR FAR *szConnStrIn
+ (*szConnStrIn
:cstring)
; UCHAR FAR *szConnStrIn
(cbConnStrIn :short) ; SWORD cbConnStrIn
(*szConnStrOut string-ptr) ; UCHAR FAR *szConnStrOut
(cbConnStrOutMax :short) ; SWORD cbConnStrOutMax
(cbConnStrIn :short) ; SWORD cbConnStrIn
(*szConnStrOut string-ptr) ; UCHAR FAR *szConnStrOut
(cbConnStrOutMax :short) ; SWORD cbConnStrOutMax
@@
-75,7
+81,14
@@
((hdbc sql-handle)) ; HDBC hdbc
:module "odbc"
:returning :short) ; RETCODE_SQL_API
((hdbc sql-handle)) ; HDBC hdbc
:module "odbc"
:returning :short) ; RETCODE_SQL_API
-
+
+
+;;deprecated
+(def-function "SQLFreeConnect"
+ ((hdbc sql-handle)) ; HDBC hdbc
+ :module "odbc"
+ :returning :short) ; RETCODE_SQL_API
+
;; deprecated
(def-function "SQLAllocStmt"
((hdbc sql-handle) ; HDBC hdbc
;; deprecated
(def-function "SQLAllocStmt"
((hdbc sql-handle) ; HDBC hdbc
@@
-300,7
+313,7
@@
:module "odbc"
:returning :short) ; RETCODE_SQL_API
:module "odbc"
:returning :short) ; RETCODE_SQL_API
- ; level 2
+
; level 2
(def-function "SQLExtendedFetch"
((hstmt sql-handle) ; HSTMT hstmt
(fFetchType :short) ; UWORD fFetchType
(def-function "SQLExtendedFetch"
((hstmt sql-handle) ; HSTMT hstmt
(fFetchType :short) ; UWORD fFetchType
@@
-333,11
+346,11
@@
;;; foreign type definitions
;;; foreign type definitions
-;;(defmacro %sql-len-data-at-exec (length)
+;;(defmacro %sql-len-data-at-exec (length)
;; `(- $SQL_LEN_DATA_AT_EXEC_OFFSET ,length))
;; `(- $SQL_LEN_DATA_AT_EXEC_OFFSET ,length))
-(def-struct sql-c-time
+(def-struct sql-c-time
(hour :short)
(minute :short)
(second :short))
(hour :short)
(minute :short)
(second :short))
@@
-346,7
+359,7
@@
(year :short)
(month :short)
(day :short))
(year :short)
(month :short)
(day :short))
-
+
(def-struct sql-c-timestamp
(year :short)
(month :short)
(def-struct sql-c-timestamp
(year :short)
(month :short)
@@
-384,9
+397,7
@@
(table-name :pointer-void)
(table-name-length :short)
(table-type-name :pointer-void)
(table-name :pointer-void)
(table-name-length :short)
(table-type-name :pointer-void)
- (table-type-name-length :short)
- (unique :short)
- (reserved :short))
+ (table-type-name-length :short))
:module "odbc"
:returning :short)
:module "odbc"
:returning :short)