zishuo/chaisql
1
0
Fork 0
mirror of https://github.com/chaisql/chai.git synced 2025-09-27 12:02:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Move sql/driver package to the genji package

Browse Source
This commit is contained in:
Asdine El Hrychy
2019-10-06 21:49:08 +02:00
parent 717b95c3fe
commit 71229c602c
4 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
sql/driver/driver.go → driver.go
View File

@@ -1,4 +1,4 @@
package driver package genji
import ( import (
"context" "context"
@@ -9,25 +9,25 @@ import (
"github.com/asdine/genji/database" "github.com/asdine/genji/database"
"github.com/asdine/genji/query" "github.com/asdine/genji/query"
"github.com/asdine/genji/sql/parser"
"github.com/asdine/genji/record" "github.com/asdine/genji/record"
"github.com/asdine/genji/sql/parser"
) )
type Connector struct { type connector struct {
driver driver.Driver driver driver.Driver
} }
func NewConnector(db *database.DB) driver.Connector { func newConnector(db *database.DB) driver.Connector {
return Connector{ return connector{
driver: newDriver(db), driver: newDriver(db),
} }
} }
func (c Connector) Connect(ctx context.Context) (driver.Conn, error) { func (c connector) Connect(ctx context.Context) (driver.Conn, error) {
return c.driver.Open("") return c.driver.Open("")
} }
func (c Connector) Driver() driver.Driver { func (c connector) Driver() driver.Driver {
return c.driver return c.driver
} }

4
sql/driver/driver_test.go → driver_test.go
View File

@@ -1,4 +1,4 @@
package driver package genji
import ( import (
"context" "context"
@@ -68,7 +68,7 @@ func TestDriver(t *testing.T) {
require.NoError(t, err) require.NoError(t, err)
defer db.Close() defer db.Close()
dbx := sql.OpenDB(NewConnector(db)) dbx := sql.OpenDB(newConnector(db))
res, err := dbx.Exec("CREATE TABLE test") res, err := dbx.Exec("CREATE TABLE test")
require.NoError(t, err) require.NoError(t, err)

5
example_test.go
View File

@@ -28,6 +28,11 @@ func Example() {
log.Fatal(err) log.Fatal(err)
} }
_, err = db.Exec("CREATE INDEX IF NOT EXISTS idx_user_Name ON user (Name)")
if err != nil {
log.Fatal(err)
}
_, err = db.Exec("INSERT INTO user (ID, Name, Age) VALUES (?, ?, ?)", 10, "foo", 15) _, err = db.Exec("INSERT INTO user (ID, Name, Age) VALUES (?, ?, ?)", 10, "foo", 15)
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)

3
genji.go
View File

@@ -5,7 +5,6 @@ import (
"github.com/asdine/genji/database" "github.com/asdine/genji/database"
"github.com/asdine/genji/engine" "github.com/asdine/genji/engine"
"github.com/asdine/genji/sql/driver"
) )
func Open(ng engine.Engine) (*sql.DB, error) { func Open(ng engine.Engine) (*sql.DB, error) {
@@ -14,5 +13,5 @@ func Open(ng engine.Engine) (*sql.DB, error) {
return nil, err return nil, err
} }
return sql.OpenDB(driver.NewConnector(db)), nil return sql.OpenDB(newConnector(db)), nil
} }