From 02e6a8b9ae3596ee1c405cdd1541c5cc59b50e3a Mon Sep 17 00:00:00 2001
From: Horus3
Date: Thu, 19 Feb 2015 13:30:54 +0100
Subject: Static file handling and autoimport the db-driver from Makefile.

---
 app/db.go | 21 +++++----------------
 1 file changed, 5 insertions(+), 16 deletions(-)

(limited to 'app/db.go')

diff --git a/app/db.go b/app/db.go
index dc9a15d..19a59f0 100644
--- a/app/db.go
+++ b/app/db.go
@@ -2,22 +2,13 @@ package main
 
 import (
 	"github.com/jinzhu/gorm"
-	_ "github.com/mattn/go-sqlite3"
 	"log"
 	"os"
 )
 
-//var Db gorm.DB
-var dbdriver = os.Getenv("STATUS_DB_DRIVER")
-var dbcred = os.Getenv("STATUS_DB_CREDENTIALS")
-var Db, dberr = gorm.Open(dbdriver, dbcred)
+var Db, dberr = gorm.Open(os.Getenv("STATUS_DB_DRIVER"), os.Getenv("STATUS_DB_CREDENTIALS"))
 
 func InitDB() {
-	/*
-		dbdriver := os.Getenv("STATUS_DB_DRIVER")
-		dbcred := os.Getenv("STATUS_DB_CREDENTIALS")
-		Db, err := gorm.Open(dbdriver, dbcred)
-	*/
 	if dberr != nil {
 		log.Panic(dberr)
 	}
@@ -26,15 +17,13 @@ func InitDB() {
 		log.Panic(err)
 	}
 
-	//	u := User{}
+	u := User{}
 	h := Host{}
-	//	Db.Debug().AutoMigrate(&u)
+	Db.Debug().AutoMigrate(&u)
 	db := Db
 	log.Println(db)
 	db.Debug().AutoMigrate(&h)
 
-	/*
-		Db.Model(&u).AddUniqueIndex("idx_user_name", "name")
-		Db.Model(&u).AddUniqueIndex("idx_user_email", "email")
-	*/
+	Db.Model(&u).AddUniqueIndex("idx_user_name", "name")
+	Db.Model(&u).AddUniqueIndex("idx_user_email", "email")
 }
-- 
cgit v1.2.3