Updated sqobj

Author: djthorpe

pkg/sqlite3/conn.go

@@ -31,6 +31,7 @@ type Conn struct {
 
 type Txn struct {
 	*Conn
+	f SQFlag
 }
 
 type ExecFunc sqlite3.ExecFunc
@@ -111,6 +112,11 @@ func (conn *Conn) Exec(st SQStatement, fn ExecFunc) error {
 	return conn.ConnEx.Exec(st.Query(), sqlite3.ExecFunc(fn))
 }
 
+// Execute SQL statement outside of transaction - currently not implemented
+func (conn *Conn) Query(st SQStatement, v ...interface{}) (SQResults, error) {
+	return nil, ErrNotImplemented.With("Query")
+}
+
 // Perform a transaction, rollback if error is returned
 func (conn *Conn) Do(ctx context.Context, flag SQFlag, fn func(SQTransaction) error) error {
 	conn.Mutex.Lock()
@@ -152,7 +158,7 @@ func (conn *Conn) Do(ctx context.Context, flag SQFlag, fn func(SQTransaction) er
 		conn.SetProgressHandler(100, func() bool {
 			return ctx != nil && ctx.Err() != nil
 		})
-		if err := fn(&Txn{conn}); err != nil {
+		if err := fn(&Txn{conn, flag}); err != nil {
 			result = multierror.Append(result, err)
 		}
 		conn.SetProgressHandler(0, nil)
@@ -188,7 +194,7 @@ func (txn *Txn) Query(st SQStatement, v ...interface{}) (SQResults, error) {
 	}
 
 	// Get a results object
-	r, err := txn.ConnCache.Prepare(txn.Conn.ConnEx, st.Query())
+	r, err := txn.Conn.ConnCache.Prepare(txn.Conn.ConnEx, st.Query())
 	if err != nil {
 		return nil, err
 	}
@@ -205,3 +211,8 @@ func (txn *Txn) Query(st SQStatement, v ...interface{}) (SQResults, error) {
 func (c *Conn) Flags() SQFlag {
 	return c.f
 }
+
+// Flags returns the Open Flags or'd with Transaction Flags
+func (t *Txn) Flags() SQFlag {
+	return t.f | t.Conn.f
+}

pkg/sqlite3/pool.go

@@ -56,7 +56,7 @@ var (
 		Max:     5,
 		Trace:   false,
 		Create:  true,
-		Schemas: map[string]string{defaultSchema: defaultMemory},
+		Schemas: map[string]string{DefaultSchema: defaultMemory},
 		Flags:   SQFlag(sqlite3.SQLITE_OPEN_CREATE) | SQFlag(sqlite3.SQLITE_OPEN_SHAREDCACHE) | SQLITE_OPEN_CACHE,
 	}
 )
@@ -70,7 +70,7 @@ var (
 func NewPool(path string, errs chan<- error) (*Pool, error) {
 	cfg := defaultPoolConfig
 	if path != "" {
-		cfg.Schemas = map[string]string{defaultSchema: path}
+		cfg.Schemas = map[string]string{DefaultSchema: path}
 	}
 	return OpenPool(cfg, errs)
 }
@@ -226,9 +226,9 @@ func (p *Pool) Put(conn SQConnection) {
 // complete operation
 func (p *Pool) new() (*Conn, error) {
 	// Open connection to main schema, which is required
-	defaultPath := p.pathForSchema(defaultSchema)
+	defaultPath := p.pathForSchema(DefaultSchema)
 	if defaultPath == "" {
-		return nil, ErrNotFound.Withf("No default schema %q found", defaultSchema)
+		return nil, ErrNotFound.Withf("No default schema %q found", DefaultSchema)
 	}
 
 	// Always allow memory databases to be created and read/write
@@ -256,7 +256,7 @@ func (p *Pool) new() (*Conn, error) {
 	for schema := range p.Schemas {
 		schema = strings.TrimSpace(schema)
 		path := p.pathForSchema(schema)
-		if schema == defaultSchema {
+		if schema == DefaultSchema {
 			continue
 		}
 		if path == "" {
@@ -313,7 +313,7 @@ func (p *Pool) put(conn *Conn) {
 // or an empty string if the schema name is not valid
 func (p *Pool) pathForSchema(schema string) string {
 	if schema == "" {
-		return p.pathForSchema(defaultSchema)
+		return p.pathForSchema(DefaultSchema)
 	} else if !reSchemaName.MatchString(schema) {
 		return ""
 	} else if path, exists := p.Schemas[schema]; !exists {

pkg/sqlite3/schema.go

@@ -28,15 +28,15 @@ func (c *Conn) Schemas() []string {
 // Filename returns the filename for a schema
 func (c *Conn) Filename(schema string) string {
 	if schema == "" {
-		return c.Filename(defaultSchema)
+		return c.Filename(DefaultSchema)
 	}
 	return c.ConnEx.Filename(schema)
 }
 
 // Tables returns a list of table names in a schema
 func (c *Conn) Tables(schema string) []string {
 	if schema == "" {
-		return c.Tables(defaultSchema)
+		return c.Tables(DefaultSchema)
 	}
 	return c.objectsInSchema(schema, "table")
 }
@@ -46,7 +46,7 @@ func (c *Conn) Count(schema, table string) int64 {
 	if table == "" {
 		return -1
 	} else if schema == "" {
-		return c.Count(defaultSchema, table)
+		return c.Count(DefaultSchema, table)
 	}
 	result := int64(-1)
 	if err := c.Exec(Q("SELECT COUNT(*) FROM ", N(table).WithSchema(schema)), func(row, k []string) bool {
@@ -63,7 +63,7 @@ func (c *Conn) Count(schema, table string) int64 {
 // ColumnsForTable returns the columns in a table
 func (c *Conn) ColumnsForTable(schema, table string) []SQColumn {
 	if schema == "" {
-		return c.ColumnsForTable(defaultSchema, table)
+		return c.ColumnsForTable(DefaultSchema, table)
 	}
 	result := []SQColumn{}
 	if err := c.Exec(Q("PRAGMA ", N(schema), ".table_info(", N(table), ")"), func(row, k []string) bool {
@@ -87,7 +87,7 @@ func (c *Conn) ColumnsForTable(schema, table string) []SQColumn {
 // ColumnsForIndex returns the indexes associated with a table
 func (c *Conn) ColumnsForIndex(schema, index string) []string {
 	if schema == "" {
-		return c.ColumnsForIndex(defaultSchema, index)
+		return c.ColumnsForIndex(DefaultSchema, index)
 	}
 
 	result := []string{}
@@ -105,7 +105,7 @@ func (c *Conn) IndexesForTable(schema, table string) []SQIndexView {
 	if table == "" {
 		return nil
 	} else if schema == "" {
-		return c.IndexesForTable(defaultSchema, table)
+		return c.IndexesForTable(DefaultSchema, table)
 	}
 	result := []SQIndexView{}
 	if err := c.ExecEx(Q("PRAGMA ", N(schema), ".index_list(", N(table), ")").Query(), func(row, col []string) bool {
@@ -140,7 +140,7 @@ func (c *Conn) IndexesForTable(schema, table string) []SQIndexView {
 // Views returns a list of view names in a schema
 func (c *Conn) Views(schema string) []string {
 	if schema == "" {
-		return c.Views(defaultSchema)
+		return c.Views(DefaultSchema)
 	}
 	return c.objectsInSchema(schema, "view")
 }

pkg/sqlite3/sqlite3.go

@@ -14,8 +14,8 @@ import (
 const (
 	// DefaultFlags are the default flags for a new database connection
 	DefaultFlags  = SQFlag(sqlite3.SQLITE_OPEN_CREATE | sqlite3.SQLITE_OPEN_READWRITE)
+	DefaultSchema = sqlite3.DefaultSchema
 	defaultMemory = sqlite3.DefaultMemory
-	defaultSchema = sqlite3.DefaultSchema
 	tempSchema    = "temp"
 )