1.16.1

Author: logoove

README.md

@@ -1,8 +1,8 @@
 # sqlite
 
-一个不使用cgo的database/sql标准sqlite3驱动,原驱动`modernc.org/sqlite`,但是速度不行,在github上边没有,就从gitlab搬迁过来,同时修改了驱动名称为sqlite3,这样不用任何修改,就能在goframe框架中使用.
+一个不使用cgo的database/sql标准sqlite3驱动,原驱动`modernc.org/sqlite`,增加对goframe2+框架的支持(最新goframe已经有不使用cgo驱动了).
 
-### 非框架使用方法
+### 常规使用方法
 ~~~
 	"github.com/jmoiron/sqlx"
 	_ "github.com/logoove/sqlite"
@@ -15,7 +15,7 @@ type User struct {
 }
 
 func main() {
-	db, _ = sqlx.Open("sqlite3", "./db.db")
+	db, _ = sqlx.Open("sqlite", "./db.db")
 	db.Exec(`CREATE TABLE users (
   "id" integer NOT NULL PRIMARY KEY AUTOINCREMENT,
   "name" char(15) NOT NULL
@@ -28,47 +28,18 @@ func main() {
 }  
 ~~~
 
-### goframe1.17
-
-配置在config/config.toml
-~~~
-[database]
-	type= "sqlite"
-    link= "./public/resource/db.db"
-    debug = true
-~~~
-然后在boot 下面boot.go文件里面加上
-~~~
-_ "github.com/logoove/sqlite"
-~~~
-### goframe2.0
+### goframe2.0+使用方法
 在manifeat/config/config.yaml配置
 ~~~
 # 数据库连接配置
 database:
-  logger:
-    path:    "./temp/logs/sql"
-    level:   "all"
-    stdout:  true
-    ctxKeys: ["RequestId"]
   default:
     type: "sqlite"
     link: "./resource/db.db" #数据库路径根据自己的填写
     debug:  true
 ~~~
-在internel/cmd文件夹中放入sqlite.go驱动文件,已经将驱动改成sqlite3,所以能够直接在goframe2.0中使用.驱动文件在examples里面
-
-### 插入数据两个goframe版本一样
-~~~
-id, _ := g.Model("user").Data(g.Map{"name": "john", "age": 1}).InsertAndGetId()
-~~~
-
-### examples是例子
-gf17是gf1.7
-gflay是gf2.0
-sqlx是不使用框架
-sqlite.go是gf2.0驱动
 ### 更新日志
+2023-10-09 v1.16.1 修复对goframe支持,更新到gitlab.com/cznic/sqlite最新1.26同步.对于goframe2以下版本可能不能使用.
 
 2022-3-22 v1.15.3 新增win amd64编译,解决内存泄漏问题.
 

addport.go

@@ -0,0 +1,64 @@
+// Copyright 2022 The Sqlite Authors. All rights reserved
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+//go:build ignore
+// +build ignore
+
+package main
+
+import (
+	"fmt"
+	"os"
+	"path/filepath"
+	"strings"
+)
+
+func fail(rc int, msg string, args ...interface{}) {
+	fmt.Fprintf(os.Stderr, msg, args...)
+	os.Exit(rc)
+}
+
+func main() {
+	if len(os.Args) != 3 {
+		fail(1, "expected 2 args: pattern and replacement\n")
+	}
+
+	pattern := os.Args[1]
+	replacement := os.Args[2]
+	if err := filepath.Walk(".", func(path string, info os.FileInfo, err error) error {
+		if err != nil {
+			return err
+		}
+
+		if info.IsDir() {
+			return nil
+		}
+
+		dir, file := filepath.Split(path)
+		if x := strings.Index(file, pattern); x >= 0 {
+			// pattern      freebsd
+			// replacement  netbsd
+			// file         libc_freebsd_amd64.go
+			// replaced     libc_netbsd_amd64.go
+			//              01234567890123456789
+			//                        1
+			// x            5
+			file = file[:x] + replacement + file[x+len(pattern):]
+			dst := filepath.Join(dir, file)
+			b, err := os.ReadFile(path)
+			if err != nil {
+				return fmt.Errorf("reading %s: %v", path, err)
+			}
+
+			if err := os.WriteFile(dst, b, 0640); err != nil {
+				return fmt.Errorf("writing %s: %v", dst, err)
+			}
+			fmt.Printf("%s -> %s\n", path, dst)
+		}
+
+		return nil
+	}); err != nil {
+		fail(1, "%s", err)
+	}
+}

benchmark/README.md

@@ -0,0 +1,43 @@
+## Benchmarks
+The benchmarking is conducted against CGo implementation of SQLite driver (https://github.com/mattn/go-sqlite3).
+
+Benchmark tests are inspired by and closely repeat those described in https://www.sqlite.org/speed.html.
+
+## Doing benchmarks
+Benchmarks are run by custom runner and invoked with
+```console
+go test -v .
+```
+Additional command line arguments:
+
+| flag | type | default | description                                                                                     |
+| ---- | ---- | ------- | ----------------------------------------------------------------------------------------------- |
+| -mem | bool | false   | if true: benchmarks will use in-memory SQLite instance,  otherwise: on-disk instance            |
+| -rep | uint | 1       | run each benchmark multiple times and average the results. this may provide more stable results |
+
+
+## Current results
+```text
+=== RUN   Test_BenchmarkSQLite
+
+goos:   darwin
+goarch: amd64
+cpu:    Intel(R) Core(TM) i7-9750H CPU @ 2.60GHz
+repeat: 1 time(s)
+in-memory SQLite: false
+
+bench_create_index                  |  1.80x | CGo: 120.880 ms/op | Pure-Go: 217.574 ms/op
+bench_select_on_string_comparison   |  2.25x | CGo:  19.326 ms/op | Pure-Go:  43.498 ms/op
+bench_select_with_index             |  5.84x | CGo:   0.002 ms/op | Pure-Go:   0.014 ms/op
+bench_select_without_index          |  1.50x | CGo:   6.071 ms/op | Pure-Go:   9.111 ms/op
+bench_insert                        |  1.17x | CGo:   0.481 ms/op | Pure-Go:   0.565 ms/op
+bench_insert_in_transaction         |  1.78x | CGo:   0.004 ms/op | Pure-Go:   0.006 ms/op
+bench_insert_into_indexed           |  1.62x | CGo:   0.008 ms/op | Pure-Go:   0.013 ms/op
+bench_insert_from_select            |  1.80x | CGo:  30.409 ms/op | Pure-Go:  54.703 ms/op
+bench_update_text_with_index        |  3.26x | CGo:   0.004 ms/op | Pure-Go:   0.013 ms/op
+bench_update_with_index             |  4.20x | CGo:   0.003 ms/op | Pure-Go:   0.011 ms/op
+bench_update_without_index          |  1.40x | CGo:   6.421 ms/op | Pure-Go:   9.010 ms/op
+bench_delete_without_index          |  1.28x | CGo: 180.734 ms/op | Pure-Go: 231.105 ms/op
+bench_delete_with_index             |  1.85x | CGo:  34.284 ms/op | Pure-Go:  63.569 ms/op
+--- PASS: Test_BenchmarkSQLite (171.62s)
+```