FreeTDS Development Group

["ZIGLIO, Frediano, VF-IT" <Frediano.Ziglio AT vodafone.com>]

...
> 
> The jdbcdebug.log says:
> ----------------------------------
> *Driver.connect (jdbc:odbc:Macola1Free)
> JDBC to ODBC Bridge: Checking security
> No SecurityManager present, assuming trusted application/applet
> JDBC to ODBC Bridge 2.0001
> Current Date/Time: Tue Nov 01 10:36:18 GMT-05:00 2005
> Loading JdbcOdbc library
> Allocating Environment handle (SQLAllocEnv)
> hEnv=3059112
> Allocating Connection handle (SQLAllocConnect)
> ...skipping forward
> java.sql.SQLException: [unixODBC][FreeTDS][SQL Server]Invalid 
> cursor state
> Get string data (SQLGetData), hStmt=3898184, column=1, maxLen=129
>         at 
> sun.jdbc.odbc.JdbcOdbc.createSQLException(JdbcOdbc.java:6958)
>         at sun.jdbc.odbc.JdbcOdbc.standardError(JdbcOdbc.java:7115)
>         at sun.jdbc.odbc.JdbcOdbc.SQLTables(JdbcOdbc.java:5519)
>         at
...

Try with this patch

Index: src/odbc/odbc.c
===================================================================
RCS file: /cvsroot/freetds/freetds/src/odbc/odbc.c,v
retrieving revision 1.394
diff -u -1 -0 -r1.394 odbc.c
--- src/odbc/odbc.c     31 Aug 2005 15:22:10 -0000      1.394
+++ src/odbc/odbc.c     2 Nov 2005 12:53:13 -0000
@@ -5455,24 +5455,60 @@
 }


 SQLRETURN SQL_API
 SQLTables(SQLHSTMT hstmt, SQLCHAR FAR * szCatalogName, SQLSMALLINT
cbCatalogName, SQLCHAR FAR * szSchemaName,
          SQLSMALLINT cbSchemaName, SQLCHAR FAR * szTableName,
SQLSMALLINT cbTableName, SQLCHAR FAR * szTableType,
          SQLSMALLINT cbTableType)
 {
        int retcode;
        char *type = NULL;
-
+       char *proc = NULL;
+       int proc_allocated = 0;
+       int wildcards;
+       TDSSOCKET *tds;

        INIT_HSTMT;

+       tds = stmt->dbc->tds_socket;
+
+       /* fix for processing */
+       cbCatalogName = odbc_get_string_size(cbCatalogName,
szCatalogName);
+
+       /* support wildcards on catalog (only odbc 3) */
+       wildcards = 0;
+       if (stmt->dbc->env->attr.odbc_version == SQL_OV_ODBC3 &&
+           (memchr(szCatalogName, '%', cbCatalogName) ||
memchr(szCatalogName, '_', cbCatalogName)))
+               wildcards = 1;
+
+       proc = "sp_tables ";
+       if (cbCatalogName > 0) {
+               if (wildcards) {
+                       /* if catalog specified and wildcards use
sp_tableswc under mssql2k */
+                       if (TDS_IS_MSSQL(tds) && tds->product_version >=
TDS_MS_VER(8,0,0))
+                               proc = "sp_tableswc ";
+
+                       /* TODO support wildcards on catalog even for
Sybase */
+               } else {
+                       /* if catalog specified and not wildcards use
catatog on name (catalog..sp_tables) */
+                       int len = tds_quote_id(tds, NULL, szCatalogName,
cbCatalogName);
+                       proc = (char*) malloc(len + 15);
+                       if (!proc) {
+                               odbc_errs_add(&stmt->errs, "HY001",
NULL);
+                               ODBC_RETURN(stmt, SQL_ERROR);
+                       }
+                       proc_allocated = 1;
+                       tds_quote_id(tds, proc, szCatalogName,
cbCatalogName);
+                       strcpy(proc + len, "..sp_tables ");
+               }
+       }
+
        /* fix type if needed quoting it */
        if (szTableType) {
                int len = odbc_get_string_size(cbTableType,
szTableType);
                int to_fix = 0;
                int elements = 0;
                char *p = (char *) szTableType;
                char *const end = p + len;

                for (;;) {
                        char *begin = p;
@@ -5488,20 +5524,22 @@
                        ++p;
                }
                /* fix it */
                tdsdump_log(TDS_DBG_INFO1, "len %d to_fix %d elements
%d\n", len, to_fix, elements);
                if (len && to_fix) {
                        char *dst;

                        tdsdump_log(TDS_DBG_INFO1, "fixing type
elements\n");
                        type = (char *) malloc(len + elements * 2);
                        if (!type) {
+                               if (proc_allocated)
+                                       free(proc);
                                odbc_errs_add(&stmt->errs, "HY001",
NULL);
                                ODBC_RETURN(stmt, SQL_ERROR);
                        }
                        p = (char *) szTableType;
                        dst = type;
                        for (;;) {
                                char *begin = p;

                                p = memchr(p, ',', end - p);
                                if (!p)
@@ -5518,25 +5556,27 @@
                                if (p >= end)
                                        break;
                                *dst++ = *p++;
                        }
                        cbTableType = dst - type;
                        szTableType = (SQLCHAR *) type;
                }
        }

        retcode =
-               odbc_stat_execute(stmt, "sp_tables ", 4, "P@table_name",
szTableName, cbTableName, "P@table_owner", szSchemaName,
+               odbc_stat_execute(stmt, proc, 4, "P@table_name",
szTableName, cbTableName, "P@table_owner", szSchemaName,
                                  cbSchemaName, "P@table_qualifier",
szCatalogName, cbCatalogName, "@table_type", szTableType,
                                  cbTableType);
        if (type)
                free(type);
+       if (proc_allocated)
+               free(proc);
        if (SQL_SUCCEEDED(retcode) && stmt->dbc->env->attr.odbc_version
== SQL_OV_ODBC3) {
                odbc_col_setname(stmt, 1, "TABLE_CAT");
                odbc_col_setname(stmt, 2, "TABLE_SCHEM");
        }
        ODBC_RETURN_(stmt);
 }

 /**
  * Log a useful message about unimplemented options
  * Defying belief, Microsoft defines mutually exclusive options that


(already in CVS HEAD)

freddy77