Make it easier to add other storage systems

blue-jay/blueprint#45
blue-jay/blueprint#46

Core database files moved to: https://github.com/blue-jay/core

bootstrap/bootstrap.go

@@ -11,7 +11,6 @@ import (
 	"github.com/blue-jay/blueprint/controller"
 	"github.com/blue-jay/blueprint/controller/status"
 	"github.com/blue-jay/blueprint/lib/asset"
-	"github.com/blue-jay/blueprint/lib/database"
 	"github.com/blue-jay/blueprint/lib/email"
 	"github.com/blue-jay/blueprint/lib/flash"
 	"github.com/blue-jay/blueprint/lib/form"
@@ -29,6 +28,7 @@ import (
 	"github.com/blue-jay/blueprint/viewmodify/authlevel"
 	"github.com/blue-jay/blueprint/viewmodify/uri"
 
+	"github.com/blue-jay/core/storage/driver/mysql"
 	"github.com/gorilla/context"
 	"github.com/gorilla/csrf"
 )
@@ -40,12 +40,14 @@ import (
 // Info contains the application settings.
 type Info struct {
 	Asset    asset.Info    `json:"Asset"`
-	Database database.Info `json:"Database"`
 	Email    email.Info    `json:"Email"`
+	Form     form.Info     `json:"Form"`
+	MySQL    mysql.Info    `json:"MySQL"`
 	Server   server.Info   `json:"Server"`
 	Session  session.Info  `json:"Session"`
 	Template view.Template `json:"Template"`
 	View     view.Info     `json:"View"`
+	Path     string
 }
 
 // ParseJSON unmarshals bytes to structs
@@ -74,6 +76,9 @@ func LoadConfig(configFile string) *Info {
 	// Load the configuration file
 	jsonconfig.LoadOrFatal(configFile, config)
 
+	// Store the path of the file
+	config.Path = configFile
+
 	// Return the configuration
 	return config
 }
@@ -90,10 +95,11 @@ func RegisterServices(config *Info) {
 	})
 
 	// Connect to database
-	database.Connect(config.Database, true)
+	mysql.SetConfig(config.MySQL)
+	mysql.Connect(true)
 
 	// Configure form handling
-	form.SetConfig(form.Info{config.Database.FileStorage})
+	form.SetConfig(config.Form)
 
 	// Load the controller routes
 	controller.LoadRoutes()

database/mysql/20160630_020000.000000_init.down.sql

@@ -0,0 +1,11 @@
+# ******************************************************************************
+# Settings
+# ******************************************************************************
+SET foreign_key_checks = 0;
+
+# ******************************************************************************
+# Remove tables
+# ******************************************************************************
+DROP TABLE IF EXISTS user;
+DROP TABLE IF EXISTS user_status;
+DROP TABLE IF EXISTS note;

database/migration/20160630_020000.000000_init.up.sql → database/mysql/20160630_020000.000000_init.up.sql

@@ -1,18 +1,18 @@
-/* *****************************************************************************
-// Settings
-// ****************************************************************************/
+# ******************************************************************************
+# Settings
+# ******************************************************************************
 SET foreign_key_checks = 1;
 SET time_zone = '+00:00';
 
-/* *****************************************************************************
-// Create new tables
-// ****************************************************************************/
+# ******************************************************************************
+# Create new tables
+# ******************************************************************************
 # CREATE DATABASE IF NOT EXISTS blueprint DEFAULT CHARSET = utf8mb4 COLLATE = utf8mb4_unicode_ci;
 # USE blueprint;
 
-/* *****************************************************************************
-// Create tables
-// ****************************************************************************/
+# ******************************************************************************
+# Create tables
+# ******************************************************************************
 CREATE TABLE user_status (
     id INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
 

env.json.example

@@ -2,27 +2,28 @@
   "Asset":{
     "Folder":"asset"
   },
-  "Database":{
-    "FileStorage":"database/filestorage",
-    "Type":"MySQL",
-    "MySQL":{  
-      "Username":"root",
-      "Password":"",
-      "Database":"blueprint",
-      "Charset":"utf8mb4",
-      "Collation":"utf8mb4_unicode_ci",
-      "Hostname":"127.0.0.1",
-      "Port":3306,
-      "Parameter":"parseTime=true"
-    }
-  },
   "Email":{
     "Username":"",
     "Password":"",
     "Hostname":"",
     "Port":25,
     "From":""
   },
+  "Form":{
+    "FileStorageFolder":"database/filestorage"
+  },
+  "MySQL":{  
+    "Username":"root",
+    "Password":"",
+    "Database":"blueprint",
+    "Charset":"utf8mb4",
+    "Collation":"utf8mb4_unicode_ci",
+    "Hostname":"127.0.0.1",
+    "Port":3306,
+    "Parameter":"parseTime=true",
+    "MigrationFolder":"database/mysql",
+    "Extension":"sql"
+  },
   "Server":{
     "Hostname":"",
     "UseHTTP":true,

generate/model/default.gen

@@ -5,8 +5,8 @@ import (
 	"database/sql"
 	"fmt"
 
-	"github.com/blue-jay/blueprint/lib/database"
 	"github.com/blue-jay/blueprint/model"
+	database "github.com/blue-jay/storage/driver/mysql"
 	"github.com/go-sql-driver/mysql"
 )
 

lib/form/form.go

@@ -29,7 +29,7 @@ var (
 
 // Info holds the details for the form handling.
 type Info struct {
-	FileStorage string
+	FileStorageFolder string `json:"FileStorageFolder"`
 }
 
 // SetConfig stores the config.
@@ -90,7 +90,7 @@ func UploadFile(r *http.Request, name string, maxSize int64) (string, string, er
 		return "", "", err
 	}
 
-	f, err := os.OpenFile(filepath.Join(Config().FileStorage, fileID), os.O_WRONLY|os.O_CREATE, 0644)
+	f, err := os.OpenFile(filepath.Join(Config().FileStorageFolder, fileID), os.O_WRONLY|os.O_CREATE, 0644)
 	if err != nil {
 		return "", "", err
 	}

model/note/note.go

@@ -5,8 +5,9 @@ import (
 	"database/sql"
 	"fmt"
 
-	"github.com/blue-jay/blueprint/lib/database"
 	"github.com/blue-jay/blueprint/model"
+
+	database "github.com/blue-jay/core/storage/driver/mysql"
 	"github.com/go-sql-driver/mysql"
 )