Database: db_init & db_models stuff

src/app.rb

@@ -14,15 +14,11 @@ require_relative "debug.rb"
 require_relative "lib/database.rb"
 require_relative "func.rb"
 
+require_relative "db_init.rb"
 require_relative "db_models.rb"
 
-load_tables = [
-	"User",
-	"Role"
-]
-db = Database.new("main", load_tables)
-
 enable :sessions
+db = db_init
 
 def init_params(params={})
 	g = Hash.new ""

src/db_init.rb

@@ -0,0 +1,8 @@
+LOAD_TABLES = [
+	"User",
+	"Role"
+]
+
+def db_init
+	db = Database.new("main", LOAD_TABLES)
+end

src/db_models.rb

@@ -30,7 +30,8 @@ class User < Table
 					pw_hash: pw_hash
 				}
 
-				self.insert(@name, data) # insert into the db
+				resp = self.insert(@name, data) # insert into the db
+				return true, resp
 			else
 				return false, "Password mismatch!"
 			end

src/lib/database.rb

@@ -8,9 +8,7 @@ class Table
 		@db = db
 		@name = name
 		@sql_file = "sql/tables/#{name}.sql"
-	end
 
-	def create_table
 		begin
 			q = File.read @sql_file # get SQL script
 			@db.query q # run query

src/sql/tables/Role.sql

@@ -1,4 +1,4 @@
-CREATE TABLE "Role" (
+CREATE TABLE IF NOT EXISTS "Role" (
 	"id"	INTEGER NOT NULL UNIQUE,
 	"name"	TEXT NOT NULL,
 	"color"	INTEGER NOT NULL DEFAULT 16777215,

src/sql/tables/User.sql

@@ -1,4 +1,4 @@
-CREATE TABLE "User" (
+CREATE TABLE IF NOT EXISTS "User" (
 	"id"			INTEGER NOT NULL UNIQUE,
 	"email"			TEXT NOT NULL UNIQUE,
 	"pw_hash"		TEXT NOT NULL UNIQUE,