mirror of
https://github.com/chaisql/chai.git
synced 2025-09-27 03:55:59 +08:00
Move sql/driver package to the genji package
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
package driver
|
||||
package genji
|
||||
|
||||
import (
|
||||
"context"
|
||||
@@ -9,25 +9,25 @@ import (
|
||||
|
||||
"github.com/asdine/genji/database"
|
||||
"github.com/asdine/genji/query"
|
||||
"github.com/asdine/genji/sql/parser"
|
||||
"github.com/asdine/genji/record"
|
||||
"github.com/asdine/genji/sql/parser"
|
||||
)
|
||||
|
||||
type Connector struct {
|
||||
type connector struct {
|
||||
driver driver.Driver
|
||||
}
|
||||
|
||||
func NewConnector(db *database.DB) driver.Connector {
|
||||
return Connector{
|
||||
func newConnector(db *database.DB) driver.Connector {
|
||||
return connector{
|
||||
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("")
|
||||
}
|
||||
|
||||
func (c Connector) Driver() driver.Driver {
|
||||
func (c connector) Driver() driver.Driver {
|
||||
return c.driver
|
||||
}
|
||||
|
@@ -1,4 +1,4 @@
|
||||
package driver
|
||||
package genji
|
||||
|
||||
import (
|
||||
"context"
|
||||
@@ -68,7 +68,7 @@ func TestDriver(t *testing.T) {
|
||||
require.NoError(t, err)
|
||||
defer db.Close()
|
||||
|
||||
dbx := sql.OpenDB(NewConnector(db))
|
||||
dbx := sql.OpenDB(newConnector(db))
|
||||
|
||||
res, err := dbx.Exec("CREATE TABLE test")
|
||||
require.NoError(t, err)
|
@@ -28,6 +28,11 @@ func Example() {
|
||||
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)
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
|
3
genji.go
3
genji.go
@@ -5,7 +5,6 @@ import (
|
||||
|
||||
"github.com/asdine/genji/database"
|
||||
"github.com/asdine/genji/engine"
|
||||
"github.com/asdine/genji/sql/driver"
|
||||
)
|
||||
|
||||
func Open(ng engine.Engine) (*sql.DB, error) {
|
||||
@@ -14,5 +13,5 @@ func Open(ng engine.Engine) (*sql.DB, error) {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return sql.OpenDB(driver.NewConnector(db)), nil
|
||||
return sql.OpenDB(newConnector(db)), nil
|
||||
}
|
||||
|
Reference in New Issue
Block a user