From 082cf04f5d92bcc895586a9ca2addad88d62959e Mon Sep 17 00:00:00 2001
From: Relintai <relintai@protonmail.com>
Date: Sat, 5 Feb 2022 15:41:03 +0100
Subject: [PATCH] Renamed databases to database_modules.

---
 SConstruct                                                | 8 ++++++--
 {database => database_modules}/db_init.h                  | 0
 {database => database_modules}/mysql/SCsub                | 0
 {database => database_modules}/mysql/detect.py            | 0
 {database => database_modules}/mysql/mysql_database.cpp   | 0
 {database => database_modules}/mysql/mysql_database.h     | 0
 .../mysql/mysql_query_builder.cpp                         | 0
 .../mysql/mysql_query_builder.h                           | 0
 .../mysql/mysql_query_result.cpp                          | 0
 {database => database_modules}/mysql/mysql_query_result.h | 0
 .../mysql/mysql_table_builder.cpp                         | 0
 .../mysql/mysql_table_builder.h                           | 0
 {database => database_modules}/postgres/SCsub             | 0
 {database => database_modules}/postgres/detect.py         | 0
 .../postgres/pgsql_database.cpp                           | 0
 {database => database_modules}/postgres/pgsql_database.h  | 0
 {database => database_modules}/sqlite/SCsub               | 0
 {database => database_modules}/sqlite/detect.py           | 0
 {database => database_modules}/sqlite/sqlite/shell.c      | 0
 {database => database_modules}/sqlite/sqlite/sqlite3.c    | 0
 {database => database_modules}/sqlite/sqlite/sqlite3.def  | 0
 {database => database_modules}/sqlite/sqlite/sqlite3.h    | 0
 {database => database_modules}/sqlite/sqlite/sqlite3ext.h | 0
 .../sqlite/sqlite3_database.cpp                           | 0
 {database => database_modules}/sqlite/sqlite3_database.h  | 0
 .../sqlite/sqlite3_query_builder.cpp                      | 0
 .../sqlite/sqlite3_query_builder.h                        | 0
 .../sqlite/sqlite3_query_result.cpp                       | 0
 .../sqlite/sqlite3_query_result.h                         | 0
 .../sqlite/sqlite3_table_builder.cpp                      | 0
 .../sqlite/sqlite3_table_builder.h                        | 0
 31 files changed, 6 insertions(+), 2 deletions(-)
 rename {database => database_modules}/db_init.h (100%)
 rename {database => database_modules}/mysql/SCsub (100%)
 rename {database => database_modules}/mysql/detect.py (100%)
 rename {database => database_modules}/mysql/mysql_database.cpp (100%)
 rename {database => database_modules}/mysql/mysql_database.h (100%)
 rename {database => database_modules}/mysql/mysql_query_builder.cpp (100%)
 rename {database => database_modules}/mysql/mysql_query_builder.h (100%)
 rename {database => database_modules}/mysql/mysql_query_result.cpp (100%)
 rename {database => database_modules}/mysql/mysql_query_result.h (100%)
 rename {database => database_modules}/mysql/mysql_table_builder.cpp (100%)
 rename {database => database_modules}/mysql/mysql_table_builder.h (100%)
 rename {database => database_modules}/postgres/SCsub (100%)
 rename {database => database_modules}/postgres/detect.py (100%)
 rename {database => database_modules}/postgres/pgsql_database.cpp (100%)
 rename {database => database_modules}/postgres/pgsql_database.h (100%)
 rename {database => database_modules}/sqlite/SCsub (100%)
 rename {database => database_modules}/sqlite/detect.py (100%)
 rename {database => database_modules}/sqlite/sqlite/shell.c (100%)
 rename {database => database_modules}/sqlite/sqlite/sqlite3.c (100%)
 rename {database => database_modules}/sqlite/sqlite/sqlite3.def (100%)
 rename {database => database_modules}/sqlite/sqlite/sqlite3.h (100%)
 rename {database => database_modules}/sqlite/sqlite/sqlite3ext.h (100%)
 rename {database => database_modules}/sqlite/sqlite3_database.cpp (100%)
 rename {database => database_modules}/sqlite/sqlite3_database.h (100%)
 rename {database => database_modules}/sqlite/sqlite3_query_builder.cpp (100%)
 rename {database => database_modules}/sqlite/sqlite3_query_builder.h (100%)
 rename {database => database_modules}/sqlite/sqlite3_query_result.cpp (100%)
 rename {database => database_modules}/sqlite/sqlite3_query_result.h (100%)
 rename {database => database_modules}/sqlite/sqlite3_table_builder.cpp (100%)
 rename {database => database_modules}/sqlite/sqlite3_table_builder.h (100%)

diff --git a/SConstruct b/SConstruct
index e43e11d..5df2760 100644
--- a/SConstruct
+++ b/SConstruct
@@ -278,8 +278,10 @@ SConscript("web/SCsub")
 SConscript("platform/SCsub")
 
 if env_base["databases"]:
+    #add db folder
+
     for d in database_list:
-        tmppath = "./database/" + d
+        tmppath = "./database_modules/" + d
         sys.path.insert(0, tmppath)
 
         import detect
@@ -295,11 +297,13 @@ if env_base["databases"]:
 
         Export("env_db")
 
-        SConscript("database/" + d + "/SCsub")
+        SConscript("database_modules/" + d + "/SCsub")
 
         sys.path.remove(tmppath)
         sys.modules.pop("detect")
 
+        # Todo actually generate db_init
+
 for m in module_list:
     tmppath = m[1]
     sys.path.insert(0, tmppath)
diff --git a/database/db_init.h b/database_modules/db_init.h
similarity index 100%
rename from database/db_init.h
rename to database_modules/db_init.h
diff --git a/database/mysql/SCsub b/database_modules/mysql/SCsub
similarity index 100%
rename from database/mysql/SCsub
rename to database_modules/mysql/SCsub
diff --git a/database/mysql/detect.py b/database_modules/mysql/detect.py
similarity index 100%
rename from database/mysql/detect.py
rename to database_modules/mysql/detect.py
diff --git a/database/mysql/mysql_database.cpp b/database_modules/mysql/mysql_database.cpp
similarity index 100%
rename from database/mysql/mysql_database.cpp
rename to database_modules/mysql/mysql_database.cpp
diff --git a/database/mysql/mysql_database.h b/database_modules/mysql/mysql_database.h
similarity index 100%
rename from database/mysql/mysql_database.h
rename to database_modules/mysql/mysql_database.h
diff --git a/database/mysql/mysql_query_builder.cpp b/database_modules/mysql/mysql_query_builder.cpp
similarity index 100%
rename from database/mysql/mysql_query_builder.cpp
rename to database_modules/mysql/mysql_query_builder.cpp
diff --git a/database/mysql/mysql_query_builder.h b/database_modules/mysql/mysql_query_builder.h
similarity index 100%
rename from database/mysql/mysql_query_builder.h
rename to database_modules/mysql/mysql_query_builder.h
diff --git a/database/mysql/mysql_query_result.cpp b/database_modules/mysql/mysql_query_result.cpp
similarity index 100%
rename from database/mysql/mysql_query_result.cpp
rename to database_modules/mysql/mysql_query_result.cpp
diff --git a/database/mysql/mysql_query_result.h b/database_modules/mysql/mysql_query_result.h
similarity index 100%
rename from database/mysql/mysql_query_result.h
rename to database_modules/mysql/mysql_query_result.h
diff --git a/database/mysql/mysql_table_builder.cpp b/database_modules/mysql/mysql_table_builder.cpp
similarity index 100%
rename from database/mysql/mysql_table_builder.cpp
rename to database_modules/mysql/mysql_table_builder.cpp
diff --git a/database/mysql/mysql_table_builder.h b/database_modules/mysql/mysql_table_builder.h
similarity index 100%
rename from database/mysql/mysql_table_builder.h
rename to database_modules/mysql/mysql_table_builder.h
diff --git a/database/postgres/SCsub b/database_modules/postgres/SCsub
similarity index 100%
rename from database/postgres/SCsub
rename to database_modules/postgres/SCsub
diff --git a/database/postgres/detect.py b/database_modules/postgres/detect.py
similarity index 100%
rename from database/postgres/detect.py
rename to database_modules/postgres/detect.py
diff --git a/database/postgres/pgsql_database.cpp b/database_modules/postgres/pgsql_database.cpp
similarity index 100%
rename from database/postgres/pgsql_database.cpp
rename to database_modules/postgres/pgsql_database.cpp
diff --git a/database/postgres/pgsql_database.h b/database_modules/postgres/pgsql_database.h
similarity index 100%
rename from database/postgres/pgsql_database.h
rename to database_modules/postgres/pgsql_database.h
diff --git a/database/sqlite/SCsub b/database_modules/sqlite/SCsub
similarity index 100%
rename from database/sqlite/SCsub
rename to database_modules/sqlite/SCsub
diff --git a/database/sqlite/detect.py b/database_modules/sqlite/detect.py
similarity index 100%
rename from database/sqlite/detect.py
rename to database_modules/sqlite/detect.py
diff --git a/database/sqlite/sqlite/shell.c b/database_modules/sqlite/sqlite/shell.c
similarity index 100%
rename from database/sqlite/sqlite/shell.c
rename to database_modules/sqlite/sqlite/shell.c
diff --git a/database/sqlite/sqlite/sqlite3.c b/database_modules/sqlite/sqlite/sqlite3.c
similarity index 100%
rename from database/sqlite/sqlite/sqlite3.c
rename to database_modules/sqlite/sqlite/sqlite3.c
diff --git a/database/sqlite/sqlite/sqlite3.def b/database_modules/sqlite/sqlite/sqlite3.def
similarity index 100%
rename from database/sqlite/sqlite/sqlite3.def
rename to database_modules/sqlite/sqlite/sqlite3.def
diff --git a/database/sqlite/sqlite/sqlite3.h b/database_modules/sqlite/sqlite/sqlite3.h
similarity index 100%
rename from database/sqlite/sqlite/sqlite3.h
rename to database_modules/sqlite/sqlite/sqlite3.h
diff --git a/database/sqlite/sqlite/sqlite3ext.h b/database_modules/sqlite/sqlite/sqlite3ext.h
similarity index 100%
rename from database/sqlite/sqlite/sqlite3ext.h
rename to database_modules/sqlite/sqlite/sqlite3ext.h
diff --git a/database/sqlite/sqlite3_database.cpp b/database_modules/sqlite/sqlite3_database.cpp
similarity index 100%
rename from database/sqlite/sqlite3_database.cpp
rename to database_modules/sqlite/sqlite3_database.cpp
diff --git a/database/sqlite/sqlite3_database.h b/database_modules/sqlite/sqlite3_database.h
similarity index 100%
rename from database/sqlite/sqlite3_database.h
rename to database_modules/sqlite/sqlite3_database.h
diff --git a/database/sqlite/sqlite3_query_builder.cpp b/database_modules/sqlite/sqlite3_query_builder.cpp
similarity index 100%
rename from database/sqlite/sqlite3_query_builder.cpp
rename to database_modules/sqlite/sqlite3_query_builder.cpp
diff --git a/database/sqlite/sqlite3_query_builder.h b/database_modules/sqlite/sqlite3_query_builder.h
similarity index 100%
rename from database/sqlite/sqlite3_query_builder.h
rename to database_modules/sqlite/sqlite3_query_builder.h
diff --git a/database/sqlite/sqlite3_query_result.cpp b/database_modules/sqlite/sqlite3_query_result.cpp
similarity index 100%
rename from database/sqlite/sqlite3_query_result.cpp
rename to database_modules/sqlite/sqlite3_query_result.cpp
diff --git a/database/sqlite/sqlite3_query_result.h b/database_modules/sqlite/sqlite3_query_result.h
similarity index 100%
rename from database/sqlite/sqlite3_query_result.h
rename to database_modules/sqlite/sqlite3_query_result.h
diff --git a/database/sqlite/sqlite3_table_builder.cpp b/database_modules/sqlite/sqlite3_table_builder.cpp
similarity index 100%
rename from database/sqlite/sqlite3_table_builder.cpp
rename to database_modules/sqlite/sqlite3_table_builder.cpp
diff --git a/database/sqlite/sqlite3_table_builder.h b/database_modules/sqlite/sqlite3_table_builder.h
similarity index 100%
rename from database/sqlite/sqlite3_table_builder.h
rename to database_modules/sqlite/sqlite3_table_builder.h