Updated sqobjects

Author: djthorpe

cmd/sqaccess/main.go

@@ -0,0 +1,28 @@
+package main
+
+import (
+	"fmt"
+
+	// Namespace Imports
+	//. "github.com/djthorpe/go-sqlite"
+
+	// Modules
+	"github.com/djthorpe/go-sqlite/pkg/sqobj"
+)
+
+////////////////////////////////////////////////////////////////////////////////
+// TYPES
+
+type User struct {
+	Name string `sqlite:"name,primary"`
+	Hash string `sqlite:"hash,not null"`
+}
+
+func main() {
+	fmt.Println("IN")
+	if r, err := sqobj.NewReflect(User{}); err != nil {
+		fmt.Println(err)
+	} else {
+		fmt.Println(r)
+	}
+}

cmd/sqtool/main.go

@@ -55,7 +55,7 @@ func main() {
 	}
 	defer db.Close()
 
-	db.SetTraceHook(trace, sqlite3.SQLITE_TRACE_PROFILE)
+	//db.SetTraceHook(trace, sqlite3.SQLITE_TRACE_PROFILE)
 
 	// Report on the database
 	log.Println("database:", db.Filename(sqlite3.DefaultSchema))

npm/sqlite3/html/index.html

@@ -45,7 +45,7 @@ <h1 class="_name">[schema]</h1>
                 </ul>
                 <!-- TABLE CONTENT (TableView) -->
                 <div class="m-2">
-                    <table-view id="results" data-class="table-hover table-sm table-striped" data-columns="Col A, Col B, Col D" data-rows="4"></table-view>
+                    <table-view cols="Col A, Col B, Col C"></table-view>
                 </div>
             </div>
             <div class="col-md-2 d-md-block d-none bg-light border-start" id="database">

npm/sqlite3/js/index.js

@@ -6,17 +6,9 @@ import '../css/index.css';
 import App from './controller/app';
 
 // Views
-import ComponentView from './view/component-view';
-import BadgeView from './view/badge-view';
-import TableView from './view/table-view';
-import TableHeadView from './view/table-head-view';
-import TableBodyView from './view/table-body-view';
-
-// Define tag names
-ComponentView.define('badge-view', BadgeView);
-ComponentView.define('table-view', TableView);
-ComponentView.define('table-head-view', TableHeadView);
-ComponentView.define('table-body-view', TableBodyView);
+import './view/table-view';
+import './view/table-head-view';
+import './view/table-body-view';
 
 // Import js-framework
 const jsf = require('@djthorpe/js-framework');
@@ -29,4 +21,3 @@ window.addEventListener('DOMContentLoaded', () => {
   console.log('Running application', app.constructor.name);
   app.main();
 });
-

npm/sqlite3/package-lock.json

@@ -40,6 +40,7 @@
     "dist/**/*.{js,map,woff,woff2,txt,ttf,css,html,jpg,jpeg,png,gif,svg}"
   ],
   "dependencies": {
-    "@djthorpe/js-framework": "^0.0.47"
+    "@djthorpe/js-framework": "^0.0.47",
+    "lit-html": "^1.4.1"
   }
 }

npm/sqlite3/package.json

@@ -45,10 +45,11 @@ func QuoteIdentifiers(v ...string) string {
 	if len(v) == 1 {
 		return QuoteIdentifier(v[0])
 	}
+	result := make([]string, len(v))
 	for i, v_ := range v {
-		v[i] = QuoteIdentifier(v_)
+		result[i] = QuoteIdentifier(v_)
 	}
-	return strings.Join(v, ",")
+	return strings.Join(result, ",")
 }
 
 // QuoteDeclType returns a supported type or quotes type

pkg/quote/quote.go

@@ -15,7 +15,6 @@ import (
 // PRIVATE FUNCTIONS
 
 func (p *Pool) auth(ctx context.Context, action sqlite3.SQAction, args [4]string) error {
-	//fmt.Printf("auth %v %q\n", action, args)
 	switch action {
 	case sqlite3.SQLITE_CREATE_INDEX:
 		return p.Auth.CanExec(ctx, SQLITE_AUTH_INDEX|SQLITE_AUTH_CREATE, args[2], args[1], args[0])

pkg/sqlite3/auth.go

@@ -19,11 +19,10 @@ import (
 
 func Test_Cache_001(t *testing.T) {
 	// Create a connection and enable the connection cache (which caches prepared statements)
-	conn, err := OpenPath(":memory:", sqlite3.DefaultFlags|sqlite3.SQLITE_OPEN_CONNCACHE)
+	conn, err := OpenPath(":memory:", SQFlag(sqlite3.DefaultFlags)|SQLITE_OPEN_CACHE)
 	if err != nil {
 		t.Fatal(err)
 	}
-	defer conn.Close()
 
 	// Perform caching in a transaction
 	conn.Do(context.Background(), 0, func(txn SQTransaction) error {

pkg/sqlite3/cache_test.go

@@ -25,6 +25,7 @@ type Conn struct {
 	ConnCache
 
 	c   chan struct{}
+	f   SQFlag
 	ctx context.Context
 }
 
@@ -38,11 +39,24 @@ type TxnFunc func(SQTransaction) error
 ////////////////////////////////////////////////////////////////////////////////
 // LIFECYCLE
 
-func OpenPath(path string, flags sqlite3.OpenFlags) (*Conn, error) {
+// New creates an in-memory database. Pass any flags to set open options. If
+// no flags are provided, the default is to create a read/write database.
+func New(flags ...SQFlag) (*Conn, error) {
+	f := SQFlag(0)
+	if len(flags) == 0 {
+		f |= SQFlag(sqlite3.DefaultFlags)
+	}
+	for _, flag := range flags {
+		f |= flag
+	}
+	return OpenPath(defaultMemory, f)
+}
+
+func OpenPath(path string, flags SQFlag) (*Conn, error) {
 	conn := new(Conn)
 
 	// If no create flag then check to make sure database exists
-	if path != defaultMemory && flags&sqlite3.SQLITE_OPEN_CREATE == 0 {
+	if path != defaultMemory && flags&SQFlag(sqlite3.SQLITE_OPEN_MEMORY) == 0 && SQFlag(sqlite3.SQLITE_OPEN_CREATE) == 0 {
 		if _, err := os.Stat(path); os.IsNotExist(err) {
 			return nil, ErrNotFound.Withf("%q", path)
 		} else if err != nil {
@@ -51,14 +65,15 @@ func OpenPath(path string, flags sqlite3.OpenFlags) (*Conn, error) {
 	}
 
 	// Open database with flags
-	if c, err := sqlite3.OpenPathEx(path, flags, ""); err != nil {
+	if c, err := sqlite3.OpenPathEx(path, sqlite3.OpenFlags(flags), ""); err != nil {
 		return nil, err
 	} else {
 		conn.ConnEx = c
+		conn.f = flags
 	}
 
 	// Set cache to default size
-	if flags&sqlite3.SQLITE_OPEN_CONNCACHE != 0 {
+	if flags&SQLITE_OPEN_CACHE != 0 {
 		conn.SetCap(defaultCapacity)
 	} else {
 		conn.SetCap(0)
@@ -97,7 +112,7 @@ func (conn *Conn) Exec(st SQStatement, fn ExecFunc) error {
 }
 
 // Perform a transaction, rollback if error is returned
-func (conn *Conn) Do(ctx context.Context, flag SQTxnFlag, fn func(SQTransaction) error) error {
+func (conn *Conn) Do(ctx context.Context, flag SQFlag, fn func(SQTransaction) error) error {
 	conn.Mutex.Lock()
 	defer conn.Mutex.Unlock()
 
@@ -117,7 +132,7 @@ func (conn *Conn) Do(ctx context.Context, flag SQTxnFlag, fn func(SQTransaction)
 		}
 	}
 
-	// Flags
+	// Transaction flags
 	v := sqlite3.SQLITE_TXN_DEFAULT
 	if flag.Is(SQLITE_TXN_EXCLUSIVE) {
 		v = sqlite3.SQLITE_TXN_EXCLUSIVE
@@ -185,3 +200,8 @@ func (txn *Txn) Query(st SQStatement, v ...interface{}) (SQResults, error) {
 		return r, nil
 	}
 }
+
+// Flags returns the Open Flags
+func (c *Conn) Flags() SQFlag {
+	return c.f
+}