Merge pull request #12 from OGKevin/patch-1

hsluoyz · web-flow · commit 8e63783e2864 · 2019-03-19T07:53:44.000+08:00
Fix sqlite3 compatibility.
diff --git a/adapter.go b/adapter.go
@@ -94,7 +94,7 @@ func (a *Adapter) createDatabase() error {
 				return nil
 			}
 		}
-	} else {
+	} else if a.driverName != "sqlite3" {
 		_, err = engine.Exec("CREATE DATABASE IF NOT EXISTS casbin")
 	}
 	return err
@@ -116,6 +116,8 @@ func (a *Adapter) open() {
 
 		if a.driverName == "postgres" {
 			engine, err = xorm.NewEngine(a.driverName, a.dataSourceName+" dbname=casbin")
+		} else if a.driverName == "sqlite3" {
+			engine, err = xorm.NewEngine(a.driverName, a.dataSourceName)
 		} else {
 			engine, err = xorm.NewEngine(a.driverName, a.dataSourceName+"casbin")
 		}

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ func (a *Adapter) createDatabase() error {`
`94`	`94`	`return nil`
`95`	`95`	`}`
`96`	`96`	`}`
`97`		`- } else {`
	`97`	`+ } else if a.driverName != "sqlite3" {`
`98`	`98`	`_, err = engine.Exec("CREATE DATABASE IF NOT EXISTS casbin")`
`99`	`99`	`}`
`100`	`100`	`return err`
`@@ -116,6 +116,8 @@ func (a *Adapter) open() {`
`116`	`116`
`117`	`117`	`if a.driverName == "postgres" {`
`118`	`118`	`engine, err = xorm.NewEngine(a.driverName, a.dataSourceName+" dbname=casbin")`
	`119`	`+ } else if a.driverName == "sqlite3" {`
	`120`	`+ engine, err = xorm.NewEngine(a.driverName, a.dataSourceName)`
`119`	`121`	`} else {`
`120`	`122`	`engine, err = xorm.NewEngine(a.driverName, a.dataSourceName+"casbin")`
`121`	`123`	`}`