diff --git a/database/initialize.go b/database/initialize.go index 8aba4b6..443b521 100644 --- a/database/initialize.go +++ b/database/initialize.go @@ -2,10 +2,16 @@ package database import "go-admin/tools/config" + func Setup() { dbType := config.DatabaseConfig.Dbtype if dbType == "mysql" { var db = new(Mysql) db.Setup() } + + if dbType == "sqlite" { + var db = new(SqLite) + db.Setup() + } } diff --git a/database/pgsql.go b/database/pgsql.go new file mode 100644 index 0000000..3c6d4e1 --- /dev/null +++ b/database/pgsql.go @@ -0,0 +1,44 @@ +package database + +import ( + "github.com/jinzhu/gorm" + _ "github.com/jinzhu/gorm/dialects/sqlite" + log "github.com/sirupsen/logrus" + "go-admin/global/orm" +) + +type PgSql struct { +} + +func (*PgSql) Open(dbType string, conn string) (db *gorm.DB, err error) { + eloquent, err := gorm.Open(dbType, conn) + return eloquent, err +} + +func (e *PgSql) GetConnect() string { + + return "" +} + +func (e *PgSql) Setup() { + + var err error + var db Database + + db = new(PgSql) + orm.PgSqlConn = db.GetConnect() + log.Info(orm.PgSqlConn) + orm.Eloquent, err = db.Open(DbType, orm.PgSqlConn) + + if err != nil { + log.Fatalf("%s connect error %v", DbType, err) + } else { + log.Printf("%s connect success!", DbType) + } + + if orm.Eloquent.Error != nil { + log.Fatalf("database error %v", orm.Eloquent.Error) + } + + orm.Eloquent.LogMode(true) +} \ No newline at end of file diff --git a/database/sqlite3.go b/database/sqlite3.go index af3e968..bc3781e 100644 --- a/database/sqlite3.go +++ b/database/sqlite3.go @@ -1,15 +1,44 @@ -// +build sqlite3 - package database import ( + "github.com/jinzhu/gorm" _ "github.com/jinzhu/gorm/dialects/sqlite" + log "github.com/sirupsen/logrus" + "go-admin/global/orm" ) -type SqlLite struct { +type SqLite struct { } -func (*SqlLite) Open(dbType string, conn string) (db *gorm.DB, err error) { +func (*SqLite) Open(dbType string, conn string) (db *gorm.DB, err error) { eloquent, err := gorm.Open(dbType, conn) return eloquent, err } + +func (e *SqLite) GetConnect() string { + + return "" +} + +func (e *SqLite) Setup() { + + var err error + var db Database + + db = new(SqLite) + orm.SqLiteConn = db.GetConnect() + log.Info(orm.SqLiteConn) + orm.Eloquent, err = db.Open(DbType, orm.SqLiteConn) + + if err != nil { + log.Fatalf("%s connect error %v", DbType, err) + } else { + log.Printf("%s connect success!", DbType) + } + + if orm.Eloquent.Error != nil { + log.Fatalf("database error %v", orm.Eloquent.Error) + } + + orm.Eloquent.LogMode(true) +} \ No newline at end of file diff --git a/global/orm/gorm.go b/global/orm/gorm.go index e4158fe..2428a65 100644 --- a/global/orm/gorm.go +++ b/global/orm/gorm.go @@ -6,4 +6,5 @@ import ( var Eloquent *gorm.DB var MysqlConn string - +var SqLiteConn string +var PgSqlConn string diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000..48e341a --- /dev/null +++ b/package-lock.json @@ -0,0 +1,3 @@ +{ + "lockfileVersion": 1 +} diff --git a/sqlite3.db b/sqlite3.db index 9781991..e94506a 100644 Binary files a/sqlite3.db and b/sqlite3.db differ