add sqlite.init.sql for running pragma on database

JumpMind · Dec 8, 2015 · eca72a1 · eca72a1
1 parent 833f6e6
commit eca72a1
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 2 deletions.
diff --git a/symmetric-client-clib/inc/common/ParameterConstants.h b/symmetric-client-clib/inc/common/ParameterConstants.h
@@ -94,5 +94,6 @@
 #define SYM_PARAMETER_HTTPS_ALLOW_SELF_SIGNED_CERTS "https.allow.self.signed.certs"
 
 #define SYM_PARAMETER_SQLITE_BUSY_TIMEOUT_MS "sqlite.busy.timeout.ms"
+#define SYM_PARAMETER_SQLITE_INIT_SQL "sqlite.init.sql"
 
 #endif
diff --git a/symmetric-client-clib/inc/db/platform/sqlite/SqlitePlatform.h b/symmetric-client-clib/inc/db/platform/sqlite/SqlitePlatform.h
@@ -27,6 +27,7 @@
 #include "db/platform/DatabasePlatform.h"
 #include "db/platform/sqlite/SqliteDdlReader.h"
 #include "db/sqlite/SqliteSqlTemplate.h"
+#include "util/StringArray.h"
 
 #define SYM_SQLITE_DEFAULT_BUSY_TIMEOUT_MS "30000"
 

diff --git a/symmetric-client-clib/inc/model/Node.h b/symmetric-client-clib/inc/model/Node.h
@@ -23,7 +23,7 @@
 
 #include <stdlib.h>
 
-#define SYM_VERSION "3.7.27"
+#define SYM_VERSION "3.7.27.1"
 
 typedef enum SymNodeStatus {
     SYM_NODE_STATUS_DATA_LOAD_NOT_STARTED,

diff --git a/symmetric-client-clib/src/db/platform/sqlite/SqlitePlatform.c b/symmetric-client-clib/src/db/platform/sqlite/SqlitePlatform.c
@@ -49,7 +49,7 @@ SymSqliteSqlTemplate * SymSqlitePlatform_getSqlTemplate(SymSqlitePlatform *this)
 void SymSqlitePlatform_destroy(SymDatabasePlatform *super) {
 	SymLog_info("Closing SQLite database");
     SymSqlitePlatform *this = (SymSqlitePlatform *) super;
-//    sqlite3_close(this->db);
+    sqlite3_close(this->db);
     this->sqlTemplate->destroy(this->sqlTemplate);
 //	  free(super->ddlReader);
     free(this);
@@ -94,5 +94,18 @@ SymSqlitePlatform * SymSqlitePlatform_new(SymSqlitePlatform *this, SymProperties
 
     SymLog_info("Detected database '%s', version '%s'", super->name, super->version);
 
+    char *initSql = properties->get(properties, SYM_PARAMETER_SQLITE_INIT_SQL, NULL);
+    if (SymStringUtils_isNotBlank(initSql)) {
+        int error, i;
+        SymLog_debug("Initializing database with '%s'", initSql);
+        SymStringArray *array = SymStringArray_split(initSql, ";");
+        for (i = 0; i < array->size; i++) {
+            char *sql = array->get(array, i);
+            if (SymStringUtils_isNotBlank(sql)) {
+                this->sqlTemplate->update(this->sqlTemplate, sql, NULL, NULL, &error);
+            }
+        }
+    }
+
     return this;
 }