Merge pull request #125 from livecode/bugfix-11919

[11919] Add support for URI filenames in SQLITE databases

Author: livecodepanos

libsqlite/include/sqlitedataset/dataset.h

@@ -114,7 +114,7 @@ class Database  {
   virtual const char *getErrorMsg(void) { return error.c_str(); }
   virtual void setErrDirect(const char *p_error) { error = p_error; }
 
-  virtual int connect(void) { return DB_COMMAND_OK; }
+  virtual int connect(bool p_use_uri=false) { return DB_COMMAND_OK; }
   virtual int connectFull( const char *newDb, const char *newHost=NULL,
                       const char *newLogin=NULL, const char *newPasswd=NULL,const char *newPort=NULL);
   virtual void disconnect(void) { active = false; }

libsqlite/include/sqlitedataset/sqlitedataset.h

@@ -64,7 +64,7 @@ class SqliteDatabase: public Database {
   virtual const char *getErrorMsg();
 
 /* func. connects to database-server */
-  virtual int connect();
+  virtual int connect(bool p_use_uri=false);
 /* func. disconnects from database-server */
   virtual void disconnect();
 /* func. creates new database */

libsqlite/src/sqlitedataset.cpp

@@ -397,10 +397,14 @@ const char *SqliteDatabase::getErrorMsg() {
    return error.c_str();
 }
 
-int SqliteDatabase::connect()
+int SqliteDatabase::connect(bool p_use_uri)
 {
   disconnect();
-  int result = setErr(sqlite3_open(db.c_str(),&conn), NULL);
+  int result;
+  if (p_use_uri)
+    result = setErr(sqlite3_open_v2(db.c_str(),&conn, SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE | SQLITE_OPEN_URI, 0), NULL);
+  else
+    result = setErr(sqlite3_open(db.c_str(),&conn), NULL);
   if (!result)
   {
     char* err=NULL;