Commit 4cd78a28 authored by gwenn's avatar gwenn

Fix golint warnings

config.go:56:6: func ConfigUri should be ConfigURI
driver.go:223:26: error strings should not be capitalized or end with punctuation or a newline
sqlite.go:225:2: const OpenUri should be OpenURI
stmt.go:335:1: comment on exported var NullIfEmptyString should be of the form "NullIfEmptyString ..."
parent 5947a457
...@@ -51,9 +51,9 @@ func ConfigMemStatus(b bool) error { ...@@ -51,9 +51,9 @@ func ConfigMemStatus(b bool) error {
return Errno(rv) return Errno(rv)
} }
// ConfigUri enables or disables URI handling. // ConfigURI enables or disables URI handling.
// (See sqlite3_config(SQLITE_CONFIG_URI): http://sqlite.org/c3ref/config.html) // (See sqlite3_config(SQLITE_CONFIG_URI): http://sqlite.org/c3ref/config.html)
func ConfigUri(b bool) error { func ConfigURI(b bool) error {
rv := C.goSqlite3Config(C.SQLITE_CONFIG_URI, btocint(b)) rv := C.goSqlite3Config(C.SQLITE_CONFIG_URI, btocint(b))
if rv == C.SQLITE_OK { if rv == C.SQLITE_OK {
return nil return nil
......
...@@ -21,7 +21,7 @@ func init() { ...@@ -21,7 +21,7 @@ func init() {
if err != nil { if err != nil {
panic(fmt.Sprintf("cannot activate mem status: '%s'", err)) panic(fmt.Sprintf("cannot activate mem status: '%s'", err))
} }
err = ConfigUri(true) err = ConfigURI(true)
if err != nil { if err != nil {
panic(fmt.Sprintf("cannot activate uri handling: '%s'", err)) panic(fmt.Sprintf("cannot activate uri handling: '%s'", err))
} }
......
...@@ -71,7 +71,7 @@ func NewDriver(open func(name string) (*Conn, error), configure func(*Conn) erro ...@@ -71,7 +71,7 @@ func NewDriver(open func(name string) (*Conn, error), configure func(*Conn) erro
var defaultOpen = func(name string) (*Conn, error) { var defaultOpen = func(name string) (*Conn, error) {
// OpenNoMutex == multi-thread mode (http://sqlite.org/compile.html#threadsafe and http://sqlite.org/threadsafe.html) // OpenNoMutex == multi-thread mode (http://sqlite.org/compile.html#threadsafe and http://sqlite.org/threadsafe.html)
c, err := Open(name, OpenUri, OpenNoMutex, OpenReadWrite, OpenCreate) c, err := Open(name, OpenURI, OpenNoMutex, OpenReadWrite, OpenCreate)
if err != nil { if err != nil {
return nil, err return nil, err
} }
...@@ -220,7 +220,7 @@ func (c *conn) BeginTx(ctx context.Context, opts driver.TxOptions) (driver.Tx, e ...@@ -220,7 +220,7 @@ func (c *conn) BeginTx(ctx context.Context, opts driver.TxOptions) (driver.Tx, e
return nil, err return nil, err
} }
default: default:
return nil, fmt.Errorf("Isolation level %d is not supported.", opts.Isolation) return nil, fmt.Errorf("isolation level %d is not supported", opts.Isolation)
} }
return c.Begin() return c.Begin()
} }
......
...@@ -225,7 +225,7 @@ func TestUnwrap(t *testing.T) { ...@@ -225,7 +225,7 @@ func TestUnwrap(t *testing.T) {
func TestCustomRegister(t *testing.T) { func TestCustomRegister(t *testing.T) {
sql.Register("sqlite3ReadOnly", sqlite.NewDriver(func(name string) (*sqlite.Conn, error) { sql.Register("sqlite3ReadOnly", sqlite.NewDriver(func(name string) (*sqlite.Conn, error) {
c, err := sqlite.Open(name, sqlite.OpenUri, sqlite.OpenNoMutex, sqlite.OpenReadOnly) c, err := sqlite.Open(name, sqlite.OpenURI, sqlite.OpenNoMutex, sqlite.OpenReadOnly)
if err != nil { if err != nil {
return nil, err return nil, err
} }
......
...@@ -222,7 +222,7 @@ const ( ...@@ -222,7 +222,7 @@ const (
OpenReadOnly OpenFlag = C.SQLITE_OPEN_READONLY OpenReadOnly OpenFlag = C.SQLITE_OPEN_READONLY
OpenReadWrite OpenFlag = C.SQLITE_OPEN_READWRITE OpenReadWrite OpenFlag = C.SQLITE_OPEN_READWRITE
OpenCreate OpenFlag = C.SQLITE_OPEN_CREATE OpenCreate OpenFlag = C.SQLITE_OPEN_CREATE
OpenUri OpenFlag = C.SQLITE_OPEN_URI OpenURI OpenFlag = C.SQLITE_OPEN_URI
OpenNoMutex OpenFlag = C.SQLITE_OPEN_NOMUTEX OpenNoMutex OpenFlag = C.SQLITE_OPEN_NOMUTEX
OpenFullMutex OpenFlag = C.SQLITE_OPEN_FULLMUTEX OpenFullMutex OpenFlag = C.SQLITE_OPEN_FULLMUTEX
OpenSharedCache OpenFlag = C.SQLITE_OPEN_SHAREDCACHE OpenSharedCache OpenFlag = C.SQLITE_OPEN_SHAREDCACHE
......
...@@ -181,13 +181,13 @@ func TestLoadExtension(t *testing.T) { // OMIT_LOAD_EXTENSION ...@@ -181,13 +181,13 @@ func TestLoadExtension(t *testing.T) { // OMIT_LOAD_EXTENSION
*/ */
func TestOpenSameMemoryDb(t *testing.T) { func TestOpenSameMemoryDb(t *testing.T) {
db1, err := Open("file:dummy.db?mode=memory&cache=shared", OpenUri, OpenReadWrite, OpenCreate, OpenFullMutex) db1, err := Open("file:dummy.db?mode=memory&cache=shared", OpenURI, OpenReadWrite, OpenCreate, OpenFullMutex)
checkNoError(t, err, "open error: %s") checkNoError(t, err, "open error: %s")
defer checkClose(db1, t) defer checkClose(db1, t)
err = db1.Exec("CREATE TABLE test (data TEXT)") err = db1.Exec("CREATE TABLE test (data TEXT)")
checkNoError(t, err, "exec error: %s") checkNoError(t, err, "exec error: %s")
db2, err := Open("file:dummy.db?mode=memory&cache=shared", OpenUri, OpenReadWrite, OpenCreate, OpenFullMutex) db2, err := Open("file:dummy.db?mode=memory&cache=shared", OpenURI, OpenReadWrite, OpenCreate, OpenFullMutex)
checkNoError(t, err, "open error: %s") checkNoError(t, err, "open error: %s")
defer checkClose(db2, t) defer checkClose(db2, t)
_, err = db2.Exists("SELECT 1 FROM test") _, err = db2.Exists("SELECT 1 FROM test")
......
...@@ -332,7 +332,7 @@ func (s *Stmt) Bind(args ...interface{}) error { ...@@ -332,7 +332,7 @@ func (s *Stmt) Bind(args ...interface{}) error {
return nil return nil
} }
// NullIfEmpty transforms empty string to null when true (true by default) // NullIfEmptyString transforms empty string to null when true (true by default)
var NullIfEmptyString = true var NullIfEmptyString = true
// NullIfZeroTime transforms zero time (time.Time.IsZero) to null when true (true by default) // NullIfZeroTime transforms zero time (time.Time.IsZero) to null when true (true by default)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment