Index: Makefile.in =================================================================== RCS file: /opt/AllCdkit/cvsroot/tclodbc/Makefile.in,v retrieving revision 1.1 retrieving revision 1.1.1.1 diff -w -C2 -r1.1 -r1.1.1.1 Index: README-OLD.unix =================================================================== RCS file: /opt/AllCdkit/cvsroot/tclodbc/README-OLD.unix,v retrieving revision 1.1 retrieving revision 1.1.1.1 diff -w -C2 -r1.1 -r1.1.1.1 Index: README.unix =================================================================== RCS file: /opt/AllCdkit/cvsroot/tclodbc/README.unix,v retrieving revision 1.1 retrieving revision 1.1.1.1 diff -w -C2 -r1.1 -r1.1.1.1 Index: aclocal.m4 =================================================================== RCS file: /opt/AllCdkit/cvsroot/tclodbc/aclocal.m4,v retrieving revision 1.1 retrieving revision 1.1.1.1 diff -w -C2 -r1.1 -r1.1.1.1 Index: configure =================================================================== RCS file: /opt/AllCdkit/cvsroot/tclodbc/configure,v retrieving revision 1.1 retrieving revision 1.1.1.1 diff -w -C2 -r1.1 -r1.1.1.1 Index: configure.in =================================================================== RCS file: /opt/AllCdkit/cvsroot/tclodbc/configure.in,v retrieving revision 1.1 retrieving revision 1.1.1.1 diff -w -C2 -r1.1 -r1.1.1.1 Index: database.cxx =================================================================== RCS file: /opt/AllCdkit/cvsroot/tclodbc/database.cxx,v retrieving revision 1.1 retrieving revision 1.2 diff -w -C2 -r1.1 -r1.2 *** database.cxx 1999/06/10 12:37:58 1.1 --- database.cxx 1999/06/10 12:48:09 1.2 *************** *** 392,396 **** op = StrToNum (option, connectOp); ! if (op >= SQL_STMT_OPT_MIN && op <= SQL_CONN_OPT_MAX) { rc = SQLGetConnectOption(dbc, op, &val); --- 392,396 ---- op = StrToNum (option, connectOp); ! if (op >= SQL_CONN_OPT_MIN && op <= SQL_CONN_OPT_MAX) { rc = SQLGetConnectOption(dbc, op, &val); Index: encoding.cxx =================================================================== RCS file: /opt/AllCdkit/cvsroot/tclodbc/encoding.cxx,v retrieving revision 1.1 retrieving revision 1.1.1.1 diff -w -C2 -r1.1 -r1.1.1.1 Index: license.txt =================================================================== RCS file: /opt/AllCdkit/cvsroot/tclodbc/license.txt,v retrieving revision 1.1 retrieving revision 1.1.1.1 diff -w -C2 -r1.1 -r1.1.1.1 Index: pkgIndex.tcl.in =================================================================== RCS file: /opt/AllCdkit/cvsroot/tclodbc/pkgIndex.tcl.in,v retrieving revision 1.1 retrieving revision 1.1.1.1 diff -w -C2 -r1.1 -r1.1.1.1 Index: statemnt.cxx =================================================================== RCS file: /opt/AllCdkit/cvsroot/tclodbc/statemnt.cxx,v retrieving revision 1.1 retrieving revision 1.2 diff -w -C2 -r1.1 -r1.2 *** statemnt.cxx 1999/06/10 12:37:58 1.1 --- statemnt.cxx 1999/06/10 12:48:09 1.2 *************** *** 419,422 **** --- 419,423 ---- break; + case SQL_COLUMN_AUTO_INCREMENT: case SQL_COLUMN_DISPLAY_SIZE: case SQL_COLUMN_TYPE: *************** *** 461,465 **** // Variable lenght columns are read with SQLGetData. // First get the length with the first call by setting bufsize = 1 ! rc = SQLGetData(stmt, i+1, SQL_C_CHAR, strEmpty, 1, &(resultBuffer[i].cbValue)); --- 462,466 ---- // Variable lenght columns are read with SQLGetData. // First get the length with the first call by setting bufsize = 1 ! rc = SQLGetData(stmt, i+1, SQL_C_CHAR, strEmpty, 0, &(resultBuffer[i].cbValue)); Index: strings.cxx =================================================================== RCS file: /opt/AllCdkit/cvsroot/tclodbc/strings.cxx,v retrieving revision 1.1 retrieving revision 1.2 diff -w -C2 -r1.1 -r1.2 *** strings.cxx 1999/06/10 12:37:57 1.1 --- strings.cxx 1999/06/10 12:48:09 1.2 *************** *** 130,134 **** NumStr attrDef [] = { ! {12, NULL }, {SQL_COLUMN_DISPLAY_SIZE, "displaysize" }, {SQL_COLUMN_LABEL, "label" }, --- 130,135 ---- NumStr attrDef [] = { ! {13, NULL }, ! {SQL_COLUMN_AUTO_INCREMENT,"autoincrement" }, {SQL_COLUMN_DISPLAY_SIZE, "displaysize" }, {SQL_COLUMN_LABEL, "label" }, Index: tclobj.cxx =================================================================== RCS file: /opt/AllCdkit/cvsroot/tclodbc/tclobj.cxx,v retrieving revision 1.1 retrieving revision 1.2 diff -w -C2 -r1.1 -r1.2 *** tclobj.cxx 1999/06/10 12:37:57 1.1 --- tclobj.cxx 1999/06/10 12:48:09 1.2 *************** *** 472,476 **** #if TCL_MAJOR_VERSION == 8 #if TCL_MINOR_VERSION >= 1 ! if (Tcl_EvalObj(interp, (Tcl_Obj*) *this, TCL_EVAL_DIRECT) == TCL_ERROR) #else if (Tcl_EvalObj(interp, (Tcl_Obj*) *this) == TCL_ERROR) --- 472,476 ---- #if TCL_MAJOR_VERSION == 8 #if TCL_MINOR_VERSION >= 1 ! if (Tcl_EvalObjEx(interp, (Tcl_Obj*) *this, TCL_EVAL_DIRECT) == TCL_ERROR) #else if (Tcl_EvalObj(interp, (Tcl_Obj*) *this) == TCL_ERROR) Index: tclobj.hxx =================================================================== RCS file: /opt/AllCdkit/cvsroot/tclodbc/tclobj.hxx,v retrieving revision 1.1 retrieving revision 1.1.1.1 diff -w -C2 -r1.1 -r1.1.1.1 Index: tclodbc.cxx =================================================================== RCS file: /opt/AllCdkit/cvsroot/tclodbc/tclodbc.cxx,v retrieving revision 1.1 retrieving revision 1.2 diff -w -C2 -r1.1 -r1.2 *** tclodbc.cxx 1999/06/10 12:37:58 1.1 --- tclodbc.cxx 1999/06/10 12:48:09 1.2 *************** *** 100,104 **** // ODBC environment handle ! HENV env = 0; ////////////////////////////////////////////////////////////////////////// --- 100,104 ---- // ODBC environment handle ! SQLHENV env = 0; ////////////////////////////////////////////////////////////////////////// *************** *** 106,110 **** // ! TclObj SqlErr (HENV env, HDBC dbc, HSTMT stmt) { char SqlMessage[SQL_MAX_MESSAGE_LENGTH]; char SqlState[6]; --- 106,110 ---- // ! TclObj SqlErr (SQLHENV env, SQLHDBC dbc, SQLHSTMT stmt) { char SqlMessage[SQL_MAX_MESSAGE_LENGTH]; char SqlState[6]; Index: tclodbc.hxx =================================================================== RCS file: /opt/AllCdkit/cvsroot/tclodbc/tclodbc.hxx,v retrieving revision 1.1 retrieving revision 1.2 diff -w -C2 -r1.1 -r1.2 *** tclodbc.hxx 1999/06/10 12:37:58 1.1 --- tclodbc.hxx 1999/06/10 12:48:09 1.2 *************** *** 136,140 **** // environment handle ! extern HENV env; // version number --- 136,140 ---- // environment handle ! extern SQLHENV env; // version number *************** *** 290,294 **** // List of all registered drivers ! HDBC DBC() {return dbc;}; // return dbc handle --- 290,294 ---- // List of all registered drivers ! SQLHDBC DBC() {return dbc;}; // return dbc handle *************** *** 297,301 **** void AddStatement(TclStatement *); ! HDBC dbc; Tcl_Encoding encoding; }; --- 297,301 ---- void AddStatement(TclStatement *); ! SQLHDBC dbc; Tcl_Encoding encoding; }; *************** *** 359,363 **** // source. This is called from descendents constructors. ! HSTMT stmt; TclDatabase* pDb; --- 359,363 ---- // source. This is called from descendents constructors. ! SQLHSTMT stmt; TclDatabase* pDb; *************** *** 491,495 **** // ! TclObj SqlErr (HENV env, HDBC dbc, HSTMT stmt); short StrToNum (char *str, NumStr array[], char* errMsg = strInvalidOption, --- 491,495 ---- // ! TclObj SqlErr (SQLHENV env, SQLHDBC dbc, SQLHSTMT stmt); short StrToNum (char *str, NumStr array[], char* errMsg = strInvalidOption, Index: tclodbc.mak =================================================================== RCS file: /opt/AllCdkit/cvsroot/tclodbc/tclodbc.mak,v retrieving revision 1.1 retrieving revision 1.1.1.1 diff -w -C2 -r1.1 -r1.1.1.1 Index: doc/reference.html =================================================================== RCS file: /opt/AllCdkit/cvsroot/tclodbc/doc/reference.html,v retrieving revision 1.1 retrieving revision 1.1.1.1 diff -w -C2 -r1.1 -r1.1.1.1 Index: doc/samples.html =================================================================== RCS file: /opt/AllCdkit/cvsroot/tclodbc/doc/samples.html,v retrieving revision 1.1 retrieving revision 1.1.1.1 diff -w -C2 -r1.1 -r1.1.1.1 Index: doc/utilref.html =================================================================== RCS file: /opt/AllCdkit/cvsroot/tclodbc/doc/utilref.html,v retrieving revision 1.1 retrieving revision 1.1.1.1 diff -w -C2 -r1.1 -r1.1.1.1 Index: samples/clear.bat =================================================================== RCS file: /opt/AllCdkit/cvsroot/tclodbc/samples/clear.bat,v retrieving revision 1.1 retrieving revision 1.1.1.1 diff -w -C2 -r1.1 -r1.1.1.1 Index: samples/connect.tcl =================================================================== RCS file: /opt/AllCdkit/cvsroot/tclodbc/samples/connect.tcl,v retrieving revision 1.1 retrieving revision 1.1.1.1 diff -w -C2 -r1.1 -r1.1.1.1 Index: samples/createdb.tcl =================================================================== RCS file: /opt/AllCdkit/cvsroot/tclodbc/samples/createdb.tcl,v retrieving revision 1.1 retrieving revision 1.1.1.1 diff -w -C2 -r1.1 -r1.1.1.1 Index: samples/dumpdata.tcl =================================================================== RCS file: /opt/AllCdkit/cvsroot/tclodbc/samples/dumpdata.tcl,v retrieving revision 1.1 retrieving revision 1.1.1.1 diff -w -C2 -r1.1 -r1.1.1.1 Index: samples/dumpdef.tcl =================================================================== RCS file: /opt/AllCdkit/cvsroot/tclodbc/samples/dumpdef.tcl,v retrieving revision 1.1 retrieving revision 1.1.1.1 diff -w -C2 -r1.1 -r1.1.1.1 Index: samples/loaddate.tcl =================================================================== RCS file: /opt/AllCdkit/cvsroot/tclodbc/samples/loaddate.tcl,v retrieving revision 1.1 retrieving revision 1.1.1.1 diff -w -C2 -r1.1 -r1.1.1.1 Index: samples/loaddef.tcl =================================================================== RCS file: /opt/AllCdkit/cvsroot/tclodbc/samples/loaddef.tcl,v retrieving revision 1.1 retrieving revision 1.1.1.1 diff -w -C2 -r1.1 -r1.1.1.1 Index: samples/populate.tcl =================================================================== RCS file: /opt/AllCdkit/cvsroot/tclodbc/samples/populate.tcl,v retrieving revision 1.1 retrieving revision 1.1.1.1 diff -w -C2 -r1.1 -r1.1.1.1 Index: samples/tktable.tcl =================================================================== RCS file: /opt/AllCdkit/cvsroot/tclodbc/samples/tktable.tcl,v retrieving revision 1.1 retrieving revision 1.1.1.1 diff -w -C2 -r1.1 -r1.1.1.1 Index: tclutils/datautil.tcl =================================================================== RCS file: /opt/AllCdkit/cvsroot/tclodbc/tclutils/datautil.tcl,v retrieving revision 1.1 retrieving revision 1.1.1.1 diff -w -C2 -r1.1 -r1.1.1.1 Index: tclutils/genutil.tcl =================================================================== RCS file: /opt/AllCdkit/cvsroot/tclodbc/tclutils/genutil.tcl,v retrieving revision 1.1 retrieving revision 1.1.1.1 diff -w -C2 -r1.1 -r1.1.1.1 Index: tclutils/sqlutil.tcl =================================================================== RCS file: /opt/AllCdkit/cvsroot/tclodbc/tclutils/sqlutil.tcl,v retrieving revision 1.1 retrieving revision 1.1.1.1 diff -w -C2 -r1.1 -r1.1.1.1 Index: tclutils/tkutil.tcl =================================================================== RCS file: /opt/AllCdkit/cvsroot/tclodbc/tclutils/tkutil.tcl,v retrieving revision 1.1 retrieving revision 1.1.1.1 diff -w -C2 -r1.1 -r1.1.1.1