Merge branch 'feature/add-indexes-to-json'

Author: 2shady4u

demo/database.gd

@@ -144,6 +144,31 @@ func example_of_basic_database_querying():
 	db.query("PRAGMA encoding;")
 	cprint("Current database encoding is: {0}".format([db.query_result[0]["encoding"]]))
 
+	# Create a TRIGGER and trigger it!
+	db.query("CREATE TRIGGER increase_salary_after_employee_termination AFTER DELETE ON " + table_name + " BEGIN UPDATE " + table_name + " SET salary = salary + 100;END;")
+
+	db.select_rows(table_name, "", ["name", "salary"])
+	cprint("employees: {0}".format([str(db.query_result_by_reference)]))
+
+	cprint("Firing that slacker Paul!")
+	db.delete_rows(table_name, "name = 'Paul'")
+
+	db.select_rows(table_name, "", ["name", "salary"])
+	cprint("employees: {0}".format([str(db.query_result_by_reference)]))
+
+	# Create a VIEW and use it!
+	db.query("CREATE VIEW cheapest_employee AS SELECT id, name FROM " + table_name + " WHERE salary = (SELECT MIN(salary) FROM company) LIMIT 1;")
+
+	# Fire the cheapest employee!
+	cprint("Firing the cheapest employee!")
+	db.delete_rows(table_name, "id = (SELECT id FROM cheapest_employee)")
+
+	db.select_rows(table_name, "", ["name", "salary"])
+	cprint("employees: {0}".format([str(db.query_result_by_reference)]))
+
+	# Create an INDEX!
+	db.query("CREATE INDEX idx_name ON " + table_name + "(name);")
+
 	# Export the table to a json-file with a specified name
 	db.export_to_json(json_name + "_new")
 
@@ -169,6 +194,9 @@ func example_of_basic_database_querying():
 	cprint("Overwriting database content again with latest backup...")
 	db.import_from_json(json_name + "_new")
 
+	db.query("SELECT * FROM sqlite_master;")
+	cprint(str(db.query_result_by_reference))
+
 	# Try to delete a non-existant table from the database.
 	if not db.delete_rows(other_table_name, "*"):
 		cprint("SQL error: " + db.error_message)

src/gdsqlite.cpp

@@ -816,7 +816,7 @@ bool SQLite::import_from_json(String import_path) {
 	/* Open the json-file and stream its content into a stringstream */
 	std::ifstream ifs(char_path);
 	if (ifs.fail()) {
-		UtilityFunctions::printerr("GDSQLite Error: Failed to open specified json-file (" + import_path + ")");
+		UtilityFunctions::printerr("GDSQLite Error: " + String(std::strerror(errno)) + " (" + import_path + ")");
 		return false;
 	}
 	std::stringstream buffer;
@@ -849,19 +849,32 @@ bool SQLite::import_from_json(String import_path) {
 		}
 	}
 
+	/* Find all views that are present in this database */
+	query(String("SELECT name FROM sqlite_master WHERE type = 'view';"));
+	TypedArray<Dictionary> old_view_array = query_result.duplicate(true);
+	int64_t old_number_of_views = old_view_array.size();
+	/* Drop all old views present in the database */
+	for (int64_t i = 0; i <= old_number_of_views - 1; i++) {
+		Dictionary view_dict = old_view_array[i];
+		String view_name = view_dict["name"];
+		String query_string = "DROP VIEW " + view_name + ";";
+
+		query(query_string);
+	}
+
 	/* Find all tables that are present in this database */
-	/* We don't care about triggers here since they get dropped automatically when their table is dropped */
+	/* We don't care about indexes or triggers here since they get dropped automatically when their table is dropped */
 	query(String("SELECT name FROM sqlite_master WHERE type = 'table';"));
-	TypedArray<Dictionary> old_database_array = query_result.duplicate(true);
+	TypedArray<Dictionary> old_table_array = query_result.duplicate(true);
 #ifdef SQLITE_ENABLE_FTS5
 	/* FTS5 creates a bunch of shadow tables that cannot be dropped manually! */
 	/* The virtual table is responsible for dropping these tables itself */
-	remove_shadow_tables(old_database_array);
+	remove_shadow_tables(old_table_array);
 #endif
-	int64_t old_number_of_tables = old_database_array.size();
+	int64_t old_number_of_tables = old_table_array.size();
 	/* Drop all old tables present in the database */
 	for (int64_t i = 0; i <= old_number_of_tables - 1; i++) {
-		Dictionary table_dict = old_database_array[i];
+		Dictionary table_dict = old_table_array[i];
 		String table_name = table_dict["name"];
 
 		drop_table(table_name);
@@ -883,7 +896,7 @@ bool SQLite::import_from_json(String import_path) {
 
 	for (auto object : objects_to_import) {
 		if (object.type != TABLE) {
-			/* The object is a trigger and doesn't have any rows! */
+			/* The object is an index, view or trigger and doesn't have any rows! */
 			continue;
 		}
 
@@ -923,7 +936,7 @@ bool SQLite::import_from_json(String import_path) {
 
 bool SQLite::export_to_json(String export_path) {
 	/* Get all names and sql templates for all tables present in the database */
-	query(String("SELECT name,sql,type FROM sqlite_master WHERE type = 'table' OR type = 'trigger';"));
+	query(String("SELECT name,sql,type FROM sqlite_master;"));
 	TypedArray<Dictionary> database_array = query_result.duplicate(true);
 #ifdef SQLITE_ENABLE_FTS5
 	/* FTS5 creates a bunch of shadow tables that should NOT be exported! */
@@ -989,7 +1002,7 @@ bool SQLite::export_to_json(String export_path) {
 
 	std::ofstream ofs(char_path, std::ios::trunc);
 	if (ofs.fail()) {
-		UtilityFunctions::printerr("GDSQLite Error: Can't open specified json-file, file does not exist or is locked");
+		UtilityFunctions::printerr("GDSQLite Error: " + String(std::strerror(errno)) + " (" + export_path + ")");
 		return false;
 	}
 	Ref<JSON> json;
@@ -1047,11 +1060,15 @@ bool SQLite::validate_json(const Array &database_array, std::vector<object_struc
 				return false;
 			}
 			new_object.row_array = temp_dict["row_array"];
+		} else if (temp_dict["type"] == String("index")) {
+			new_object.type = INDEX;
+		} else if (temp_dict["type"] == String("view")) {
+			new_object.type = TRIGGER;
 		} else if (temp_dict["type"] == String("trigger")) {
 			new_object.type = TRIGGER;
 		} else {
 			/* Did not find the necessary key! */
-			UtilityFunctions::printerr("GDSQlite Error: The value of key \"type\" is restricted to either \"table\" or \"trigger\"");
+			UtilityFunctions::printerr("GDSQlite Error: The value of key \"type\" is restricted to \"table\", \"index\", \"view\" or \"trigger\"");
 			return false;
 		}
 

src/gdsqlite.h

@@ -22,6 +22,8 @@
 namespace godot {
 enum OBJECT_TYPE {
 	TABLE,
+	INDEX,
+	VIEW,
 	TRIGGER
 };
 struct object_struct {