From 4195a726212a7f019b2a42fef977d57b454d0ab2 Mon Sep 17 00:00:00 2001
From: shortcutme <tamas@zeronet.io>
Date: Wed, 21 Nov 2018 03:31:12 +0100
Subject: [PATCH] Only create default json table if it's not defined in
 dbschema

---
 src/Db/Db.py | 55 ++++++++++++++++++++++++++--------------------------
 1 file changed, 28 insertions(+), 27 deletions(-)

diff --git a/src/Db/Db.py b/src/Db/Db.py
index 3e40d003..186d45fe 100644
--- a/src/Db/Db.py
+++ b/src/Db/Db.py
@@ -180,33 +180,34 @@ class Db(object):
         if changed:
             changed_tables.append("keyvalue")
 
-        # Check json table
-        if self.schema["version"] == 1:
-            changed = cur.needTable("json", [
-                ["json_id", "INTEGER PRIMARY KEY AUTOINCREMENT"],
-                ["path", "VARCHAR(255)"]
-            ], [
-                "CREATE UNIQUE INDEX path ON json(path)"
-            ], version=self.schema["version"])
-        elif self.schema["version"] == 2:
-            changed = cur.needTable("json", [
-                ["json_id", "INTEGER PRIMARY KEY AUTOINCREMENT"],
-                ["directory", "VARCHAR(255)"],
-                ["file_name", "VARCHAR(255)"]
-            ], [
-                "CREATE UNIQUE INDEX path ON json(directory, file_name)"
-            ], version=self.schema["version"])
-        elif self.schema["version"] == 3:
-            changed = cur.needTable("json", [
-                ["json_id", "INTEGER PRIMARY KEY AUTOINCREMENT"],
-                ["site", "VARCHAR(255)"],
-                ["directory", "VARCHAR(255)"],
-                ["file_name", "VARCHAR(255)"]
-            ], [
-                "CREATE UNIQUE INDEX path ON json(directory, site, file_name)"
-            ], version=self.schema["version"])
-        if changed:
-            changed_tables.append("json")
+        # Create json table if no custom one defined
+        if "json" not in self.schema.get("tables", {}):
+            if self.schema["version"] == 1:
+                changed = cur.needTable("json", [
+                    ["json_id", "INTEGER PRIMARY KEY AUTOINCREMENT"],
+                    ["path", "VARCHAR(255)"]
+                ], [
+                    "CREATE UNIQUE INDEX path ON json(path)"
+                ], version=self.schema["version"])
+            elif self.schema["version"] == 2:
+                changed = cur.needTable("json", [
+                    ["json_id", "INTEGER PRIMARY KEY AUTOINCREMENT"],
+                    ["directory", "VARCHAR(255)"],
+                    ["file_name", "VARCHAR(255)"]
+                ], [
+                    "CREATE UNIQUE INDEX path ON json(directory, file_name)"
+                ], version=self.schema["version"])
+            elif self.schema["version"] == 3:
+                changed = cur.needTable("json", [
+                    ["json_id", "INTEGER PRIMARY KEY AUTOINCREMENT"],
+                    ["site", "VARCHAR(255)"],
+                    ["directory", "VARCHAR(255)"],
+                    ["file_name", "VARCHAR(255)"]
+                ], [
+                    "CREATE UNIQUE INDEX path ON json(directory, site, file_name)"
+                ], version=self.schema["version"])
+            if changed:
+                changed_tables.append("json")
 
         # Check schema tables
         for table_name, table_settings in self.schema.get("tables", {}).items():