Imported sqliteodbc-0.9997.tar.gz

Author: chw

ChangeLog

@@ -1,6 +1,14 @@
 SQLite ODBC Driver
 ------------------
 
+Sat Jun 13 2020 version 0.9997 released
+
+	* update to SQLite 3.32.2
+	* fix info for SQL_OUTER_JOINS/SQL_OJ_CAPABILITIES
+	* provide more clean quote hints in type info
+	* improve SQLBulkOperations()
+	* better deal with auto column names in csvtable module
+
 Sat Feb 24 2018 version 0.9996 released
 
 	* update to SQLite 3.22.0

README

@@ -13,7 +13,7 @@ WIN32 binaries (the ODBC driver DLL, install/uninstall programs) are in
 
     http://www.ch-werner.de/sqliteodbc/sqliteodbc.exe
 
-The binaries were made with SQLite 2.8.17, SQLite 3.22.0, MingW
+The binaries were made with SQLite 2.8.17, SQLite 3.32.2, MingW
 cross compiler and tested on Windows NT 4.0 with the query tool
 of MS Excel 97, with StarOffice 5.2 and OpenOffice 1.1 and 2.x.
 Execute the sqliteodbc.exe NSIS installer to unpack the necessary
@@ -26,7 +26,7 @@ on as an absolute pathname including the drive letter, eg as
 can be specified in the respective field. If empty a default value
 of 100000 milliseconds is used.
 
-The Win64 installer (sqliteodbc_w64.exe) was made with SQLite 3.22.0,
+The Win64 installer (sqliteodbc_w64.exe) was made with SQLite 3.32.2,
 MingW cross compiler and only rudimentary tested on Windows Vista 64.
 
 Other tests were made on Linux with the "isql" command line tool
@@ -147,15 +147,15 @@ DSN-less connection to the driver
   Using the SQLDriverConnect() API it is possible to connect to
   a SQLite database with these strings (Win32 and UN*X)
 
-    DSN=SQLite Datasource;Database=full-path-to-db;...
-    DSN=SQLite3 Datasource;Database=full-path-to-db;...
+    DSN={SQLite Datasource};Database=full-path-to-db;...
+    DSN={SQLite3 Datasource};Database=full-path-to-db;...
 
   alternatively
 
   Win32:
 
-    Driver=SQLite ODBC Driver;Database=full-path-to-db;...
-    Driver=SQLite3 ODBC Driver;Database=full-path-to-db;...
+    Driver={SQLite ODBC Driver};Database=full-path-to-db;...
+    Driver={SQLite3 ODBC Driver};Database=full-path-to-db;...
 
   UN*X (Linux RPM):
 
@@ -395,7 +395,7 @@ TODO:
 - improve documentation
 
 
-2018-02-24
+2020-06-13
 Christian Werner
 mailto:chw@ch-werner.de
 

VERSION

@@ -1 +1 @@
-0.9996
+0.9997

blobtoxy.c

@@ -4,9 +4,9 @@
  * using SQLite 3.3.x virtual table API plus some useful
  * scalar and aggregate functions.
  *
- * $Id: blobtoxy.c,v 1.26 2016/08/14 10:02:55 chw Exp chw $
+ * $Id: blobtoxy.c,v 1.27 2020/06/13 11:04:17 chw Exp chw $
  *
- * Copyright (c) 2007-2016 Christian Werner <chw@ch-werner.de>
+ * Copyright (c) 2007-2020 Christian Werner <chw@ch-werner.de>
  *
  * See the file "license.terms" for information on usage
  * and redistribution of this file and for a

blobtoxy.rc

@@ -25,7 +25,7 @@ BEGIN
             VALUE "FileDescription", "SQLite3 Extension BLOB to X/Y\0"
             VALUE "FileVersion", VERSION "\0"
             VALUE "InternalName", "BLOBTOXY\0"
-            VALUE "LegalCopyright", "Copyright � 2007-2016 <chw@ch-werner.de>\0"
+            VALUE "LegalCopyright", "Copyright � 2007-2020 <chw@ch-werner.de>\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "SQLITE3_MOD_BLOBTOXY.DLL\0"
             VALUE "PrivateBuild", "\0"

csvtable.c

@@ -967,9 +967,9 @@ csv_vtab_connect(sqlite3* db, void *aux, int argc, const char * const *argv,
 		 sqlite3_vtab **vtabp, char **errp)
 {
     csv_file *csv;
-    int rc = SQLITE_ERROR, i, ncnames, row1;
+    int rc = SQLITE_ERROR, i, k, ncnames, row1, *colmap = 0;
     char **cnames, *schema = 0, **nargv;
-    csv_vtab *vtab;
+    csv_vtab *vtab = 0;
 
     if (argc < 4) {
 	*errp = sqlite3_mprintf("input file name missing");
@@ -991,6 +991,12 @@ csv_vtab_connect(sqlite3* db, void *aux, int argc, const char * const *argv,
 		sqlite3_free(nargv[i]);
 	    }
 	}
+	if (vtab) {
+	    sqlite3_free(vtab);
+	}
+	if (colmap) {
+	    sqlite3_free(colmap);
+	}
 	return rc;
     }
     if (!csv->sep && !csv->quot) {
@@ -1028,7 +1034,14 @@ csv_vtab_connect(sqlite3* db, void *aux, int argc, const char * const *argv,
 	ncnames = csv_ncols(csv);
 	cnames = 0;
     }
-    vtab = sqlite3_malloc(sizeof(csv_vtab) + ncnames);
+    colmap = sqlite3_malloc(sizeof (int) * ncnames);
+    if (!colmap) {
+	csv_close(csv);
+	*errp = sqlite3_mprintf("out of memory");
+	goto cleanup;
+    }
+    memset(colmap, 0, sizeof (int) * ncnames);
+    vtab = sqlite3_malloc(sizeof (csv_vtab) + ncnames);
     if (!vtab) {
 	csv_close(csv);
 	*errp = sqlite3_mprintf("out of memory");
@@ -1044,12 +1057,38 @@ csv_vtab_connect(sqlite3* db, void *aux, int argc, const char * const *argv,
     }
     vtab->csv = csv;
     append(&schema, "CREATE TABLE x(", 0);
+    for (i = 0; cnames && (i < ncnames); i++) {
+	if (!cnames[i] || (cnames[i][0] == '\0')) {
+	    continue;
+	}
+	k = strlen(cnames[i]);
+	if ((k > 7) && (strncasecmp("column_", cnames[i], 7) == 0)) {
+	    char c;
+
+	    if (sscanf(cnames[i] + 7, "%d%c", &k, &c) == 1) {
+		colmap[i] = k;
+	    }
+	}
+    }
     for (i = 0; i < ncnames; i++) {
 	vtab->coltypes[i] = SQLITE_TEXT;
-	if (!cnames || !cnames[i]) {
+	if (!cnames || !cnames[i] || (cnames[i][0] == '\0')) {
+	    int want = i + 1;
 	    char colname[64];
 
-	    sprintf(colname, "column_%d", i + 1);
+	    while (1) {
+		for (k = 0; k < ncnames; k++) {
+		    if ((k != i) && (colmap[k] == want)) {
+			want++;
+			break;
+		    }
+		}
+		if (k >= ncnames) {
+		    colmap[i] = want;
+		    break;
+		}
+	    }
+	    sprintf(colname, "column_%d", colmap[i]);
 	    append(&schema, colname, '"');
 	} else if (row1 > 0) {
 	    append(&schema, cnames[i], '"');
@@ -1082,13 +1121,13 @@ csv_vtab_connect(sqlite3* db, void *aux, int argc, const char * const *argv,
     rc = sqlite3_declare_vtab(db, schema);
     if (rc != SQLITE_OK) {
 	csv_close(csv);
-	sqlite3_free(vtab);
 	*errp = sqlite3_mprintf("table definition failed, error %d, "
 				"schema '%s'", rc, schema);
 	goto cleanup;
     }
     *vtabp = &vtab->vtab;
     *errp = 0;
+    vtab = 0;
     goto cleanup;
 }
 
@@ -1162,7 +1201,7 @@ csv_vtab_bestindex(sqlite3_vtab *vtab, sqlite3_index_info *info)
 static int
 csv_vtab_open(sqlite3_vtab *vtab, sqlite3_vtab_cursor **cursorp)
 {
-    csv_cursor *cur = sqlite3_malloc(sizeof(*cur));
+    csv_cursor *cur = sqlite3_malloc(sizeof (*cur));
     csv_vtab *tab = (csv_vtab *) vtab;
 
     if (!cur) {
@@ -1351,7 +1390,7 @@ static void
 csv_import_func(sqlite3_context *ctx, int argc, sqlite3_value **argv)
 {
     csv_file *csv;
-    int rc, i, ncnames, row1, convert = 0, useargs = 0;
+    int rc, i, k, ncnames, row1, convert = 0, useargs = 0, *colmap = 0;
     char *tname, *fname, *sql = 0, **cnames, *coltypes = 0;
     sqlite3 *db = (sqlite3 *) sqlite3_user_data(ctx);
     sqlite3_stmt *stmt = 0;
@@ -1380,8 +1419,8 @@ csv_import_func(sqlite3_context *ctx, int argc, sqlite3_value **argv)
 	    sqlite3_finalize(stmt);
 	}
 	append_free(&sql);
-	if (coltypes) {
-	    sqlite3_free(coltypes);
+	if (colmap) {
+	    sqlite3_free(colmap);
 	}
 	if (csv) {
 	    csv_close(csv);
@@ -1478,14 +1517,30 @@ csv_import_func(sqlite3_context *ctx, int argc, sqlite3_value **argv)
 	/* create new table */
 	sqlite3_finalize(stmt);
 	stmt = 0;
-	coltypes = sqlite3_malloc(ncnames);
-	if (!coltypes) {
+	colmap = (int *) sqlite3_malloc(ncnames + sizeof (int) * ncnames);
+	if (!colmap) {
 	    goto oom;
 	}
+	memset(colmap, 0, sizeof (int) * ncnames);
+	coltypes = (char *) (colmap + ncnames);
 	append(&sql, "CREATE TABLE ", 0);
 	append(&sql, tname, '"');
 	append(&sql, "(", 0);
+	for (i = 0; cnames && (i < ncnames); i++) {
+	    if (!cnames[i] || (cnames[i][0] == '\0')) {
+		continue;
+	    }
+	    k = strlen(cnames[i]);
+	    if ((k > 7) && (strncasecmp("column_", cnames[i], 7) == 0)) {
+		char c;
+
+		if (sscanf(cnames[i] + 7, "%d%c", &k, &c) == 1) {
+		    colmap[i] = k;
+		}
+	    }
+	}
 	for (i = 0; i < ncnames; i++) {
+	    int want = i + 1;
 	    char colname[64];
 
 	    coltypes[i] = SQLITE_TEXT;
@@ -1505,7 +1560,19 @@ csv_import_func(sqlite3_context *ctx, int argc, sqlite3_value **argv)
 		coltypes[i] = maptype(type);
 	    } else if (!cnames || !cnames[i]) {
 defcol:
-		sprintf(colname, "column_%d", i + 1);
+		while (1) {
+		    for (k = 0; k < ncnames; k++) {
+			if ((k != i) && (colmap[k] == want)) {
+			    want++;
+			    break;
+			}
+		    }
+		    if (k >= ncnames) {
+			colmap[i] = want;
+			break;
+		    }
+		}
+		sprintf(colname, "column_%d", colmap[i]);
 		append(&sql, colname, '"');
 	    } else if (row1 > 0) {
 		append(&sql, cnames[i], '"');

debian/changelog

@@ -1,6 +1,6 @@
-sqliteodbc (0.9996-1) unstable; urgency=low
+sqliteodbc (0.9997-1) unstable; urgency=low
 
   * automatically recreated by configure
 
- -- Christian Werner <chw@ch-werner.de>  Sat, 24 Feb 2018 10:30:55 +0100
+ -- Christian Werner <chw@ch-werner.de>  Sat, 13 Jun 2020 13:07:14 +0200