From 15e7a9b8a852ba2a5970a76820f14fce9c40bf65 Mon Sep 17 00:00:00 2001 From: wxkj Date: Wed, 8 Aug 2018 13:37:08 +0800 Subject: [PATCH] update --- g/database/gdb/gdb.go | 7 +++---- g/database/gdb/gdb_sqlite.go | 11 +++++------ 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/g/database/gdb/gdb.go b/g/database/gdb/gdb.go index 964741a97..9c33cddb4 100644 --- a/g/database/gdb/gdb.go +++ b/g/database/gdb/gdb.go @@ -11,8 +11,6 @@ import ( "database/sql" "errors" "fmt" - "time" - "gitee.com/johng/gf/g/container/gmap" "gitee.com/johng/gf/g/container/gring" "gitee.com/johng/gf/g/container/gtype" @@ -20,6 +18,7 @@ import ( "gitee.com/johng/gf/g/util/grand" _ "github.com/go-sql-driver/mysql" _ "github.com/lib/pq" + "time" ) const ( @@ -128,8 +127,8 @@ var linkMysql = &dbmysql{} // PostgreSQL接口对象 var linkPgsql = &dbpgsql{} -//Sqlite接口对象 -//@author wxkj +// Sqlite接口对象 +//@author wxkj var linkSqlite = &dbsqlite{} // 数据库查询缓存对象map,使用数据库连接名称作为键名,键值为查询缓存对象 diff --git a/g/database/gdb/gdb_sqlite.go b/g/database/gdb/gdb_sqlite.go index def1a5f5e..443f2ea27 100644 --- a/g/database/gdb/gdb_sqlite.go +++ b/g/database/gdb/gdb_sqlite.go @@ -9,7 +9,6 @@ package gdb import ( "database/sql" - "os" ) // 数据库链接对象 @@ -22,12 +21,12 @@ func (db *dbsqlite) Open(c *ConfigNode) (*sql.DB, error) { if c.Linkinfo != "" { source = c.Linkinfo } else { - path, err := os.Getwd() - if err != nil { - return nil, err - } + //path, err := os.Getwd() + //if err != nil { + // return nil, err + //} //先这样吧 - source = path + c.Host + c.Name + source = c.Name } if db, err := sql.Open("sqlite3", source); err == nil { return db, nil