Misc.

example_test.go

@@ -6,7 +6,7 @@ package sqlite_test
 
 import (
 	"fmt"
-	sqlite "github.com/gwenn/gosqlite"
+	"github.com/gwenn/gosqlite"
 )
 
 func check(err error) {

function.go

@@ -149,9 +149,8 @@ func (c *Context) ResultDouble(d float64) {
 // ResultError sets the result of an SQL function.
 // (See sqlite3_result_error, http://sqlite.org/c3ref/result_blob.html)
 func (c *FunctionContext) ResultError(msg string) {
-	cs := C.CString(msg)
-	defer C.free(unsafe.Pointer(cs))
-	C.sqlite3_result_error(c.sc, cs, -1)
+	cs, l := cstring(msg)
+	C.sqlite3_result_error(c.sc, cs, l)
 }
 
 // ResultErrorTooBig sets the result of an SQL function.

meta.go

@@ -68,9 +68,9 @@ func (c *Conn) Databases() (map[string]string, error) {
 func (c *Conn) Tables(dbName string) ([]string, error) {
 	var sql string
 	if len(dbName) == 0 {
-		sql = "SELECT name FROM sqlite_master WHERE type IN ('table') AND name NOT LIKE 'sqlite_%'"
+		sql = "SELECT name FROM sqlite_master WHERE type IN ('table') AND name NOT LIKE 'sqlite_%' ORDER BY 1"
 	} else {
-		sql = Mprintf("SELECT name FROM %Q.sqlite_master WHERE type IN ('table') AND name NOT LIKE 'sqlite_%%'", dbName)
+		sql = Mprintf("SELECT name FROM %Q.sqlite_master WHERE type IN ('table') AND name NOT LIKE 'sqlite_%%' ORDER BY 1", dbName)
 	}
 	s, err := c.prepare(sql)
 	if err != nil {
@@ -151,6 +151,7 @@ func (c *Conn) Column(dbName, tableName, columnName string) (*Column, error) {
 	if rv != C.SQLITE_OK {
 		return nil, c.error(rv, fmt.Sprintf("Conn.Column(db: %q, tbl: %q, col: %q)", dbName, tableName, columnName))
 	}
+	// TODO How to avoid copy?
 	return &Column{-1, columnName, C.GoString(zDataType), notNull == 1, "", primaryKey == 1,
 		autoinc == 1, C.GoString(zCollSeq)}, nil
 }