summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStelios Fragkakis <52996999+stelfrag@users.noreply.github.com>2022-07-18 11:27:47 +0300
committerStelios Fragkakis <52996999+stelfrag@users.noreply.github.com>2022-07-18 11:27:47 +0300
commit4b4b974ff55343f44dc9b0e3baa9cef2986f2821 (patch)
tree5ce15da8636b905cea6c3cf3ed1236b9c9207a40
parenta64302ec4269f09d0480061de1113c65b30ae1fa (diff)
Fix to handle host constrains better
-rw-r--r--database/sqlite/sqlite_db_migration.c2
-rw-r--r--database/sqlite/sqlite_functions.c12
2 files changed, 8 insertions, 6 deletions
diff --git a/database/sqlite/sqlite_db_migration.c b/database/sqlite/sqlite_db_migration.c
index 196e5a875e..3582a843e6 100644
--- a/database/sqlite/sqlite_db_migration.c
+++ b/database/sqlite/sqlite_db_migration.c
@@ -36,7 +36,7 @@ const char *database_migrate_v1_v2[] = {
const char *database_migrate_v2_v3[] = {
"ALTER TABLE host ADD memory_mode INT NOT NULL DEFAULT 0;",
- "ALTER TABLE host ADD abbrev_timezone TEXT NOT NULL DEFAULT 'unknown';",
+ "ALTER TABLE host ADD abbrev_timezone TEXT NOT NULL DEFAULT '';",
"ALTER TABLE host ADD utc_offset INT NOT NULL DEFAULT 0;",
"ALTER TABLE host ADD program_name TEXT NOT NULL DEFAULT 'unknown';",
"ALTER TABLE host ADD program_version TEXT NOT NULL DEFAULT 'unknown';",
diff --git a/database/sqlite/sqlite_functions.c b/database/sqlite/sqlite_functions.c
index f100a393cc..130663524e 100644
--- a/database/sqlite/sqlite_functions.c
+++ b/database/sqlite/sqlite_functions.c
@@ -7,11 +7,13 @@
const char *database_config[] = {
"CREATE TABLE IF NOT EXISTS host(host_id BLOB PRIMARY KEY, hostname TEXT NOT NULL, "
- "registry_hostname TEXT NOT NULL, update_every INT NOT NULL, "
- "os TEXT NOT NULL, timezone TEXT NOT NULL, tags TEXT NOT NULL, hops INT NOT NULL,"
- "memory_mode INT, abbrev_timezone TEXT, utc_offset INT NOT NULL, "
- "program_name TEXT NOT NULL, program_version TEXT NOT NULL, entries INT,"
- "health_enabled INT NOT NULL);",
+ "registry_hostname TEXT NOT NULL default 'unknown', update_every INT NOT NULL default 1, "
+ "os TEXT NOT NULL default 'unknown', timezone TEXT NOT NULL default 'unknown', tags TEXT NOT NULL default '',"
+ "hops INT NOT NULL DEFAULT 0,"
+ "memory_mode INT DEFAULT 0, abbrev_timezone TEXT DEFAULT '', utc_offset INT NOT NULL DEFAULT 0,"
+ "program_name TEXT NOT NULL DEFAULT 'unknown', program_version TEXT NOT NULL DEFAULT 'unknown', "
+ "entries INT NOT NULL DEFAULT 0,"
+ "health_enabled INT NOT NULL DEFAULT 0);",
"CREATE TABLE IF NOT EXISTS chart(chart_id blob PRIMARY KEY, host_id blob, type text, id text, name text, "
"family text, context text, title text, unit text, plugin text, module text, priority int, update_every int, "