.codecov.yml

@@ -1,4 +0,0 @@
-coverage:
-  status:
-    project: off
-    patch: off

.github/FUNDING.yml

@@ -1,8 +0,0 @@
-# These are supported funding model platforms
-
-github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
-patreon: mattn # Replace with a single Patreon username
-open_collective: mattn # Replace with a single Open Collective username
-ko_fi: # Replace with a single Ko-fi username
-tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
-custom: # Replace with a single custom sponsorship URL

.github/workflows/cifuzz.yaml

@@ -1,29 +0,0 @@
-name: CIFuzz
-on: [pull_request]
-jobs:
- Fuzzing:
-   runs-on: ubuntu-latest
-   strategy:
-     fail-fast: false
-     matrix:
-       sanitizer: [address]
-   steps:
-   - name: Build Fuzzers (${{ matrix.sanitizer }})
-     uses: google/oss-fuzz/infra/cifuzz/actions/build_fuzzers@master
-     with:
-       oss-fuzz-project-name: 'go-sqlite3'
-       dry-run: false
-       sanitizer: ${{ matrix.sanitizer }}
-   - name: Run Fuzzers (${{ matrix.sanitizer }})
-     uses: google/oss-fuzz/infra/cifuzz/actions/run_fuzzers@master
-     with:
-       oss-fuzz-project-name: 'go-sqlite3'
-       fuzz-seconds: 600
-       dry-run: false
-       sanitizer: ${{ matrix.sanitizer }}
-   - name: Upload Crash
-     uses: actions/upload-artifact@v1
-     if: failure()
-     with:
-       name: ${{ matrix.sanitizer }}-artifacts
-       path: ./out/artifacts

.github/workflows/docker.yaml

@@ -1,22 +0,0 @@
-name: dockerfile
-
-on:
-  workflow_dispatch:
-  push:
-    tags:
-      - 'v*'
-  pull_request:
-    branches: [ master ]
-
-jobs:
-  dockerfile:
-    name: Run Dockerfiles in examples
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Run example - simple
-        run: |
-          cd ./_example/simple
-          docker build -t simple .
-          docker run simple | grep 99\ こんにちは世界099

.github/workflows/go.yaml

@@ -1,115 +0,0 @@
-name: Go
-
-on: [push, pull_request]
-
-jobs:
-
-  test:
-    name: Test
-    runs-on: ${{ matrix.os }}
-    defaults:
-      run:
-        shell: bash
-
-    strategy:
-      matrix:
-        os: [ubuntu-latest, macos-latest]
-        go: ['1.17', '1.18', '1.19']
-      fail-fast: false
-    env:
-      OS: ${{ matrix.os }}
-      GO: ${{ matrix.go }}
-    steps:
-      - if: startsWith(matrix.os, 'macos')
-        run: brew update
-
-      - uses: actions/setup-go@v2
-        with:
-          go-version: ${{ matrix.go }}
-
-      - name: Get Build Tools
-        run: |
-          GO111MODULE=on go install github.com/ory/go-acc@latest
-
-      - name: Add $GOPATH/bin to $PATH
-        run: |
-          echo "$(go env GOPATH)/bin" >> "$GITHUB_PATH"
-
-      - uses: actions/checkout@v2
-
-      - name: 'Tags: default'
-        run: go-acc . -- -race -v -tags ""
-
-      - name: 'Tags: libsqlite3'
-        run: go-acc . -- -race -v -tags "libsqlite3"
-
-      - name: 'Tags: full'
-        run: go-acc . -- -race -v -tags "sqlite_allow_uri_authority sqlite_app_armor sqlite_column_metadata sqlite_foreign_keys sqlite_fts5 sqlite_icu sqlite_introspect sqlite_json sqlite_math_functions sqlite_os_trace sqlite_preupdate_hook sqlite_secure_delete sqlite_see sqlite_stat4 sqlite_trace sqlite_unlock_notify sqlite_userauth sqlite_vacuum_incr sqlite_vtable"
-
-      - name: 'Tags: vacuum'
-        run: go-acc . -- -race -v -tags "sqlite_vacuum_full"
-
-      - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v1
-        with:
-          env_vars: OS,GO
-          file: coverage.txt
-
-  test-windows:
-    name: Test for Windows
-    runs-on: windows-latest
-    defaults:
-      run:
-        shell: bash
-
-    strategy:
-      matrix:
-        go: ['1.17', '1.18', '1.19']
-      fail-fast: false
-    env:
-      OS: windows-latest
-      GO: ${{ matrix.go }}
-    steps:
-      - uses: msys2/setup-msys2@v2
-        with:
-          update: true
-          install: mingw-w64-x86_64-toolchain mingw-w64-x86_64-sqlite3
-          msystem: MINGW64
-          path-type: inherit
-
-      - uses: actions/setup-go@v2
-        with:
-          go-version: ${{ matrix.go }}
-
-      - name: Add $GOPATH/bin to $PATH
-        run: |
-          echo "$(go env GOPATH)/bin" >> "$GITHUB_PATH"
-        shell: msys2 {0}
-
-      - uses: actions/checkout@v2
-
-      - name: 'Tags: default'
-        run: go build -race -v -tags ""
-        shell: msys2 {0}
-
-      - name: 'Tags: libsqlite3'
-        run: go build -race -v -tags "libsqlite3"
-        shell: msys2 {0}
-
-      - name: 'Tags: full'
-        run: |
-          echo 'skip this test'
-          echo go build -race -v -tags "sqlite_allow_uri_authority sqlite_app_armor sqlite_column_metadata sqlite_foreign_keys sqlite_fts5 sqlite_icu sqlite_introspect sqlite_json sqlite_math_functions sqlite_preupdate_hook sqlite_secure_delete sqlite_see sqlite_stat4 sqlite_trace sqlite_unlock_notify sqlite_userauth sqlite_vacuum_incr sqlite_vtable"
-        shell: msys2 {0}
-
-      - name: 'Tags: vacuum'
-        run: go build -race -v -tags "sqlite_vacuum_full"
-        shell: msys2 {0}
-
-      - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v2
-        with:
-          env_vars: OS,GO
-          file: coverage.txt
-
-# based on: github.com/koron-go/_skeleton/.github/workflows/go.yml

.travis.yml

@@ -0,0 +1,31 @@
+language: go
+
+os:
+  - linux
+  - osx
+
+addons:
+  apt:
+    update: true
+
+go:
+  - 1.9.x
+  - 1.10.x
+  - 1.11.x
+  - master
+
+before_install:
+  - |
+    if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
+      brew update
+    fi
+  - go get github.com/smartystreets/goconvey
+  - go get github.com/mattn/goveralls
+  - go get golang.org/x/tools/cmd/cover
+
+script:
+  - $HOME/gopath/bin/goveralls -repotoken 3qJVUE0iQwqnCbmNcDsjYu1nh4J4KIFXx
+  - go test -race -v . -tags ""
+  - go test -race -v . -tags "libsqlite3"
+  - go test -race -v . -tags "sqlite_allow_uri_authority sqlite_app_armor sqlite_foreign_keys sqlite_fts5 sqlite_icu sqlite_introspect sqlite_json sqlite_secure_delete sqlite_see sqlite_stat4 sqlite_trace sqlite_userauth sqlite_vacuum_incr sqlite_vtable sqlite_unlock_notify"
+  - go test -race -v . -tags "sqlite_vacuum_full"

README.md

@@ -1,41 +1,30 @@
 go-sqlite3
 ==========
 
-[![Go Reference](https://pkg.go.dev/badge/github.com/mattn/go-sqlite3.svg)](https://pkg.go.dev/github.com/mattn/go-sqlite3)
+[![GoDoc Reference](https://godoc.org/github.com/mattn/go-sqlite3?status.svg)](http://godoc.org/github.com/mattn/go-sqlite3)
-[![GitHub Actions](https://github.com/mattn/go-sqlite3/workflows/Go/badge.svg)](https://github.com/mattn/go-sqlite3/actions?query=workflow%3AGo)
+[![Build Status](https://travis-ci.org/mattn/go-sqlite3.svg?branch=master)](https://travis-ci.org/mattn/go-sqlite3)
-[![Financial Contributors on Open Collective](https://opencollective.com/mattn-go-sqlite3/all/badge.svg?label=financial+contributors)](https://opencollective.com/mattn-go-sqlite3) 
+[![Coverage Status](https://coveralls.io/repos/mattn/go-sqlite3/badge.svg?branch=master)](https://coveralls.io/r/mattn/go-sqlite3?branch=master)
-[![codecov](https://codecov.io/gh/mattn/go-sqlite3/branch/master/graph/badge.svg)](https://codecov.io/gh/mattn/go-sqlite3)
 [![Go Report Card](https://goreportcard.com/badge/github.com/mattn/go-sqlite3)](https://goreportcard.com/report/github.com/mattn/go-sqlite3)
 
-Latest stable version is v1.14 or later, not v2.
-
-~~**NOTE:** The increase to v2 was an accident. There were no major changes or features.~~
-
 # Description
 
-A sqlite3 driver that conforms to the built-in database/sql interface.
+sqlite3 driver conforming to the built-in database/sql interface
 
-Supported Golang version: See [.github/workflows/go.yaml](./.github/workflows/go.yaml).
+Supported Golang version: See .travis.yml
 
-This package follows the official [Golang Release Policy](https://golang.org/doc/devel/release.html#policy).
+[This package follows the official Golang Release Policy.](https://golang.org/doc/devel/release.html#policy)
 
 ### Overview
 
-- [go-sqlite3](#go-sqlite3)
-- [Description](#description)
-    - [Overview](#overview)
 - [Installation](#installation)
 - [API Reference](#api-reference)
 - [Connection String](#connection-string)
-  - [DSN Examples](#dsn-examples)
 - [Features](#features)
-    - [Usage](#usage)
-    - [Feature / Extension List](#feature--extension-list)
 - [Compilation](#compilation)
   - [Android](#android)
-- [ARM](#arm)
+  - [ARM](#arm)
-- [Cross Compile](#cross-compile)
+  - [Cross Compile](#cross-compile)
-- [Google Cloud Platform](#google-cloud-platform)
+  - [Google Cloud Platform](#google-cloud-platform)
   - [Linux](#linux)
     - [Alpine](#alpine)
     - [Fedora](#fedora)
@@ -45,26 +34,15 @@ This package follows the official [Golang Release Policy](https://golang.org/doc
   - [Errors](#errors)
 - [User Authentication](#user-authentication)
   - [Compile](#compile)
-  - [Usage](#usage-1)
+  - [Usage](#usage)
-    - [Create protected database](#create-protected-database)
-    - [Password Encoding](#password-encoding)
-      - [Available Encoders](#available-encoders)
-    - [Restrictions](#restrictions)
-    - [Support](#support)
-    - [User Management](#user-management)
-      - [SQL](#sql)
-        - [Examples](#examples)
-      - [*SQLiteConn](#sqliteconn)
-    - [Attached database](#attached-database)
 - [Extensions](#extensions)
   - [Spatialite](#spatialite)
 - [FAQ](#faq)
 - [License](#license)
-- [Author](#author)
 
 # Installation
 
-This package can be installed with the `go get` command:
+This package can be installed with the go get command:
 
     go get github.com/mattn/go-sqlite3
 
@@ -72,28 +50,28 @@ _go-sqlite3_ is *cgo* package.
 If you want to build your app using go-sqlite3, you need gcc.
 However, after you have built and installed _go-sqlite3_ with `go install github.com/mattn/go-sqlite3` (which requires gcc), you can build your app without relying on gcc in future.
 
-***Important: because this is a `CGO` enabled package, you are required to set the environment variable `CGO_ENABLED=1` and have a `gcc` compile present within your path.***
+***Important: because this is a `CGO` enabled package you are required to set the environment variable `CGO_ENABLED=1` and have a `gcc` compile present within your path.***
 
 # API Reference
 
-API documentation can be found [here](http://godoc.org/github.com/mattn/go-sqlite3).
+API documentation can be found here: http://godoc.org/github.com/mattn/go-sqlite3
 
-Examples can be found under the [examples](./_example) directory.
+Examples can be found under the [examples](./_example) directory
 
 # Connection String
 
 When creating a new SQLite database or connection to an existing one, with the file name additional options can be given.
-This is also known as a DSN (Data Source Name) string.
+This is also known as a DSN string. (Data Source Name).
 
 Options are append after the filename of the SQLite database.
-The database filename and options are separated by an `?` (Question Mark).
+The database filename and options are seperated by an `?` (Question Mark).
 Options should be URL-encoded (see [url.QueryEscape](https://golang.org/pkg/net/url/#QueryEscape)).
 
 This also applies when using an in-memory database instead of a file.
 
 Options can be given using the following format: `KEYWORD=VALUE` and multiple options can be combined with the `&` ampersand.
 
-This library supports DSN options of SQLite itself and provides additional options.
+This library supports dsn options of SQLite itself and provides additional options.
 
 Boolean values can be one of:
 * `0` `no` `false` `off`
@@ -125,8 +103,6 @@ Boolean values can be one of:
 | Time Zone Location | `_loc` | auto | Specify location of time format. |
 | Transaction Lock | `_txlock` | <ul><li>immediate</li><li>deferred</li><li>exclusive</li></ul> | Specify locking behavior for transactions. |
 | Writable Schema | `_writable_schema` | `Boolean` | When this pragma is on, the SQLITE_MASTER tables in which database can be changed using ordinary UPDATE, INSERT, and DELETE statements. Warning: misuse of this pragma can easily result in a corrupt database file. |
-| Cache Size | `_cache_size` | `int` | Maximum cache size; default is 2000K (2M). See [PRAGMA cache_size](https://sqlite.org/pragma.html#pragma_cache_size) |
-
 
 ## DSN Examples
 
@@ -138,18 +114,19 @@ file:test.db?cache=shared&mode=memory
 
 This package allows additional configuration of features available within SQLite3 to be enabled or disabled by golang build constraints also known as build `tags`.
 
-Click [here](https://golang.org/pkg/go/build/#hdr-Build_Constraints) for more information about build tags / constraints.
+[Click here for more information about build tags / constraints.](https://golang.org/pkg/go/build/#hdr-Build_Constraints)
 
 ### Usage
 
-If you wish to build this library with additional extensions / features, use the following command:
+If you wish to build this library with additional extensions / features.
+Use the following command.
 
 ```bash
 go build --tags "<FEATURE>"
 ```
 
-For available features, see the extension list.
+For available features see the extension list.
-When using multiple build tags, all the different tags should be space delimited.
+When using multiple build tags, all the different tags should be space delimted.
 
 Example:
 
@@ -165,7 +142,6 @@ go build --tags "icu json1 fts5 secure_delete"
 | Allow URI Authority | sqlite_allow_uri_authority | URI filenames normally throws an error if the authority section is not either empty or "localhost".<br><br>However, if SQLite is compiled with the SQLITE_ALLOW_URI_AUTHORITY compile-time option, then the URI is converted into a Uniform Naming Convention (UNC) filename and passed down to the underlying operating system that way |
 | App Armor | sqlite_app_armor | When defined, this C-preprocessor macro activates extra code that attempts to detect misuse of the SQLite API, such as passing in NULL pointers to required parameters or using objects after they have been destroyed. <br><br>App Armor is not available under `Windows`. |
 | Disable Load Extensions | sqlite_omit_load_extension | Loading of external extensions is enabled by default.<br><br>To disable extension loading add the build tag `sqlite_omit_load_extension`. |
-| Enable Serialization with `libsqlite3` | sqlite_serialize | Serialization and deserialization of a SQLite database is available by default, unless the build tag `libsqlite3` is set.<br><br>To enable this functionality even if `libsqlite3` is set, add the build tag `sqlite_serialize`. |
 | Foreign Keys | sqlite_foreign_keys | This macro determines whether enforcement of foreign key constraints is enabled or disabled by default for new database connections.<br><br>Each database connection can always turn enforcement of foreign key constraints on and off and run-time using the foreign_keys pragma.<br><br>Enforcement of foreign key constraints is normally off by default, but if this compile-time parameter is set to 1, enforcement of foreign key constraints will be on by default | 
 | Full Auto Vacuum | sqlite_vacuum_full | Set the default auto vacuum to full |
 | Incremental Auto Vacuum | sqlite_vacuum_incr | Set the default auto vacuum to incremental |
@@ -173,20 +149,16 @@ go build --tags "icu json1 fts5 secure_delete"
 |  International Components for Unicode | sqlite_icu | This option causes the International Components for Unicode or "ICU" extension to SQLite to be added to the build |
 | Introspect PRAGMAS | sqlite_introspect | This option adds some extra PRAGMA statements. <ul><li>PRAGMA function_list</li><li>PRAGMA module_list</li><li>PRAGMA pragma_list</li></ul> |
 | JSON SQL Functions | sqlite_json | When this option is defined in the amalgamation, the JSON SQL functions are added to the build automatically |
-| Math Functions | sqlite_math_functions | This compile-time option enables built-in scalar math functions. For more information see [Built-In Mathematical SQL Functions](https://www.sqlite.org/lang_mathfunc.html) |
-| OS Trace | sqlite_os_trace | This option enables OSTRACE() debug logging. This can be verbose and should not be used in production. |
-| Pre Update Hook | sqlite_preupdate_hook | Registers a callback function that is invoked prior to each INSERT, UPDATE, and DELETE operation on a database table. |
 | Secure Delete | sqlite_secure_delete | This compile-time option changes the default setting of the secure_delete pragma.<br><br>When this option is not used, secure_delete defaults to off. When this option is present, secure_delete defaults to on.<br><br>The secure_delete setting causes deleted content to be overwritten with zeros. There is a small performance penalty since additional I/O must occur.<br><br>On the other hand, secure_delete can prevent fragments of sensitive information from lingering in unused parts of the database file after it has been deleted. See the documentation on the secure_delete pragma for additional information |
 | Secure Delete (FAST) | sqlite_secure_delete_fast | For more information see [PRAGMA secure_delete](https://www.sqlite.org/pragma.html#pragma_secure_delete) |
 | Tracing / Debug | sqlite_trace | Activate trace functions |
 | User Authentication | sqlite_userauth | SQLite User Authentication see [User Authentication](#user-authentication) for more information. |
-| Virtual Tables | sqlite_vtable | SQLite Virtual Tables see [SQLite Official VTABLE Documentation](https://www.sqlite.org/vtab.html) for more information, and a [full example here](https://github.com/mattn/go-sqlite3/tree/master/_example/vtable) |
 
 # Compilation
 
-This package requires the `CGO_ENABLED=1` environment variable if not set by default, and the presence of the `gcc` compiler.
+This package requires `CGO_ENABLED=1` ennvironment variable if not set by default, and the presence of the `gcc` compiler.
 
-If you need to add additional CFLAGS or LDFLAGS to the build command, and do not want to modify this package, then this can be achieved by using the `CGO_CFLAGS` and `CGO_LDFLAGS` environment variables.
+If you need to add additional CFLAGS or LDFLAGS to the build command, and do not want to modify this package. Then this can be achieved by  using the `CGO_CFLAGS` and `CGO_LDFLAGS` environment variables.
 
 ## Android
 
@@ -201,7 +173,7 @@ For more information see [#201](https://github.com/mattn/go-sqlite3/issues/201)
 
 # ARM
 
-To compile for `ARM` use the following environment:
+To compile for `ARM` use the following environment.
 
 ```bash
 env CC=arm-linux-gnueabihf-gcc CXX=arm-linux-gnueabihf-g++ \
@@ -219,14 +191,9 @@ This library can be cross-compiled.
 
 In some cases you are required to the `CC` environment variable with the cross compiler.
 
-## Cross Compiling from MAC OSX
+Additional information:
-The simplest way to cross compile from OSX is to use [musl-cross](https://github.com/FiloSottile/homebrew-musl-cross).
+- [#491](https://github.com/mattn/go-sqlite3/issues/491)
-
+- [#560](https://github.com/mattn/go-sqlite3/issues/560)
-Steps:
-- Install [musl-cross](https://github.com/FiloSottile/homebrew-musl-cross) (`brew install FiloSottile/musl-cross/musl-cross`).
-- Run `CC=x86_64-linux-musl-gcc CXX=x86_64-linux-musl-g++ GOARCH=amd64 GOOS=linux CGO_ENABLED=1 go build -ldflags "-linkmode external -extldflags -static"`.
-
-Please refer to the project's [README](https://github.com/FiloSottile/homebrew-musl-cross#readme) for further information.
 
 # Google Cloud Platform
 
@@ -236,7 +203,7 @@ Please work only with compiled final binaries.
 
 ## Linux
 
-To compile this package on Linux, you must install the development tools for your linux distribution.
+To compile this package on Linux you must install the development tools for your linux distribution.
 
 To compile under linux use the build tag `linux`.
 
@@ -252,7 +219,7 @@ go build --tags "libsqlite3 linux"
 
 ### Alpine
 
-When building in an `alpine` container  run the following command before building:
+When building in an `alpine` container run the following command before building.
 
 ```
 apk add --update gcc musl-dev
@@ -272,29 +239,29 @@ sudo apt-get install build-essential
 
 ## Mac OSX
 
-OSX should have all the tools present to compile this package. If not, install XCode to add all the developers tools.
+OSX should have all the tools present to compile this package, if not install XCode this will add all the developers tools.
 
-Required dependency:
+Required dependency
 
 ```bash
 brew install sqlite3
 ```
 
-For OSX, there is an additional package to install which is required if you wish to build the `icu` extension.
+For OSX there is an additional package install which is required if you whish to build the `icu` extension.
 
-This additional package can be installed with `homebrew`:
+This additional package can be installed with `homebrew`.
 
 ```bash
 brew upgrade icu4c
 ```
 
-To compile for Mac OSX:
+To compile for Mac OSX.
 
 ```bash
 go build --tags "darwin"
 ```
 
-If you wish to link directly to libsqlite3, use the `libsqlite3` build tag:
+If you wish to link directly to libsqlite3 then you can use the `libsqlite3` build tag.
 
 ```
 go build --tags "libsqlite3 darwin"
@@ -306,14 +273,14 @@ Additional information:
 
 ## Windows
 
-To compile this package on Windows, you must have the `gcc` compiler installed.
+To compile this package on Windows OS you must have the `gcc` compiler installed.
 
 1) Install a Windows `gcc` toolchain.
-2) Add the `bin` folder to the Windows path, if the installer did not do this by default.
+2) Add the `bin` folders to the Windows path if the installer did not do this by default.
-3) Open a terminal for the TDM-GCC toolchain, which can be found in the Windows Start menu.
+3) Open a terminal for the TDM-GCC toolchain, can be found in the Windows Start menu.
 4) Navigate to your project folder and run the `go build ...` command for this package.
 
-For example the TDM-GCC Toolchain can be found [here](https://jmeubank.github.io/tdm-gcc/).
+For example the TDM-GCC Toolchain can be found [here](https://sourceforge.net/projects/tdm-gcc/).
 
 ## Errors
 
@@ -351,28 +318,28 @@ This package supports the SQLite User Authentication module.
 
 ## Compile
 
-To use the User authentication module, the package has to be compiled with the tag `sqlite_userauth`. See [Features](#features).
+To use the User authentication module the package has to be compiled with the tag `sqlite_userauth`. See [Features](#features).
 
 ## Usage
 
 ### Create protected database
 
-To create a database protected by user authentication, provide the following argument to the connection string `_auth`.
+To create a database protected by user authentication provide the following argument to the connection string `_auth`.
 This will enable user authentication within the database. This option however requires two additional arguments:
 
 - `_auth_user`
 - `_auth_pass`
 
-When `_auth` is present in the connection string user authentication will be enabled and the provided user will be created
+When `_auth` is present on the connection string user authentication will be enabled and the provided user will be created
 as an `admin` user. After initial creation, the parameter `_auth` has no effect anymore and can be omitted from the connection string.
 
-Example connection strings:
+Example connection string:
 
-Create an user authentication database with user `admin` and password `admin`:
+Create an user authentication database with user `admin` and password `admin`.
 
 `file:test.s3db?_auth&_auth_user=admin&_auth_pass=admin`
 
-Create an user authentication database with user `admin` and password `admin` and use `SHA1` for the password encoding:
+Create an user authentication database with user `admin` and password `admin` and use `SHA1` for the password encoding.
 
 `file:test.s3db?_auth&_auth_user=admin&_auth_pass=admin&_auth_crypt=sha1`
 
@@ -398,11 +365,11 @@ salt this can be configured with `_auth_salt`.
 
 ### Restrictions
 
-Operations on the database regarding user management can only be preformed by an administrator user.
+Operations on the database regarding to user management can only be preformed by an administrator user.
 
 ### Support
 
-The user authentication supports two kinds of users:
+The user authentication supports two kinds of users
 
 - administrators
 - regular users
@@ -413,7 +380,7 @@ User management can be done by directly using the `*SQLiteConn` or by SQL.
 
 #### SQL
 
-The following sql functions are available for user management:
+The following sql functions are available for user management.
 
 | Function | Arguments | Description |
 |----------|-----------|-------------|
@@ -422,7 +389,7 @@ The following sql functions are available for user management:
 | `auth_user_change` | username `string`, password `string`, admin `int` | Function to modify an user. Users can change their own password, but only an administrator can change the administrator flag. |
 | `authUserDelete` | username `string` | Delete an user from the database. Can only be used by an administrator. The current logged in administrator cannot be deleted. This is to make sure their is always an administrator remaining. |
 
-These functions will return an integer:
+These functions will return an integer.
 
 - 0 (SQLITE_OK)
 - 23 (SQLITE_AUTH) Failed to perform due to authentication or insufficient privileges
@@ -443,7 +410,7 @@ SELECT user_delete('user');
 
 #### *SQLiteConn
 
-The following functions are available for User authentication from the `*SQLiteConn`:
+The following functions are available for User authentication from the `*SQLiteConn`.
 
 | Function | Description |
 |----------|-------------|
@@ -454,26 +421,16 @@ The following functions are available for User authentication from the `*SQLiteC
 
 ### Attached database
 
-When using attached databases, SQLite will use the authentication from the `main` database for the attached database(s).
+When using attached databases. SQLite will use the authentication from the `main` database for the attached database(s).
 
 # Extensions
 
-If you want your own extension to be listed here, or you want to add a reference to an extension; please submit an Issue for this.
+If you want your own extension to be listed here or you want to add a reference to an extension; please submit an Issue for this.
 
 ## Spatialite
 
 Spatialite is available as an extension to SQLite, and can be used in combination with this repository.
-For an example, see [shaxbee/go-spatialite](https://github.com/shaxbee/go-spatialite).
+For an example see [shaxbee/go-spatialite](https://github.com/shaxbee/go-spatialite).
-
-## extension-functions.c from SQLite3 Contrib
-
-extension-functions.c is available as an extension to SQLite, and provides the following functions:
-
-- Math: acos, asin, atan, atn2, atan2, acosh, asinh, atanh, difference, degrees, radians, cos, sin, tan, cot, cosh, sinh, tanh, coth, exp, log, log10, power, sign, sqrt, square, ceil, floor, pi.
-- String: replicate, charindex, leftstr, rightstr, ltrim, rtrim, trim, replace, reverse, proper, padl, padr, padc, strfilter.
-- Aggregate: stdev, variance, mode, median, lower_quartile, upper_quartile
-
-For an example, see [dinedal/go-sqlite3-extension-functions](https://github.com/dinedal/go-sqlite3-extension-functions).
 
 # FAQ
 
@@ -493,44 +450,40 @@ For an example, see [dinedal/go-sqlite3-extension-functions](https://github.com/
 
 - Can I use this in multiple routines concurrently?
 
-    Yes for readonly. But not for writable. See [#50](https://github.com/mattn/go-sqlite3/issues/50), [#51](https://github.com/mattn/go-sqlite3/issues/51), [#209](https://github.com/mattn/go-sqlite3/issues/209), [#274](https://github.com/mattn/go-sqlite3/issues/274).
+    Yes for readonly. But, No for writable. See [#50](https://github.com/mattn/go-sqlite3/issues/50), [#51](https://github.com/mattn/go-sqlite3/issues/51), [#209](https://github.com/mattn/go-sqlite3/issues/209), [#274](https://github.com/mattn/go-sqlite3/issues/274).
 
 - Why I'm getting `no such table` error?
 
     Why is it racy if I use a `sql.Open("sqlite3", ":memory:")` database?
 
-    Each connection to `":memory:"` opens a brand new in-memory sql database, so if
+    Each connection to :memory: opens a brand new in-memory sql database, so if
     the stdlib's sql engine happens to open another connection and you've only
-    specified `":memory:"`, that connection will see a brand new database. A
+    specified ":memory:", that connection will see a brand new database. A
-    workaround is to use `"file::memory:?cache=shared"` (or `"file:foobar?mode=memory&cache=shared"`). Every
+    workaround is to use "file::memory:?mode=memory&cache=shared". Every
     connection to this string will point to the same in-memory database. 
     
-    Note that if the last database connection in the pool closes, the in-memory database is deleted. Make sure the [max idle connection limit](https://golang.org/pkg/database/sql/#DB.SetMaxIdleConns) is > 0, and the [connection lifetime](https://golang.org/pkg/database/sql/#DB.SetConnMaxLifetime) is infinite.
+    For more information see
-    
-    For more information see:
     * [#204](https://github.com/mattn/go-sqlite3/issues/204)
     * [#511](https://github.com/mattn/go-sqlite3/issues/511)
-    * https://www.sqlite.org/sharedcache.html#shared_cache_and_in_memory_databases
-    * https://www.sqlite.org/inmemorydb.html#sharedmemdb
 
 - Reading from database with large amount of goroutines fails on OSX.
 
     OS X limits OS-wide to not have more than 1000 files open simultaneously by default.
 
-    For more information, see [#289](https://github.com/mattn/go-sqlite3/issues/289)
+    For more information see [#289](https://github.com/mattn/go-sqlite3/issues/289)
 
 - Trying to execute a `.` (dot) command throws an error.
 
     Error: `Error: near ".": syntax error`
-    Dot command are part of SQLite3 CLI, not of this library.
+    Dot command are part of SQLite3 CLI not of this library.
 
     You need to implement the feature or call the sqlite3 cli.
 
-    More information see [#305](https://github.com/mattn/go-sqlite3/issues/305).
+    More infomation see [#305](https://github.com/mattn/go-sqlite3/issues/305)
 
 - Error: `database is locked`
 
-    When you get a database is locked, please use the following options.
+    When you get a database is locked. Please use the following options.
 
     Add to DSN: `cache=shared`
 
@@ -539,43 +492,13 @@ For an example, see [dinedal/go-sqlite3-extension-functions](https://github.com/
     db, err := sql.Open("sqlite3", "file:locked.sqlite?cache=shared")
     ```
 
-    Next, please set the database connections of the SQL package to 1:
+    Second please set the database connections of the SQL package to 1.
     
     ```go
     db.SetMaxOpenConns(1)
     ```
 
-    For more information, see [#209](https://github.com/mattn/go-sqlite3/issues/209).
+    More information see [#209](https://github.com/mattn/go-sqlite3/issues/209)
-
-## Contributors
-
-### Code Contributors
-
-This project exists thanks to all the people who [[contribute](CONTRIBUTING.md)].
-<a href="https://github.com/mattn/go-sqlite3/graphs/contributors"><img src="https://opencollective.com/mattn-go-sqlite3/contributors.svg?width=890&button=false" /></a>
-
-### Financial Contributors
-
-Become a financial contributor and help us sustain our community. [[Contribute here](https://opencollective.com/mattn-go-sqlite3/contribute)].
-
-#### Individuals
-
-<a href="https://opencollective.com/mattn-go-sqlite3"><img src="https://opencollective.com/mattn-go-sqlite3/individuals.svg?width=890"></a>
-
-#### Organizations
-
-Support this project with your organization. Your logo will show up here with a link to your website. [[Contribute](https://opencollective.com/mattn-go-sqlite3/contribute)]
-
-<a href="https://opencollective.com/mattn-go-sqlite3/organization/0/website"><img src="https://opencollective.com/mattn-go-sqlite3/organization/0/avatar.svg"></a>
-<a href="https://opencollective.com/mattn-go-sqlite3/organization/1/website"><img src="https://opencollective.com/mattn-go-sqlite3/organization/1/avatar.svg"></a>
-<a href="https://opencollective.com/mattn-go-sqlite3/organization/2/website"><img src="https://opencollective.com/mattn-go-sqlite3/organization/2/avatar.svg"></a>
-<a href="https://opencollective.com/mattn-go-sqlite3/organization/3/website"><img src="https://opencollective.com/mattn-go-sqlite3/organization/3/avatar.svg"></a>
-<a href="https://opencollective.com/mattn-go-sqlite3/organization/4/website"><img src="https://opencollective.com/mattn-go-sqlite3/organization/4/avatar.svg"></a>
-<a href="https://opencollective.com/mattn-go-sqlite3/organization/5/website"><img src="https://opencollective.com/mattn-go-sqlite3/organization/5/avatar.svg"></a>
-<a href="https://opencollective.com/mattn-go-sqlite3/organization/6/website"><img src="https://opencollective.com/mattn-go-sqlite3/organization/6/avatar.svg"></a>
-<a href="https://opencollective.com/mattn-go-sqlite3/organization/7/website"><img src="https://opencollective.com/mattn-go-sqlite3/organization/7/avatar.svg"></a>
-<a href="https://opencollective.com/mattn-go-sqlite3/organization/8/website"><img src="https://opencollective.com/mattn-go-sqlite3/organization/8/avatar.svg"></a>
-<a href="https://opencollective.com/mattn-go-sqlite3/organization/9/website"><img src="https://opencollective.com/mattn-go-sqlite3/organization/9/avatar.svg"></a>
 
 # License
 

_example/custom_driver_name/Makefile

@@ -1,12 +0,0 @@
-TARGET = custom_driver_name
-ifeq ($(OS),Windows_NT)
-TARGET := $(TARGET).exe
-endif
-
-all : $(TARGET)
-
-$(TARGET) : main.go
-	go build -ldflags="-X 'github.com/mattn/go-sqlite3.driverName=my-sqlite3'"
-
-clean :
-	rm -f $(TARGET)

_example/custom_driver_name/main.go

@@ -1,13 +0,0 @@
-package main
-
-import (
-	"database/sql"
-
-	_ "github.com/mattn/go-sqlite3"
-)
-
-func main() {
-	for _, driver := range sql.Drivers() {
-		println(driver)
-	}
-}

_example/fuzz/fuzz_openexec.go

@@ -1,30 +0,0 @@
-package sqlite3_fuzz
-
-import (
-	"bytes"
-	"database/sql"
-	"io/ioutil"
-
-	_ "github.com/mattn/go-sqlite3"
-)
-
-func FuzzOpenExec(data []byte) int {
-	sep := bytes.IndexByte(data, 0)
-	if sep <= 0 {
-		return 0
-	}
-	err := ioutil.WriteFile("/tmp/fuzz.db", data[sep+1:], 0644)
-	if err != nil {
-		return 0
-	}
-	db, err := sql.Open("sqlite3", "/tmp/fuzz.db")
-	if err != nil {
-		return 0
-	}
-	defer db.Close()
-	_, err = db.Exec(string(data[:sep-1]))
-	if err != nil {
-		return 0
-	}
-	return 1
-}

_example/limit/limit.go

@@ -17,7 +17,7 @@ func createBulkInsertQuery(n int, start int) (query string, args []interface{})
 	for i := 0; i < n; i++ {
 		values[i] = "(?, ?)"
 		args[pos] = start + i
-		args[pos+1] = fmt.Sprintf("こんにちは世界%03d", i)
+		args[pos+1] = fmt.Sprintf("こんにちわ世界%03d", i)
 		pos += 2
 	}
 	query = fmt.Sprintf(
@@ -27,7 +27,7 @@ func createBulkInsertQuery(n int, start int) (query string, args []interface{})
 	return
 }
 
-func bulkInsert(db *sql.DB, query string, args []interface{}) (err error) {
+func bukInsert(db *sql.DB, query string, args []interface{}) (err error) {
 	stmt, err := db.Prepare(query)
 	if err != nil {
 		return
@@ -76,7 +76,7 @@ func main() {
 
 	num := 400
 	query, args := createBulkInsertQuery(num, 0)
-	err = bulkInsert(db, query, args)
+	err = bukInsert(db, query, args)
 	if err != nil {
 		log.Fatal(err)
 	}
@@ -88,7 +88,7 @@ func main() {
 	log.Printf("updated SQLITE_LIMIT_VARIABLE_NUMBER: %d", limitVariableNumber)
 
 	query, args = createBulkInsertQuery(num, num)
-	err = bulkInsert(db, query, args)
+	err = bukInsert(db, query, args)
 	if err != nil {
 		if err != nil {
 			log.Printf("expect failed since SQLITE_LIMIT_VARIABLE_NUMBER is too small: %v", err)
@@ -102,7 +102,7 @@ func main() {
 	log.Printf("updated SQLITE_LIMIT_VARIABLE_NUMBER: %d", limitVariableNumber)
 
 	query, args = createBulkInsertQuery(500, num+num)
-	err = bulkInsert(db, query, args)
+	err = bukInsert(db, query, args)
 	if err != nil {
 		if err != nil {
 			log.Fatal(err)

_example/mod_regexp/Makefile

@@ -1,27 +1,22 @@
 ifeq ($(OS),Windows_NT)
 EXE=extension.exe
-LIB_EXT=dll
+EXT=sqlite3_mod_regexp.dll
 RM=cmd /c del
 LDFLAG=
 else
 EXE=extension
-ifeq ($(shell uname -s),Darwin)
+EXT=sqlite3_mod_regexp.so
-LIB_EXT=dylib
+RM=rm
-else
-LIB_EXT=so
-endif
-RM=rm -f
 LDFLAG=-fPIC
 endif
-LIB=sqlite3_mod_regexp.$(LIB_EXT)
 
-all : $(EXE) $(LIB)
+all : $(EXE) $(EXT)
 
 $(EXE) : extension.go
 	go build $<
 
-$(LIB) : sqlite3_mod_regexp.c
+$(EXT) : sqlite3_mod_regexp.c
 	gcc $(LDFLAG) -shared -o $@ $< -lsqlite3 -lpcre
 
 clean :
-	@-$(RM) $(EXE) $(LIB)
+	@-$(RM) $(EXE) $(EXT)

_example/mod_regexp/sqlite3_mod_regexp.c

@@ -13,13 +13,9 @@ static void regexp_func(sqlite3_context *context, int argc, sqlite3_value **argv
     int vec[500];
     int n, rc;
     pcre* re = pcre_compile(pattern, 0, &errstr, &erroff, NULL);
-    if (!re) {
-      sqlite3_result_error(context, errstr, 0);
-      return;
-    }
     rc = pcre_exec(re, NULL, target, strlen(target), 0, 0, vec, 500); 
     if (rc <= 0) {
-      sqlite3_result_int(context, 0);
+      sqlite3_result_error(context, errstr, 0);
       return;
     }
     sqlite3_result_int(context, 1);

_example/mod_vtable/Makefile

@@ -1,29 +1,24 @@
 ifeq ($(OS),Windows_NT)
 EXE=extension.exe
-LIB_EXT=dll
+EXT=sqlite3_mod_vtable.dll
 RM=cmd /c del
 LIBCURL=-lcurldll
 LDFLAG=
 else
 EXE=extension
-ifeq ($(shell uname -s),Darwin)
+EXT=sqlite3_mod_vtable.so
-LIB_EXT=dylib
+RM=rm
-else
-LIB_EXT=so
-endif
-RM=rm -f
 LDFLAG=-fPIC
 LIBCURL=-lcurl
 endif
-LIB=sqlite3_mod_vtable.$(LIB_EXT)
 
-all : $(EXE) $(LIB)
+all : $(EXE) $(EXT)
 
 $(EXE) : extension.go
 	go build $<
 
-$(LIB) : sqlite3_mod_vtable.cc
+$(EXT) : sqlite3_mod_vtable.cc
 	g++ $(LDFLAG) -shared -o $@ $< -lsqlite3 $(LIBCURL)
 
 clean :
-	@-$(RM) $(EXE) $(LIB)
+	@-$(RM) $(EXE) $(EXT)

_example/mod_vtable/sqlite3_mod_vtable.cc

@@ -1,6 +1,6 @@
 #include <string>
 #include <sstream>
-#include <sqlite3.h>
+#include <sqlite3-binding.h>
 #include <sqlite3ext.h>
 #include <curl/curl.h>
 #include "picojson.h"

_example/simple/Dockerfile

@@ -1,45 +0,0 @@
-# =============================================================================
-#  Multi-stage Dockerfile Example
-# =============================================================================
-#  This is a simple Dockerfile that will build an image of scratch-base image.
-#  Usage:
-#    docker build -t simple:local . && docker run --rm simple:local
-# =============================================================================
-
-# -----------------------------------------------------------------------------
-#  Build Stage
-# -----------------------------------------------------------------------------
-FROM golang:alpine AS build
-
-# Important:
-#   Because this is a CGO enabled package, you are required to set it as 1.
-ENV CGO_ENABLED=1
-
-RUN apk add --no-cache \
-    # Important: required for go-sqlite3
-    gcc \
-    # Required for Alpine
-    musl-dev
-
-WORKDIR /workspace
-
-COPY . /workspace/
-
-RUN \
-    go mod init github.com/mattn/sample && \
-    go mod tidy && \
-    go install -ldflags='-s -w -extldflags "-static"' ./simple.go
-
-RUN \
-    # Smoke test
-    set -o pipefail; \
-    /go/bin/simple | grep 99\ こんにちは世界099
-
-# -----------------------------------------------------------------------------
-#  Main Stage
-# -----------------------------------------------------------------------------
-FROM scratch
-
-COPY --from=build /go/bin/simple /usr/local/bin/simple
-
-ENTRYPOINT [ "/usr/local/bin/simple" ]

_example/simple/simple.go

@@ -37,15 +37,12 @@ func main() {
 	}
 	defer stmt.Close()
 	for i := 0; i < 100; i++ {
-		_, err = stmt.Exec(i, fmt.Sprintf("こんにちは世界%03d", i))
+		_, err = stmt.Exec(i, fmt.Sprintf("こんにちわ世界%03d", i))
 		if err != nil {
 			log.Fatal(err)
 		}
 	}
-	err = tx.Commit()
+	tx.Commit()
-	if err != nil {
-		log.Fatal(err)
-	}
 
 	rows, err := db.Query("select id, name from foo")
 	if err != nil {

_example/vtable/vtable.go

@@ -63,12 +63,7 @@ func (v *ghRepoTable) Open() (sqlite3.VTabCursor, error) {
 }
 
 func (v *ghRepoTable) BestIndex(cst []sqlite3.InfoConstraint, ob []sqlite3.InfoOrderBy) (*sqlite3.IndexResult, error) {
-	used := make([]bool, len(csts))
+	return &sqlite3.IndexResult{}, nil
-	return &sqlite3.IndexResult{
-		IdxNum: 0,
-		IdxStr: "default",
-		Used:   used,
-	}, nil
 }
 
 func (v *ghRepoTable) Disconnect() error { return nil }

_example/vtable_eponymous_only/main.go

@@ -1,33 +0,0 @@
-package main
-
-import (
-	"database/sql"
-	"fmt"
-	"log"
-
-	"github.com/mattn/go-sqlite3"
-)
-
-func main() {
-	sql.Register("sqlite3_with_extensions", &sqlite3.SQLiteDriver{
-		ConnectHook: func(conn *sqlite3.SQLiteConn) error {
-			return conn.CreateModule("series", &seriesModule{})
-		},
-	})
-	db, err := sql.Open("sqlite3_with_extensions", ":memory:")
-	if err != nil {
-		log.Fatal(err)
-	}
-	defer db.Close()
-
-	rows, err := db.Query("select * from series")
-	if err != nil {
-		log.Fatal(err)
-	}
-	defer rows.Close()
-	for rows.Next() {
-		var value int
-		rows.Scan(&value)
-		fmt.Printf("value: %d\n", value)
-	}
-}

_example/vtable_eponymous_only/vtable.go

@@ -1,118 +0,0 @@
-package main
-
-import (
-	"fmt"
-
-	"github.com/mattn/go-sqlite3"
-)
-
-type seriesModule struct{}
-
-func (m *seriesModule) EponymousOnlyModule() {}
-
-func (m *seriesModule) Create(c *sqlite3.SQLiteConn, args []string) (sqlite3.VTab, error) {
-	err := c.DeclareVTab(fmt.Sprintf(`
-		CREATE TABLE %s (
-			value INT,
-			start HIDDEN,
-			stop HIDDEN,
-			step HIDDEN
-		)`, args[0]))
-	if err != nil {
-		return nil, err
-	}
-	return &seriesTable{0, 0, 1}, nil
-}
-
-func (m *seriesModule) Connect(c *sqlite3.SQLiteConn, args []string) (sqlite3.VTab, error) {
-	return m.Create(c, args)
-}
-
-func (m *seriesModule) DestroyModule() {}
-
-type seriesTable struct {
-	start int64
-	stop  int64
-	step  int64
-}
-
-func (v *seriesTable) Open() (sqlite3.VTabCursor, error) {
-	return &seriesCursor{v, 0}, nil
-}
-
-func (v *seriesTable) BestIndex(csts []sqlite3.InfoConstraint, ob []sqlite3.InfoOrderBy) (*sqlite3.IndexResult, error) {
-	used := make([]bool, len(csts))
-	for c, cst := range csts {
-		if cst.Usable && cst.Op == sqlite3.OpEQ {
-			used[c] = true
-		}
-	}
-
-	return &sqlite3.IndexResult{
-		IdxNum: 0,
-		IdxStr: "default",
-		Used:   used,
-	}, nil
-}
-
-func (v *seriesTable) Disconnect() error { return nil }
-func (v *seriesTable) Destroy() error    { return nil }
-
-type seriesCursor struct {
-	*seriesTable
-	value int64
-}
-
-func (vc *seriesCursor) Column(c *sqlite3.SQLiteContext, col int) error {
-	switch col {
-	case 0:
-		c.ResultInt64(vc.value)
-	case 1:
-		c.ResultInt64(vc.seriesTable.start)
-	case 2:
-		c.ResultInt64(vc.seriesTable.stop)
-	case 3:
-		c.ResultInt64(vc.seriesTable.step)
-	}
-	return nil
-}
-
-func (vc *seriesCursor) Filter(idxNum int, idxStr string, vals []interface{}) error {
-	switch {
-	case len(vals) < 1:
-		vc.seriesTable.start = 0
-		vc.seriesTable.stop = 1000
-		vc.value = vc.seriesTable.start
-	case len(vals) < 2:
-		vc.seriesTable.start = vals[0].(int64)
-		vc.seriesTable.stop = 1000
-		vc.value = vc.seriesTable.start
-	case len(vals) < 3:
-		vc.seriesTable.start = vals[0].(int64)
-		vc.seriesTable.stop = vals[1].(int64)
-		vc.value = vc.seriesTable.start
-	case len(vals) < 4:
-		vc.seriesTable.start = vals[0].(int64)
-		vc.seriesTable.stop = vals[1].(int64)
-		vc.seriesTable.step = vals[2].(int64)
-	}
-
-	return nil
-}
-
-func (vc *seriesCursor) Next() error {
-	vc.value += vc.step
-	return nil
-}
-
-func (vc *seriesCursor) EOF() bool {
-	return vc.value > vc.stop
-}
-
-func (vc *seriesCursor) Rowid() (int64, error) {
-	return int64(vc.value), nil
-}
-
-func (vc *seriesCursor) Close() error {
-	return nil
-}

backup.go

@@ -1,4 +1,4 @@
-// Copyright (C) 2019 Yasuhiro Matsumoto <mattn.jp@gmail.com>.
+// Copyright (C) 2014 Yasuhiro Matsumoto <mattn.jp@gmail.com>.
 //
 // Use of this source code is governed by an MIT-style
 // license that can be found in the LICENSE file.
@@ -7,7 +7,7 @@ package sqlite3
 
 /*
 #ifndef USE_LIBSQLITE3
-#include "sqlite3-binding.h"
+#include <sqlite3-binding.h>
 #else
 #include <sqlite3.h>
 #endif
@@ -25,18 +25,18 @@ type SQLiteBackup struct {
 }
 
 // Backup make backup from src to dest.
-func (destConn *SQLiteConn) Backup(dest string, srcConn *SQLiteConn, src string) (*SQLiteBackup, error) {
+func (c *SQLiteConn) Backup(dest string, conn *SQLiteConn, src string) (*SQLiteBackup, error) {
 	destptr := C.CString(dest)
 	defer C.free(unsafe.Pointer(destptr))
 	srcptr := C.CString(src)
 	defer C.free(unsafe.Pointer(srcptr))
 
-	if b := C.sqlite3_backup_init(destConn.db, destptr, srcConn.db, srcptr); b != nil {
+	if b := C.sqlite3_backup_init(c.db, destptr, conn.db, srcptr); b != nil {
 		bb := &SQLiteBackup{b: b}
 		runtime.SetFinalizer(bb, (*SQLiteBackup).Finish)
 		return bb, nil
 	}
-	return nil, destConn.lastError()
+	return nil, c.lastError()
 }
 
 // Step to backs up for one step. Calls the underlying `sqlite3_backup_step`

backup_test.go

@@ -1,10 +1,6 @@
-// Copyright (C) 2019 Yasuhiro Matsumoto <mattn.jp@gmail.com>.
-//
 // Use of this source code is governed by an MIT-style
 // license that can be found in the LICENSE file.
 
-// +build cgo
-
 package sqlite3
 
 import (

callback.go

@@ -1,4 +1,4 @@
-// Copyright (C) 2019 Yasuhiro Matsumoto <mattn.jp@gmail.com>.
+// Copyright (C) 2014 Yasuhiro Matsumoto <mattn.jp@gmail.com>.
 //
 // Use of this source code is governed by an MIT-style
 // license that can be found in the LICENSE file.
@@ -12,7 +12,7 @@ package sqlite3
 
 /*
 #ifndef USE_LIBSQLITE3
-#include "sqlite3-binding.h"
+#include <sqlite3-binding.h>
 #else
 #include <sqlite3.h>
 #endif
@@ -35,97 +35,86 @@ import (
 //export callbackTrampoline
 func callbackTrampoline(ctx *C.sqlite3_context, argc int, argv **C.sqlite3_value) {
 	args := (*[(math.MaxInt32 - 1) / unsafe.Sizeof((*C.sqlite3_value)(nil))]*C.sqlite3_value)(unsafe.Pointer(argv))[:argc:argc]
-	fi := lookupHandle(C.sqlite3_user_data(ctx)).(*functionInfo)
+	fi := lookupHandle(uintptr(C.sqlite3_user_data(ctx))).(*functionInfo)
 	fi.Call(ctx, args)
 }
 
 //export stepTrampoline
 func stepTrampoline(ctx *C.sqlite3_context, argc C.int, argv **C.sqlite3_value) {
 	args := (*[(math.MaxInt32 - 1) / unsafe.Sizeof((*C.sqlite3_value)(nil))]*C.sqlite3_value)(unsafe.Pointer(argv))[:int(argc):int(argc)]
-	ai := lookupHandle(C.sqlite3_user_data(ctx)).(*aggInfo)
+	ai := lookupHandle(uintptr(C.sqlite3_user_data(ctx))).(*aggInfo)
 	ai.Step(ctx, args)
 }
 
 //export doneTrampoline
 func doneTrampoline(ctx *C.sqlite3_context) {
-	ai := lookupHandle(C.sqlite3_user_data(ctx)).(*aggInfo)
+	handle := uintptr(C.sqlite3_user_data(ctx))
+	ai := lookupHandle(handle).(*aggInfo)
 	ai.Done(ctx)
 }
 
 //export compareTrampoline
-func compareTrampoline(handlePtr unsafe.Pointer, la C.int, a *C.char, lb C.int, b *C.char) C.int {
+func compareTrampoline(handlePtr uintptr, la C.int, a *C.char, lb C.int, b *C.char) C.int {
 	cmp := lookupHandle(handlePtr).(func(string, string) int)
 	return C.int(cmp(C.GoStringN(a, la), C.GoStringN(b, lb)))
 }
 
 //export commitHookTrampoline
-func commitHookTrampoline(handle unsafe.Pointer) int {
+func commitHookTrampoline(handle uintptr) int {
 	callback := lookupHandle(handle).(func() int)
 	return callback()
 }
 
 //export rollbackHookTrampoline
-func rollbackHookTrampoline(handle unsafe.Pointer) {
+func rollbackHookTrampoline(handle uintptr) {
 	callback := lookupHandle(handle).(func())
 	callback()
 }
 
 //export updateHookTrampoline
-func updateHookTrampoline(handle unsafe.Pointer, op int, db *C.char, table *C.char, rowid int64) {
+func updateHookTrampoline(handle uintptr, op int, db *C.char, table *C.char, rowid int64) {
 	callback := lookupHandle(handle).(func(int, string, string, int64))
 	callback(op, C.GoString(db), C.GoString(table), rowid)
 }
 
 //export authorizerTrampoline
-func authorizerTrampoline(handle unsafe.Pointer, op int, arg1 *C.char, arg2 *C.char, arg3 *C.char) int {
+func authorizerTrampoline(handle uintptr, op int, arg1 *C.char, arg2 *C.char, arg3 *C.char) int {
 	callback := lookupHandle(handle).(func(int, string, string, string) int)
 	return callback(op, C.GoString(arg1), C.GoString(arg2), C.GoString(arg3))
 }
 
-//export preUpdateHookTrampoline
-func preUpdateHookTrampoline(handle unsafe.Pointer, dbHandle uintptr, op int, db *C.char, table *C.char, oldrowid int64, newrowid int64) {
-	hval := lookupHandleVal(handle)
-	data := SQLitePreUpdateData{
-		Conn:         hval.db,
-		Op:           op,
-		DatabaseName: C.GoString(db),
-		TableName:    C.GoString(table),
-		OldRowID:     oldrowid,
-		NewRowID:     newrowid,
-	}
-	callback := hval.val.(func(SQLitePreUpdateData))
-	callback(data)
-}
-
 // Use handles to avoid passing Go pointers to C.
+
 type handleVal struct {
 	db  *SQLiteConn
 	val interface{}
 }
 
 var handleLock sync.Mutex
-var handleVals = make(map[unsafe.Pointer]handleVal)
+var handleVals = make(map[uintptr]handleVal)
+var handleIndex uintptr = 100
 
-func newHandle(db *SQLiteConn, v interface{}) unsafe.Pointer {
+func newHandle(db *SQLiteConn, v interface{}) uintptr {
 	handleLock.Lock()
 	defer handleLock.Unlock()
-	val := handleVal{db: db, val: v}
+	i := handleIndex
-	var p unsafe.Pointer = C.malloc(C.size_t(1))
+	handleIndex++
-	if p == nil {
+	handleVals[i] = handleVal{db, v}
-		panic("can't allocate 'cgo-pointer hack index pointer': ptr == nil")
+	return i
+}
+
+func lookupHandle(handle uintptr) interface{} {
+	handleLock.Lock()
+	defer handleLock.Unlock()
+	r, ok := handleVals[handle]
+	if !ok {
+		if handle >= 100 && handle < handleIndex {
+			panic("deleted handle")
+		} else {
+			panic("invalid handle")
+		}
 	}
-	handleVals[p] = val
+	return r.val
-	return p
-}
-
-func lookupHandleVal(handle unsafe.Pointer) handleVal {
-	handleLock.Lock()
-	defer handleLock.Unlock()
-	return handleVals[handle]
-}
-
-func lookupHandle(handle unsafe.Pointer) interface{} {
-	return lookupHandleVal(handle).val
 }
 
 func deleteHandles(db *SQLiteConn) {
@@ -134,7 +123,6 @@ func deleteHandles(db *SQLiteConn) {
 	for handle, val := range handleVals {
 		if val.db == db {
 			delete(handleVals, handle)
-			C.free(handle)
 		}
 	}
 }
@@ -353,20 +341,6 @@ func callbackRetNil(ctx *C.sqlite3_context, v reflect.Value) error {
 	return nil
 }
 
-func callbackRetGeneric(ctx *C.sqlite3_context, v reflect.Value) error {
-	if v.IsNil() {
-		C.sqlite3_result_null(ctx)
-		return nil
-	}
-
-	cb, err := callbackRet(v.Elem().Type())
-        if err != nil {
-                return err
-        }
-
-        return cb(ctx, v.Elem())
-}
-
 func callbackRet(typ reflect.Type) (callbackRetConverter, error) {
 	switch typ.Kind() {
 	case reflect.Interface:
@@ -374,11 +348,6 @@ func callbackRet(typ reflect.Type) (callbackRetConverter, error) {
 		if typ.Implements(errorInterface) {
 			return callbackRetNil, nil
 		}
-
-		if typ.NumMethod() == 0 {
-			return callbackRetGeneric, nil
-		}
-
 		fallthrough
 	case reflect.Slice:
 		if typ.Elem().Kind() != reflect.Uint8 {

callback_test.go

@@ -1,10 +1,3 @@
-// Copyright (C) 2019 Yasuhiro Matsumoto <mattn.jp@gmail.com>.
-//
-// Use of this source code is governed by an MIT-style
-// license that can be found in the LICENSE file.
-
-// +build cgo
-
 package sqlite3
 
 import (
@@ -102,15 +95,3 @@ func TestCallbackConverters(t *testing.T) {
 		}
 	}
 }
-
-func TestCallbackReturnAny(t *testing.T) {
-	udf := func() interface{} {
-		return 1
-	}
-
-	typ := reflect.TypeOf(udf)
-	_, err := callbackRet(typ.Out(0))
-	if err != nil {
-		t.Errorf("Expected valid callback for any return type, got: %s", err)
-	}
-}

convert.go

@@ -1,299 +0,0 @@
-// Extracted from Go database/sql source code
-
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Type conversions for Scan.
-
-package sqlite3
-
-import (
-	"database/sql"
-	"database/sql/driver"
-	"errors"
-	"fmt"
-	"reflect"
-	"strconv"
-	"time"
-)
-
-var errNilPtr = errors.New("destination pointer is nil") // embedded in descriptive error
-
-// convertAssign copies to dest the value in src, converting it if possible.
-// An error is returned if the copy would result in loss of information.
-// dest should be a pointer type.
-func convertAssign(dest, src interface{}) error {
-	// Common cases, without reflect.
-	switch s := src.(type) {
-	case string:
-		switch d := dest.(type) {
-		case *string:
-			if d == nil {
-				return errNilPtr
-			}
-			*d = s
-			return nil
-		case *[]byte:
-			if d == nil {
-				return errNilPtr
-			}
-			*d = []byte(s)
-			return nil
-		case *sql.RawBytes:
-			if d == nil {
-				return errNilPtr
-			}
-			*d = append((*d)[:0], s...)
-			return nil
-		}
-	case []byte:
-		switch d := dest.(type) {
-		case *string:
-			if d == nil {
-				return errNilPtr
-			}
-			*d = string(s)
-			return nil
-		case *interface{}:
-			if d == nil {
-				return errNilPtr
-			}
-			*d = cloneBytes(s)
-			return nil
-		case *[]byte:
-			if d == nil {
-				return errNilPtr
-			}
-			*d = cloneBytes(s)
-			return nil
-		case *sql.RawBytes:
-			if d == nil {
-				return errNilPtr
-			}
-			*d = s
-			return nil
-		}
-	case time.Time:
-		switch d := dest.(type) {
-		case *time.Time:
-			*d = s
-			return nil
-		case *string:
-			*d = s.Format(time.RFC3339Nano)
-			return nil
-		case *[]byte:
-			if d == nil {
-				return errNilPtr
-			}
-			*d = []byte(s.Format(time.RFC3339Nano))
-			return nil
-		case *sql.RawBytes:
-			if d == nil {
-				return errNilPtr
-			}
-			*d = s.AppendFormat((*d)[:0], time.RFC3339Nano)
-			return nil
-		}
-	case nil:
-		switch d := dest.(type) {
-		case *interface{}:
-			if d == nil {
-				return errNilPtr
-			}
-			*d = nil
-			return nil
-		case *[]byte:
-			if d == nil {
-				return errNilPtr
-			}
-			*d = nil
-			return nil
-		case *sql.RawBytes:
-			if d == nil {
-				return errNilPtr
-			}
-			*d = nil
-			return nil
-		}
-	}
-
-	var sv reflect.Value
-
-	switch d := dest.(type) {
-	case *string:
-		sv = reflect.ValueOf(src)
-		switch sv.Kind() {
-		case reflect.Bool,
-			reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64,
-			reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64,
-			reflect.Float32, reflect.Float64:
-			*d = asString(src)
-			return nil
-		}
-	case *[]byte:
-		sv = reflect.ValueOf(src)
-		if b, ok := asBytes(nil, sv); ok {
-			*d = b
-			return nil
-		}
-	case *sql.RawBytes:
-		sv = reflect.ValueOf(src)
-		if b, ok := asBytes([]byte(*d)[:0], sv); ok {
-			*d = sql.RawBytes(b)
-			return nil
-		}
-	case *bool:
-		bv, err := driver.Bool.ConvertValue(src)
-		if err == nil {
-			*d = bv.(bool)
-		}
-		return err
-	case *interface{}:
-		*d = src
-		return nil
-	}
-
-	if scanner, ok := dest.(sql.Scanner); ok {
-		return scanner.Scan(src)
-	}
-
-	dpv := reflect.ValueOf(dest)
-	if dpv.Kind() != reflect.Ptr {
-		return errors.New("destination not a pointer")
-	}
-	if dpv.IsNil() {
-		return errNilPtr
-	}
-
-	if !sv.IsValid() {
-		sv = reflect.ValueOf(src)
-	}
-
-	dv := reflect.Indirect(dpv)
-	if sv.IsValid() && sv.Type().AssignableTo(dv.Type()) {
-		switch b := src.(type) {
-		case []byte:
-			dv.Set(reflect.ValueOf(cloneBytes(b)))
-		default:
-			dv.Set(sv)
-		}
-		return nil
-	}
-
-	if dv.Kind() == sv.Kind() && sv.Type().ConvertibleTo(dv.Type()) {
-		dv.Set(sv.Convert(dv.Type()))
-		return nil
-	}
-
-	// The following conversions use a string value as an intermediate representation
-	// to convert between various numeric types.
-	//
-	// This also allows scanning into user defined types such as "type Int int64".
-	// For symmetry, also check for string destination types.
-	switch dv.Kind() {
-	case reflect.Ptr:
-		if src == nil {
-			dv.Set(reflect.Zero(dv.Type()))
-			return nil
-		}
-		dv.Set(reflect.New(dv.Type().Elem()))
-		return convertAssign(dv.Interface(), src)
-	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-		s := asString(src)
-		i64, err := strconv.ParseInt(s, 10, dv.Type().Bits())
-		if err != nil {
-			err = strconvErr(err)
-			return fmt.Errorf("converting driver.Value type %T (%q) to a %s: %v", src, s, dv.Kind(), err)
-		}
-		dv.SetInt(i64)
-		return nil
-	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
-		s := asString(src)
-		u64, err := strconv.ParseUint(s, 10, dv.Type().Bits())
-		if err != nil {
-			err = strconvErr(err)
-			return fmt.Errorf("converting driver.Value type %T (%q) to a %s: %v", src, s, dv.Kind(), err)
-		}
-		dv.SetUint(u64)
-		return nil
-	case reflect.Float32, reflect.Float64:
-		s := asString(src)
-		f64, err := strconv.ParseFloat(s, dv.Type().Bits())
-		if err != nil {
-			err = strconvErr(err)
-			return fmt.Errorf("converting driver.Value type %T (%q) to a %s: %v", src, s, dv.Kind(), err)
-		}
-		dv.SetFloat(f64)
-		return nil
-	case reflect.String:
-		switch v := src.(type) {
-		case string:
-			dv.SetString(v)
-			return nil
-		case []byte:
-			dv.SetString(string(v))
-			return nil
-		}
-	}
-
-	return fmt.Errorf("unsupported Scan, storing driver.Value type %T into type %T", src, dest)
-}
-
-func strconvErr(err error) error {
-	if ne, ok := err.(*strconv.NumError); ok {
-		return ne.Err
-	}
-	return err
-}
-
-func cloneBytes(b []byte) []byte {
-	if b == nil {
-		return nil
-	}
-	c := make([]byte, len(b))
-	copy(c, b)
-	return c
-}
-
-func asString(src interface{}) string {
-	switch v := src.(type) {
-	case string:
-		return v
-	case []byte:
-		return string(v)
-	}
-	rv := reflect.ValueOf(src)
-	switch rv.Kind() {
-	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-		return strconv.FormatInt(rv.Int(), 10)
-	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
-		return strconv.FormatUint(rv.Uint(), 10)
-	case reflect.Float64:
-		return strconv.FormatFloat(rv.Float(), 'g', -1, 64)
-	case reflect.Float32:
-		return strconv.FormatFloat(rv.Float(), 'g', -1, 32)
-	case reflect.Bool:
-		return strconv.FormatBool(rv.Bool())
-	}
-	return fmt.Sprintf("%v", src)
-}
-
-func asBytes(buf []byte, rv reflect.Value) (b []byte, ok bool) {
-	switch rv.Kind() {
-	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-		return strconv.AppendInt(buf, rv.Int(), 10), true
-	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
-		return strconv.AppendUint(buf, rv.Uint(), 10), true
-	case reflect.Float32:
-		return strconv.AppendFloat(buf, rv.Float(), 'g', -1, 32), true
-	case reflect.Float64:
-		return strconv.AppendFloat(buf, rv.Float(), 'g', -1, 64), true
-	case reflect.Bool:
-		return strconv.AppendBool(buf, rv.Bool()), true
-	case reflect.String:
-		s := rv.String()
-		return append(buf, s...), true
-	}
-	return
-}

doc.go

@@ -79,8 +79,9 @@ Then, you can use this extension.
 
 Connection Hook
 
-You can hook and inject your code when the connection is established by setting
+You can hook and inject your code when the connection is established. database/sql
-ConnectHook to get the SQLiteConn.
+doesn't provide a way to get native go-sqlite3 interfaces. So if you want,
+you need to set ConnectHook and get the SQLiteConn.
 
 	sql.Register("sqlite3_with_hook_example",
 			&sqlite3.SQLiteDriver{
@@ -90,45 +91,21 @@ ConnectHook to get the SQLiteConn.
 					},
 			})
 
-You can also use database/sql.Conn.Raw (Go >= 1.13):
-
-	conn, err := db.Conn(context.Background())
-	// if err != nil { ... }
-	defer conn.Close()
-	err = conn.Raw(func (driverConn interface{}) error {
-		sqliteConn := driverConn.(*sqlite3.SQLiteConn)
-		// ... use sqliteConn
-	})
-	// if err != nil { ... }
-
 Go SQlite3 Extensions
 
-If you want to register Go functions as SQLite extension functions
+If you want to register Go functions as SQLite extension functions,
-you can make a custom driver by calling RegisterFunction from
+call RegisterFunction from ConnectHook.
-ConnectHook.
 
 	regex = func(re, s string) (bool, error) {
 		return regexp.MatchString(re, s)
 	}
-	sql.Register("sqlite3_extended",
+	sql.Register("sqlite3_with_go_func",
 			&sqlite3.SQLiteDriver{
 					ConnectHook: func(conn *sqlite3.SQLiteConn) error {
 						return conn.RegisterFunc("regexp", regex, true)
 					},
 			})
 
-You can then use the custom driver by passing its name to sql.Open.
-
-	var i int
-	conn, err := sql.Open("sqlite3_extended", "./foo.db")
-	if err != nil {
-		panic(err)
-	}
-	err = db.QueryRow(`SELECT regexp("foo.*", "seafood")`).Scan(&i)
-	if err != nil {
-		panic(err)
-	}
-
 See the documentation of RegisterFunc for more details.
 
 */

error.go

@@ -1,19 +1,11 @@
-// Copyright (C) 2019 Yasuhiro Matsumoto <mattn.jp@gmail.com>.
+// Copyright (C) 2014 Yasuhiro Matsumoto <mattn.jp@gmail.com>.
 //
 // Use of this source code is governed by an MIT-style
 // license that can be found in the LICENSE file.
 
 package sqlite3
 
-/*
-#ifndef USE_LIBSQLITE3
-#include "sqlite3-binding.h"
-#else
-#include <sqlite3.h>
-#endif
-*/
 import "C"
-import "syscall"
 
 // ErrNo inherit errno.
 type ErrNo int
@@ -28,7 +20,6 @@ type ErrNoExtended int
 type Error struct {
 	Code         ErrNo         /* The error code returned by SQLite */
 	ExtendedCode ErrNoExtended /* The extended error code returned by SQLite */
-	SystemErrno  syscall.Errno /* The system errno returned by the OS through SQLite, if applicable */
 	err          string        /* The error string returned by sqlite3_errmsg(),
 	this usually contains more specific details. */
 }
@@ -81,16 +72,10 @@ func (err ErrNoExtended) Error() string {
 }
 
 func (err Error) Error() string {
-	var str string
 	if err.err != "" {
-		str = err.err
+		return err.err
-	} else {
-		str = C.GoString(C.sqlite3_errstr(C.int(err.Code)))
 	}
-	if err.SystemErrno != 0 {
+	return errorString(err)
-		str += ": " + err.SystemErrno.Error()
-	}
-	return str
 }
 
 // result codes from http://www.sqlite.org/c3ref/c_abort_rollback.html

error_test.go

@@ -1,10 +1,8 @@
-// Copyright (C) 2019 Yasuhiro Matsumoto <mattn.jp@gmail.com>.
+// Copyright (C) 2014 Yasuhiro Matsumoto <mattn.jp@gmail.com>.
 //
 // Use of this source code is governed by an MIT-style
 // license that can be found in the LICENSE file.
 
-// +build cgo
-
 package sqlite3
 
 import (
@@ -240,36 +238,5 @@ func TestExtendedErrorCodes_Unique(t *testing.T) {
 				extended, expected)
 		}
 	}
-}
+
-
-func TestError_SystemErrno(t *testing.T) {
-	_, n, _ := Version()
-	if n < 3012000 {
-		t.Skip("sqlite3_system_errno requires sqlite3 >= 3.12.0")
-	}
-
-	// open a non-existent database in read-only mode so we get an IO error.
-	db, err := sql.Open("sqlite3", "file:nonexistent.db?mode=ro")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer db.Close()
-
-	err = db.Ping()
-	if err == nil {
-		t.Fatal("expected error pinging read-only non-existent database, but got nil")
-	}
-
-	serr, ok := err.(Error)
-	if !ok {
-		t.Fatalf("expected error to be of type Error, but got %[1]T %[1]v", err)
-	}
-
-	if serr.SystemErrno == 0 {
-		t.Fatal("expected SystemErrno to be set")
-	}
-
-	if !os.IsNotExist(serr.SystemErrno) {
-		t.Errorf("expected SystemErrno to be a not exists error, but got %v", serr.SystemErrno)
-	}
 }

go.mod

@@ -1,7 +0,0 @@
-module github.com/mattn/go-sqlite3
-
-go 1.16
-
-retract (
- [v2.0.0+incompatible, v2.0.6+incompatible] // Accidental; no major changes or features.
-)

sqlite3.go

@@ -1,10 +1,9 @@
-// Copyright (C) 2019 Yasuhiro Matsumoto <mattn.jp@gmail.com>.
+// Copyright (C) 2014 Yasuhiro Matsumoto <mattn.jp@gmail.com>.
 // Copyright (C) 2018 G.J.R. Timmer <gjr.timmer@gmail.com>.
 //
 // Use of this source code is governed by an MIT-style
 // license that can be found in the LICENSE file.
 
-//go:build cgo
 // +build cgo
 
 package sqlite3
@@ -16,16 +15,16 @@ package sqlite3
 #cgo CFLAGS: -DHAVE_USLEEP=1
 #cgo CFLAGS: -DSQLITE_ENABLE_FTS3
 #cgo CFLAGS: -DSQLITE_ENABLE_FTS3_PARENTHESIS
+#cgo CFLAGS: -DSQLITE_ENABLE_FTS4_UNICODE61
 #cgo CFLAGS: -DSQLITE_TRACE_SIZE_LIMIT=15
 #cgo CFLAGS: -DSQLITE_OMIT_DEPRECATED
+#cgo CFLAGS: -DSQLITE_DISABLE_INTRINSIC
 #cgo CFLAGS: -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1
 #cgo CFLAGS: -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT
 #cgo CFLAGS: -Wno-deprecated-declarations
 #cgo linux,!android CFLAGS: -DHAVE_PREAD64=1 -DHAVE_PWRITE64=1
-#cgo openbsd CFLAGS: -I/usr/local/include
-#cgo openbsd LDFLAGS: -L/usr/local/lib
 #ifndef USE_LIBSQLITE3
-#include "sqlite3-binding.h"
+#include <sqlite3-binding.h>
 #else
 #include <sqlite3.h>
 #endif
@@ -184,12 +183,6 @@ static int _sqlite3_limit(sqlite3* db, int limitId, int newLimit) {
   return sqlite3_limit(db, limitId, newLimit);
 #endif
 }
-
-#if SQLITE_VERSION_NUMBER < 3012000
-static int sqlite3_system_errno(sqlite3 *db) {
-  return 0;
-}
-#endif
 */
 import "C"
 import (
@@ -205,7 +198,6 @@ import (
 	"strconv"
 	"strings"
 	"sync"
-	"syscall"
 	"time"
 	"unsafe"
 )
@@ -234,14 +226,8 @@ const (
 	columnTimestamp string = "timestamp"
 )
 
-// This variable can be replaced with -ldflags like below:
-// go build -ldflags="-X 'github.com/mattn/go-sqlite3.driverName=my-sqlite3'"
-var driverName = "sqlite3"
-
 func init() {
-	if driverName != "" {
+	sql.Register("sqlite3", &SQLiteDriver{})
-		sql.Register(driverName, &SQLiteDriver{})
-	}
 }
 
 // Version returns SQLite library version information.
@@ -297,51 +283,6 @@ const (
 	/*SQLITE_RECURSIVE           = C.SQLITE_RECURSIVE*/
 )
 
-// Standard File Control Opcodes
-// See: https://www.sqlite.org/c3ref/c_fcntl_begin_atomic_write.html
-const (
-	SQLITE_FCNTL_LOCKSTATE             = int(1)
-	SQLITE_FCNTL_GET_LOCKPROXYFILE     = int(2)
-	SQLITE_FCNTL_SET_LOCKPROXYFILE     = int(3)
-	SQLITE_FCNTL_LAST_ERRNO            = int(4)
-	SQLITE_FCNTL_SIZE_HINT             = int(5)
-	SQLITE_FCNTL_CHUNK_SIZE            = int(6)
-	SQLITE_FCNTL_FILE_POINTER          = int(7)
-	SQLITE_FCNTL_SYNC_OMITTED          = int(8)
-	SQLITE_FCNTL_WIN32_AV_RETRY        = int(9)
-	SQLITE_FCNTL_PERSIST_WAL           = int(10)
-	SQLITE_FCNTL_OVERWRITE             = int(11)
-	SQLITE_FCNTL_VFSNAME               = int(12)
-	SQLITE_FCNTL_POWERSAFE_OVERWRITE   = int(13)
-	SQLITE_FCNTL_PRAGMA                = int(14)
-	SQLITE_FCNTL_BUSYHANDLER           = int(15)
-	SQLITE_FCNTL_TEMPFILENAME          = int(16)
-	SQLITE_FCNTL_MMAP_SIZE             = int(18)
-	SQLITE_FCNTL_TRACE                 = int(19)
-	SQLITE_FCNTL_HAS_MOVED             = int(20)
-	SQLITE_FCNTL_SYNC                  = int(21)
-	SQLITE_FCNTL_COMMIT_PHASETWO       = int(22)
-	SQLITE_FCNTL_WIN32_SET_HANDLE      = int(23)
-	SQLITE_FCNTL_WAL_BLOCK             = int(24)
-	SQLITE_FCNTL_ZIPVFS                = int(25)
-	SQLITE_FCNTL_RBU                   = int(26)
-	SQLITE_FCNTL_VFS_POINTER           = int(27)
-	SQLITE_FCNTL_JOURNAL_POINTER       = int(28)
-	SQLITE_FCNTL_WIN32_GET_HANDLE      = int(29)
-	SQLITE_FCNTL_PDB                   = int(30)
-	SQLITE_FCNTL_BEGIN_ATOMIC_WRITE    = int(31)
-	SQLITE_FCNTL_COMMIT_ATOMIC_WRITE   = int(32)
-	SQLITE_FCNTL_ROLLBACK_ATOMIC_WRITE = int(33)
-	SQLITE_FCNTL_LOCK_TIMEOUT          = int(34)
-	SQLITE_FCNTL_DATA_VERSION          = int(35)
-	SQLITE_FCNTL_SIZE_LIMIT            = int(36)
-	SQLITE_FCNTL_CKPT_DONE             = int(37)
-	SQLITE_FCNTL_RESERVE_BYTES         = int(38)
-	SQLITE_FCNTL_CKPT_START            = int(39)
-	SQLITE_FCNTL_EXTERNAL_READER       = int(40)
-	SQLITE_FCNTL_CKSM_FILE             = int(41)
-)
-
 // SQLiteDriver implements driver.Driver.
 type SQLiteDriver struct {
 	Extensions  []string
@@ -387,7 +328,7 @@ type SQLiteRows struct {
 	decltype []string
 	cls      bool
 	closed   bool
-	ctx      context.Context // no better alternative to pass context into Next() method
+	done     chan struct{}
 }
 
 type functionInfo struct {
@@ -494,12 +435,10 @@ func (ai *aggInfo) Done(ctx *C.sqlite3_context) {
 // Commit transaction.
 func (tx *SQLiteTx) Commit() error {
 	_, err := tx.c.exec(context.Background(), "COMMIT", nil)
-	if err != nil {
+	if err != nil && err.(Error).Code == C.SQLITE_BUSY {
-		// sqlite3 may leave the transaction open in this scenario.
+		// sqlite3 will leave the transaction open in this scenario.
 		// However, database/sql considers the transaction complete once we
 		// return from Commit() - we must clean up to honour its semantics.
-		// We don't know if the ROLLBACK is strictly necessary, but according
-		// to sqlite's docs, there is no harm in calling ROLLBACK unnecessarily.
 		tx.c.exec(context.Background(), "ROLLBACK", nil)
 	}
 	return err
@@ -527,7 +466,7 @@ func (c *SQLiteConn) RegisterCollation(name string, cmp func(string, string) int
 	handle := newHandle(c, cmp)
 	cname := C.CString(name)
 	defer C.free(unsafe.Pointer(cname))
-	rv := C.sqlite3_create_collation(c.db, cname, C.SQLITE_UTF8, handle, (*[0]byte)(unsafe.Pointer(C.compareTrampoline)))
+	rv := C.sqlite3_create_collation(c.db, cname, C.SQLITE_UTF8, unsafe.Pointer(handle), (*[0]byte)(unsafe.Pointer(C.compareTrampoline)))
 	if rv != C.SQLITE_OK {
 		return c.lastError()
 	}
@@ -545,7 +484,7 @@ func (c *SQLiteConn) RegisterCommitHook(callback func() int) {
 	if callback == nil {
 		C.sqlite3_commit_hook(c.db, nil, nil)
 	} else {
-		C.sqlite3_commit_hook(c.db, (*[0]byte)(C.commitHookTrampoline), newHandle(c, callback))
+		C.sqlite3_commit_hook(c.db, (*[0]byte)(C.commitHookTrampoline), unsafe.Pointer(newHandle(c, callback)))
 	}
 }
 
@@ -558,7 +497,7 @@ func (c *SQLiteConn) RegisterRollbackHook(callback func()) {
 	if callback == nil {
 		C.sqlite3_rollback_hook(c.db, nil, nil)
 	} else {
-		C.sqlite3_rollback_hook(c.db, (*[0]byte)(C.rollbackHookTrampoline), newHandle(c, callback))
+		C.sqlite3_rollback_hook(c.db, (*[0]byte)(C.rollbackHookTrampoline), unsafe.Pointer(newHandle(c, callback)))
 	}
 }
 
@@ -575,7 +514,7 @@ func (c *SQLiteConn) RegisterUpdateHook(callback func(int, string, string, int64
 	if callback == nil {
 		C.sqlite3_update_hook(c.db, nil, nil)
 	} else {
-		C.sqlite3_update_hook(c.db, (*[0]byte)(C.updateHookTrampoline), newHandle(c, callback))
+		C.sqlite3_update_hook(c.db, (*[0]byte)(C.updateHookTrampoline), unsafe.Pointer(newHandle(c, callback)))
 	}
 }
 
@@ -589,7 +528,7 @@ func (c *SQLiteConn) RegisterAuthorizer(callback func(int, string, string, strin
 	if callback == nil {
 		C.sqlite3_set_authorizer(c.db, nil, nil)
 	} else {
-		C.sqlite3_set_authorizer(c.db, (*[0]byte)(C.authorizerTrampoline), newHandle(c, callback))
+		C.sqlite3_set_authorizer(c.db, (*[0]byte)(C.authorizerTrampoline), unsafe.Pointer(newHandle(c, callback)))
 	}
 }
 
@@ -670,8 +609,8 @@ func (c *SQLiteConn) RegisterFunc(name string, impl interface{}, pure bool) erro
 	return nil
 }
 
-func sqlite3CreateFunction(db *C.sqlite3, zFunctionName *C.char, nArg C.int, eTextRep C.int, pApp unsafe.Pointer, xFunc unsafe.Pointer, xStep unsafe.Pointer, xFinal unsafe.Pointer) C.int {
+func sqlite3CreateFunction(db *C.sqlite3, zFunctionName *C.char, nArg C.int, eTextRep C.int, pApp uintptr, xFunc unsafe.Pointer, xStep unsafe.Pointer, xFinal unsafe.Pointer) C.int {
-	return C._sqlite3_create_function(db, zFunctionName, nArg, eTextRep, C.uintptr_t(uintptr(pApp)), (*[0]byte)(xFunc), (*[0]byte)(xStep), (*[0]byte)(xFinal))
+	return C._sqlite3_create_function(db, zFunctionName, nArg, eTextRep, C.uintptr_t(pApp), (*[0]byte)(xFunc), (*[0]byte)(xStep), (*[0]byte)(xFinal))
 }
 
 // RegisterAggregator makes a Go type available as a SQLite aggregation function.
@@ -744,7 +683,7 @@ func (c *SQLiteConn) RegisterAggregator(name string, impl interface{}, pure bool
 		ai.stepArgConverters = append(ai.stepArgConverters, conv)
 	}
 	if step.IsVariadic() {
-		conv, err := callbackArg(step.In(start + stepNArgs).Elem())
+		conv, err := callbackArg(t.In(start + stepNArgs).Elem())
 		if err != nil {
 			return err
 		}
@@ -810,36 +749,23 @@ func (c *SQLiteConn) lastError() error {
 	return lastError(c.db)
 }
 
-// Note: may be called with db == nil
 func lastError(db *C.sqlite3) error {
-	rv := C.sqlite3_errcode(db) // returns SQLITE_NOMEM if db == nil
+	rv := C.sqlite3_errcode(db)
 	if rv == C.SQLITE_OK {
 		return nil
 	}
-	extrv := C.sqlite3_extended_errcode(db)    // returns SQLITE_NOMEM if db == nil
-	errStr := C.GoString(C.sqlite3_errmsg(db)) // returns "out of memory" if db == nil
-
-	// https://www.sqlite.org/c3ref/system_errno.html
-	// sqlite3_system_errno is only meaningful if the error code was SQLITE_CANTOPEN,
-	// or it was SQLITE_IOERR and the extended code was not SQLITE_IOERR_NOMEM
-	var systemErrno syscall.Errno
-	if rv == C.SQLITE_CANTOPEN || (rv == C.SQLITE_IOERR && extrv != C.SQLITE_IOERR_NOMEM) {
-		systemErrno = syscall.Errno(C.sqlite3_system_errno(db))
-	}
-
 	return Error{
 		Code:         ErrNo(rv),
-		ExtendedCode: ErrNoExtended(extrv),
+		ExtendedCode: ErrNoExtended(C.sqlite3_extended_errcode(db)),
-		SystemErrno:  systemErrno,
+		err:          C.GoString(C.sqlite3_errmsg(db)),
-		err:          errStr,
 	}
 }
 
 // Exec implements Execer.
 func (c *SQLiteConn) Exec(query string, args []driver.Value) (driver.Result, error) {
-	list := make([]driver.NamedValue, len(args))
+	list := make([]namedValue, len(args))
 	for i, v := range args {
-		list[i] = driver.NamedValue{
+		list[i] = namedValue{
 			Ordinal: i + 1,
 			Value:   v,
 		}
@@ -847,7 +773,7 @@ func (c *SQLiteConn) Exec(query string, args []driver.Value) (driver.Result, err
 	return c.exec(context.Background(), query, list)
 }
 
-func (c *SQLiteConn) exec(ctx context.Context, query string, args []driver.NamedValue) (driver.Result, error) {
+func (c *SQLiteConn) exec(ctx context.Context, query string, args []namedValue) (driver.Result, error) {
 	start := 0
 	for {
 		s, err := c.prepare(ctx, query)
@@ -856,49 +782,42 @@ func (c *SQLiteConn) exec(ctx context.Context, query string, args []driver.Named
 		}
 		var res driver.Result
 		if s.(*SQLiteStmt).s != nil {
-			stmtArgs := make([]driver.NamedValue, 0, len(args))
 			na := s.NumInput()
-			if len(args)-start < na {
+			if len(args) < na {
 				s.Close()
 				return nil, fmt.Errorf("not enough args to execute query: want %d got %d", na, len(args))
 			}
-			// consume the number of arguments used in the current
+			for i := 0; i < na; i++ {
-			// statement and append all named arguments not
+				args[i].Ordinal -= start
-			// contained therein
-			stmtArgs = append(stmtArgs, args[start:start+na]...)
-			for i := range args {
-				if (i < start || i >= na) && args[i].Name != "" {
-					stmtArgs = append(stmtArgs, args[i])
-				}
 			}
-			for i := range stmtArgs {
+			res, err = s.(*SQLiteStmt).exec(ctx, args[:na])
-				stmtArgs[i].Ordinal = i + 1
-			}
-			res, err = s.(*SQLiteStmt).exec(ctx, stmtArgs)
 			if err != nil && err != driver.ErrSkip {
 				s.Close()
 				return nil, err
 			}
+			args = args[na:]
 			start += na
 		}
 		tail := s.(*SQLiteStmt).t
 		s.Close()
 		if tail == "" {
-			if res == nil {
-				// https://github.com/mattn/go-sqlite3/issues/963
-				res = &SQLiteResult{0, 0}
-			}
 			return res, nil
 		}
 		query = tail
 	}
 }
 
+type namedValue struct {
+	Name    string
+	Ordinal int
+	Value   driver.Value
+}
+
 // Query implements Queryer.
 func (c *SQLiteConn) Query(query string, args []driver.Value) (driver.Rows, error) {
-	list := make([]driver.NamedValue, len(args))
+	list := make([]namedValue, len(args))
 	for i, v := range args {
-		list[i] = driver.NamedValue{
+		list[i] = namedValue{
 			Ordinal: i + 1,
 			Value:   v,
 		}
@@ -906,36 +825,27 @@ func (c *SQLiteConn) Query(query string, args []driver.Value) (driver.Rows, erro
 	return c.query(context.Background(), query, list)
 }
 
-func (c *SQLiteConn) query(ctx context.Context, query string, args []driver.NamedValue) (driver.Rows, error) {
+func (c *SQLiteConn) query(ctx context.Context, query string, args []namedValue) (driver.Rows, error) {
 	start := 0
 	for {
-		stmtArgs := make([]driver.NamedValue, 0, len(args))
 		s, err := c.prepare(ctx, query)
 		if err != nil {
 			return nil, err
 		}
 		s.(*SQLiteStmt).cls = true
 		na := s.NumInput()
-		if len(args)-start < na {
+		if len(args) < na {
-			return nil, fmt.Errorf("not enough args to execute query: want %d got %d", na, len(args)-start)
+			return nil, fmt.Errorf("not enough args to execute query: want %d got %d", na, len(args))
 		}
-		// consume the number of arguments used in the current
+		for i := 0; i < na; i++ {
-		// statement and append all named arguments not contained
+			args[i].Ordinal -= start
-		// therein
-		stmtArgs = append(stmtArgs, args[start:start+na]...)
-		for i := range args {
-			if (i < start || i >= na) && args[i].Name != "" {
-				stmtArgs = append(stmtArgs, args[i])
-			}
 		}
-		for i := range stmtArgs {
+		rows, err := s.(*SQLiteStmt).query(ctx, args[:na])
-			stmtArgs[i].Ordinal = i + 1
-		}
-		rows, err := s.(*SQLiteStmt).query(ctx, stmtArgs)
 		if err != nil && err != driver.ErrSkip {
 			s.Close()
 			return rows, err
 		}
+		args = args[na:]
 		start += na
 		tail := s.(*SQLiteStmt).t
 		if tail == "" {
@@ -959,6 +869,10 @@ func (c *SQLiteConn) begin(ctx context.Context) (driver.Tx, error) {
 	return &SQLiteTx{c}, nil
 }
 
+func errorString(err Error) string {
+	return C.GoString(C.sqlite3_errstr(C.int(err.Code)))
+}
+
 // Open database and return a new connection.
 //
 // A pragma can take either zero or one argument.
@@ -983,7 +897,7 @@ func (c *SQLiteConn) begin(ctx context.Context) (driver.Tx, error) {
 //      - rwc
 //      - memory
 //
-//   cache
+//   shared
 //     SQLite Shared-Cache Mode
 //     https://www.sqlite.org/sharedcache.html
 //     Values:
@@ -1086,15 +1000,13 @@ func (d *SQLiteDriver) Open(dsn string) (driver.Conn, error) {
 	deferForeignKeys := -1
 	foreignKeys := -1
 	ignoreCheckConstraints := -1
-	var journalMode string
+	journalMode := "DELETE"
 	lockingMode := "NORMAL"
 	queryOnly := -1
 	recursiveTriggers := -1
 	secureDelete := "DEFAULT"
 	synchronousMode := "NORMAL"
 	writableSchema := -1
-	vfsName := ""
-	var cacheSize *int64
 
 	pos := strings.IndexRune(dsn, '?')
 	if pos >= 1 {
@@ -1320,7 +1232,7 @@ func (d *SQLiteDriver) Open(dsn string) (driver.Conn, error) {
 		if _, ok := params["_locking"]; ok {
 			pkey = "_locking"
 		}
-		if val := params.Get(pkey); val != "" {
+		if val := params.Get("_locking"); val != "" {
 			switch strings.ToUpper(val) {
 			case "NORMAL", "EXCLUSIVE":
 				lockingMode = strings.ToUpper(val)
@@ -1418,22 +1330,6 @@ func (d *SQLiteDriver) Open(dsn string) (driver.Conn, error) {
 			}
 		}
 
-		// Cache size (_cache_size)
-		//
-		// https://sqlite.org/pragma.html#pragma_cache_size
-		//
-		if val := params.Get("_cache_size"); val != "" {
-			iv, err := strconv.ParseInt(val, 10, 64)
-			if err != nil {
-				return nil, fmt.Errorf("Invalid _cache_size: %v: %v", val, err)
-			}
-			cacheSize = &iv
-		}
-
-		if val := params.Get("vfs"); val != "" {
-			vfsName = val
-		}
-
 		if !strings.HasPrefix(dsn, "file:") {
 			dsn = dsn[:pos]
 		}
@@ -1442,27 +1338,25 @@ func (d *SQLiteDriver) Open(dsn string) (driver.Conn, error) {
 	var db *C.sqlite3
 	name := C.CString(dsn)
 	defer C.free(unsafe.Pointer(name))
-	var vfs *C.char
-	if vfsName != "" {
-		vfs = C.CString(vfsName)
-		defer C.free(unsafe.Pointer(vfs))
-	}
 	rv := C._sqlite3_open_v2(name, &db,
 		mutex|C.SQLITE_OPEN_READWRITE|C.SQLITE_OPEN_CREATE,
-		vfs)
+		nil)
 	if rv != 0 {
-		// Save off the error _before_ closing the database.
-		// This is safe even if db is nil.
-		err := lastError(db)
 		if db != nil {
 			C.sqlite3_close_v2(db)
 		}
-		return nil, err
+		return nil, Error{Code: ErrNo(rv)}
 	}
 	if db == nil {
 		return nil, errors.New("sqlite succeeded without returning a database")
 	}
 
+	rv = C.sqlite3_busy_timeout(db, C.int(busyTimeout))
+	if rv != C.SQLITE_OK {
+		C.sqlite3_close_v2(db)
+		return nil, Error{Code: ErrNo(rv)}
+	}
+
 	exec := func(s string) error {
 		cs := C.CString(s)
 		rv := C.sqlite3_exec(db, cs, nil, nil, nil)
@@ -1473,12 +1367,6 @@ func (d *SQLiteDriver) Open(dsn string) (driver.Conn, error) {
 		return nil
 	}
 
-	// Busy timeout
-	if err := exec(fmt.Sprintf("PRAGMA busy_timeout = %d;", busyTimeout)); err != nil {
-		C.sqlite3_close_v2(db)
-		return nil, err
-	}
-
 	// USER AUTHENTICATION
 	//
 	// User Authentication is always performed even when
@@ -1634,10 +1522,10 @@ func (d *SQLiteDriver) Open(dsn string) (driver.Conn, error) {
 		// Before going any further, we need to check that the user
 		// has provided an username and password within the DSN.
 		// We are not allowed to continue.
-		if len(authUser) == 0 {
+		if len(authUser) < 0 {
 			return nil, fmt.Errorf("Missing '_auth_user' while user authentication was requested with '_auth'")
 		}
-		if len(authPass) == 0 {
+		if len(authPass) < 0 {
 			return nil, fmt.Errorf("Missing '_auth_pass' while user authentication was requested with '_auth'")
 		}
 
@@ -1683,11 +1571,10 @@ func (d *SQLiteDriver) Open(dsn string) (driver.Conn, error) {
 	}
 
 	// Journal Mode
-	if journalMode != "" {
+	// Because default Journal Mode is DELETE this PRAGMA can always be executed.
-		if err := exec(fmt.Sprintf("PRAGMA journal_mode = %s;", journalMode)); err != nil {
+	if err := exec(fmt.Sprintf("PRAGMA journal_mode = %s;", journalMode)); err != nil {
-			C.sqlite3_close_v2(db)
+		C.sqlite3_close_v2(db)
-			return nil, err
+		return nil, err
-		}
 	}
 
 	// Locking Mode
@@ -1730,7 +1617,7 @@ func (d *SQLiteDriver) Open(dsn string) (driver.Conn, error) {
 	//
 	// Because default is NORMAL this statement is always executed
 	if err := exec(fmt.Sprintf("PRAGMA synchronous = %s;", synchronousMode)); err != nil {
-		conn.Close()
+		C.sqlite3_close_v2(db)
 		return nil, err
 	}
 
@@ -1742,14 +1629,6 @@ func (d *SQLiteDriver) Open(dsn string) (driver.Conn, error) {
 		}
 	}
 
-	// Cache Size
-	if cacheSize != nil {
-		if err := exec(fmt.Sprintf("PRAGMA cache_size = %d;", *cacheSize)); err != nil {
-			C.sqlite3_close_v2(db)
-			return nil, err
-		}
-	}
-
 	if len(d.Extensions) > 0 {
 		if err := conn.loadExtensions(d.Extensions); err != nil {
 			conn.Close()
@@ -1854,31 +1733,6 @@ func (c *SQLiteConn) SetLimit(id int, newVal int) int {
 	return int(C._sqlite3_limit(c.db, C.int(id), C.int(newVal)))
 }
 
-// SetFileControlInt invokes the xFileControl method on a given database. The
-// dbName is the name of the database. It will default to "main" if left blank.
-// The op is one of the opcodes prefixed by "SQLITE_FCNTL_". The arg argument
-// and return code are both opcode-specific. Please see the SQLite documentation.
-//
-// This method is not thread-safe as the returned error code can be changed by
-// another call if invoked concurrently.
-//
-// See: sqlite3_file_control, https://www.sqlite.org/c3ref/file_control.html
-func (c *SQLiteConn) SetFileControlInt(dbName string, op int, arg int) error {
-	if dbName == "" {
-		dbName = "main"
-	}
-
-	cDBName := C.CString(dbName)
-	defer C.free(unsafe.Pointer(cDBName))
-
-	cArg := C.int(arg)
-	rv := C.sqlite3_file_control(c.db, cDBName, C.int(op), unsafe.Pointer(&cArg))
-	if rv != C.SQLITE_OK {
-		return c.lastError()
-	}
-	return nil
-}
-
 // Close the statement.
 func (s *SQLiteStmt) Close() error {
 	s.mu.Lock()
@@ -1904,71 +1758,65 @@ func (s *SQLiteStmt) NumInput() int {
 	return int(C.sqlite3_bind_parameter_count(s.s))
 }
 
+type bindArg struct {
+	n int
+	v driver.Value
+}
+
 var placeHolder = []byte{0}
 
-func (s *SQLiteStmt) bind(args []driver.NamedValue) error {
+func (s *SQLiteStmt) bind(args []namedValue) error {
 	rv := C.sqlite3_reset(s.s)
 	if rv != C.SQLITE_ROW && rv != C.SQLITE_OK && rv != C.SQLITE_DONE {
 		return s.c.lastError()
 	}
 
-	bindIndices := make([][3]int, len(args))
-	prefixes := []string{":", "@", "$"}
 	for i, v := range args {
-		bindIndices[i][0] = args[i].Ordinal
 		if v.Name != "" {
-			for j := range prefixes {
+			cname := C.CString(":" + v.Name)
-				cname := C.CString(prefixes[j] + v.Name)
+			args[i].Ordinal = int(C.sqlite3_bind_parameter_index(s.s, cname))
-				bindIndices[i][j] = int(C.sqlite3_bind_parameter_index(s.s, cname))
+			C.free(unsafe.Pointer(cname))
-				C.free(unsafe.Pointer(cname))
-			}
-			args[i].Ordinal = bindIndices[i][0]
 		}
 	}
 
-	for i, arg := range args {
+	for _, arg := range args {
-		for j := range bindIndices[i] {
+		n := C.int(arg.Ordinal)
-			if bindIndices[i][j] == 0 {
+		switch v := arg.Value.(type) {
-				continue
+		case nil:
-			}
+			rv = C.sqlite3_bind_null(s.s, n)
-			n := C.int(bindIndices[i][j])
+		case string:
-			switch v := arg.Value.(type) {
+			if len(v) == 0 {
-			case nil:
+				rv = C._sqlite3_bind_text(s.s, n, (*C.char)(unsafe.Pointer(&placeHolder[0])), C.int(0))
-				rv = C.sqlite3_bind_null(s.s, n)
+			} else {
-			case string:
+				b := []byte(v)
-				if len(v) == 0 {
-					rv = C._sqlite3_bind_text(s.s, n, (*C.char)(unsafe.Pointer(&placeHolder[0])), C.int(0))
-				} else {
-					b := []byte(v)
-					rv = C._sqlite3_bind_text(s.s, n, (*C.char)(unsafe.Pointer(&b[0])), C.int(len(b)))
-				}
-			case int64:
-				rv = C.sqlite3_bind_int64(s.s, n, C.sqlite3_int64(v))
-			case bool:
-				if v {
-					rv = C.sqlite3_bind_int(s.s, n, 1)
-				} else {
-					rv = C.sqlite3_bind_int(s.s, n, 0)
-				}
-			case float64:
-				rv = C.sqlite3_bind_double(s.s, n, C.double(v))
-			case []byte:
-				if v == nil {
-					rv = C.sqlite3_bind_null(s.s, n)
-				} else {
-					ln := len(v)
-					if ln == 0 {
-						v = placeHolder
-					}
-					rv = C._sqlite3_bind_blob(s.s, n, unsafe.Pointer(&v[0]), C.int(ln))
-				}
-			case time.Time:
-				b := []byte(v.Format(SQLiteTimestampFormats[0]))
 				rv = C._sqlite3_bind_text(s.s, n, (*C.char)(unsafe.Pointer(&b[0])), C.int(len(b)))
 			}
-			if rv != C.SQLITE_OK {
+		case int64:
-				return s.c.lastError()
+			rv = C.sqlite3_bind_int64(s.s, n, C.sqlite3_int64(v))
+		case bool:
+			if v {
+				rv = C.sqlite3_bind_int(s.s, n, 1)
+			} else {
+				rv = C.sqlite3_bind_int(s.s, n, 0)
 			}
+		case float64:
+			rv = C.sqlite3_bind_double(s.s, n, C.double(v))
+		case []byte:
+			if v == nil {
+				rv = C.sqlite3_bind_null(s.s, n)
+			} else {
+				ln := len(v)
+				if ln == 0 {
+					v = placeHolder
+				}
+				rv = C._sqlite3_bind_blob(s.s, n, unsafe.Pointer(&v[0]), C.int(ln))
+			}
+		case time.Time:
+			b := []byte(v.Format(SQLiteTimestampFormats[0]))
+			rv = C._sqlite3_bind_text(s.s, n, (*C.char)(unsafe.Pointer(&b[0])), C.int(len(b)))
+		}
+		if rv != C.SQLITE_OK {
+			return s.c.lastError()
 		}
 	}
 	return nil
@@ -1976,9 +1824,9 @@ func (s *SQLiteStmt) bind(args []driver.NamedValue) error {
 
 // Query the statement with arguments. Return records.
 func (s *SQLiteStmt) Query(args []driver.Value) (driver.Rows, error) {
-	list := make([]driver.NamedValue, len(args))
+	list := make([]namedValue, len(args))
 	for i, v := range args {
-		list[i] = driver.NamedValue{
+		list[i] = namedValue{
 			Ordinal: i + 1,
 			Value:   v,
 		}
@@ -1986,7 +1834,7 @@ func (s *SQLiteStmt) Query(args []driver.Value) (driver.Rows, error) {
 	return s.query(context.Background(), list)
 }
 
-func (s *SQLiteStmt) query(ctx context.Context, args []driver.NamedValue) (driver.Rows, error) {
+func (s *SQLiteStmt) query(ctx context.Context, args []namedValue) (driver.Rows, error) {
 	if err := s.bind(args); err != nil {
 		return nil, err
 	}
@@ -1998,13 +1846,28 @@ func (s *SQLiteStmt) query(ctx context.Context, args []driver.NamedValue) (drive
 		decltype: nil,
 		cls:      s.cls,
 		closed:   false,
-		ctx:      ctx,
+		done:     make(chan struct{}),
+	}
+
+	if ctxdone := ctx.Done(); ctxdone != nil {
+		go func(db *C.sqlite3) {
+			select {
+			case <-ctxdone:
+				select {
+				case <-rows.done:
+				default:
+					C.sqlite3_interrupt(db)
+					rows.Close()
+				}
+			case <-rows.done:
+			}
+		}(s.c.db)
 	}
 
 	return rows, nil
 }
 
-// LastInsertId return last inserted ID.
+// LastInsertId teturn last inserted ID.
 func (r *SQLiteResult) LastInsertId() (int64, error) {
 	return r.id, nil
 }
@@ -2016,9 +1879,9 @@ func (r *SQLiteResult) RowsAffected() (int64, error) {
 
 // Exec execute the statement with arguments. Return result object.
 func (s *SQLiteStmt) Exec(args []driver.Value) (driver.Result, error) {
-	list := make([]driver.NamedValue, len(args))
+	list := make([]namedValue, len(args))
 	for i, v := range args {
-		list[i] = driver.NamedValue{
+		list[i] = namedValue{
 			Ordinal: i + 1,
 			Value:   v,
 		}
@@ -2026,54 +1889,29 @@ func (s *SQLiteStmt) Exec(args []driver.Value) (driver.Result, error) {
 	return s.exec(context.Background(), list)
 }
 
-func isInterruptErr(err error) bool {
+func (s *SQLiteStmt) exec(ctx context.Context, args []namedValue) (driver.Result, error) {
-	sqliteErr, ok := err.(Error)
-	if ok {
-		return sqliteErr.Code == ErrInterrupt
-	}
-	return false
-}
-
-// exec executes a query that doesn't return rows. Attempts to honor context timeout.
-func (s *SQLiteStmt) exec(ctx context.Context, args []driver.NamedValue) (driver.Result, error) {
-	if ctx.Done() == nil {
-		return s.execSync(args)
-	}
-
-	type result struct {
-		r   driver.Result
-		err error
-	}
-	resultCh := make(chan result)
-	go func() {
-		r, err := s.execSync(args)
-		resultCh <- result{r, err}
-	}()
-	var rv result
-	select {
-	case rv = <-resultCh:
-	case <-ctx.Done():
-		select {
-		case rv = <-resultCh: // no need to interrupt, operation completed in db
-		default:
-			// this is still racy and can be no-op if executed between sqlite3_* calls in execSync.
-			C.sqlite3_interrupt(s.c.db)
-			rv = <-resultCh // wait for goroutine completed
-			if isInterruptErr(rv.err) {
-				return nil, ctx.Err()
-			}
-		}
-	}
-	return rv.r, rv.err
-}
-
-func (s *SQLiteStmt) execSync(args []driver.NamedValue) (driver.Result, error) {
 	if err := s.bind(args); err != nil {
 		C.sqlite3_reset(s.s)
 		C.sqlite3_clear_bindings(s.s)
 		return nil, err
 	}
 
+	if ctxdone := ctx.Done(); ctxdone != nil {
+		done := make(chan struct{})
+		defer close(done)
+		go func(db *C.sqlite3) {
+			select {
+			case <-done:
+			case <-ctxdone:
+				select {
+				case <-done:
+				default:
+					C.sqlite3_interrupt(db)
+				}
+			}
+		}(s.c.db)
+	}
+
 	var rowid, changes C.longlong
 	rv := C._sqlite3_step_row_internal(s.s, &rowid, &changes)
 	if rv != C.SQLITE_ROW && rv != C.SQLITE_OK && rv != C.SQLITE_DONE {
@@ -2086,13 +1924,6 @@ func (s *SQLiteStmt) execSync(args []driver.NamedValue) (driver.Result, error) {
 	return &SQLiteResult{id: int64(rowid), changes: int64(changes)}, nil
 }
 
-// Readonly reports if this statement is considered readonly by SQLite.
-//
-// See: https://sqlite.org/c3ref/stmt_readonly.html
-func (s *SQLiteStmt) Readonly() bool {
-	return C.sqlite3_stmt_readonly(s.s) == 1
-}
-
 // Close the rows.
 func (rc *SQLiteRows) Close() error {
 	rc.s.mu.Lock()
@@ -2101,6 +1932,9 @@ func (rc *SQLiteRows) Close() error {
 		return nil
 	}
 	rc.closed = true
+	if rc.done != nil {
+		close(rc.done)
+	}
 	if rc.cls {
 		rc.s.mu.Unlock()
 		return rc.s.Close()
@@ -2144,39 +1978,13 @@ func (rc *SQLiteRows) DeclTypes() []string {
 	return rc.declTypes()
 }
 
-// Next move cursor to next. Attempts to honor context timeout from QueryContext call.
+// Next move cursor to next.
 func (rc *SQLiteRows) Next(dest []driver.Value) error {
 	rc.s.mu.Lock()
 	defer rc.s.mu.Unlock()
-
 	if rc.s.closed {
 		return io.EOF
 	}
-
-	if rc.ctx.Done() == nil {
-		return rc.nextSyncLocked(dest)
-	}
-	resultCh := make(chan error)
-	go func() {
-		resultCh <- rc.nextSyncLocked(dest)
-	}()
-	select {
-	case err := <-resultCh:
-		return err
-	case <-rc.ctx.Done():
-		select {
-		case <-resultCh: // no need to interrupt
-		default:
-			// this is still racy and can be no-op if executed between sqlite3_* calls in nextSyncLocked.
-			C.sqlite3_interrupt(rc.s.c.db)
-			<-resultCh // ensure goroutine completed
-		}
-		return rc.ctx.Err()
-	}
-}
-
-// nextSyncLocked moves cursor to next; must be called with locked mutex.
-func (rc *SQLiteRows) nextSyncLocked(dest []driver.Value) error {
 	rv := C._sqlite3_step_internal(rc.s.s)
 	if rv == C.SQLITE_DONE {
 		return io.EOF

sqlite3_context.go

@@ -1,4 +1,4 @@
-// Copyright (C) 2019 Yasuhiro Matsumoto <mattn.jp@gmail.com>.
+// Copyright (C) 2014 Yasuhiro Matsumoto <mattn.jp@gmail.com>.
 //
 // Use of this source code is governed by an MIT-style
 // license that can be found in the LICENSE file.
@@ -8,7 +8,7 @@ package sqlite3
 /*
 
 #ifndef USE_LIBSQLITE3
-#include "sqlite3-binding.h"
+#include <sqlite3-binding.h>
 #else
 #include <sqlite3.h>
 #endif

sqlite3_go113_test.go

@@ -1,119 +0,0 @@
-// Copyright (C) 2019 Yasuhiro Matsumoto <mattn.jp@gmail.com>.
-//
-// Use of this source code is governed by an MIT-style
-// license that can be found in the LICENSE file.
-
-// +build go1.13,cgo
-
-package sqlite3
-
-import (
-	"context"
-	"database/sql"
-	"database/sql/driver"
-	"errors"
-	"os"
-	"testing"
-)
-
-func TestBeginTxCancel(t *testing.T) {
-	srcTempFilename := TempFilename(t)
-	defer os.Remove(srcTempFilename)
-
-	db, err := sql.Open("sqlite3", srcTempFilename)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	db.SetMaxOpenConns(10)
-	db.SetMaxIdleConns(5)
-
-	defer db.Close()
-	initDatabase(t, db, 100)
-
-	// create several go-routines to expose racy issue
-	for i := 0; i < 1000; i++ {
-		func() {
-			ctx, cancel := context.WithCancel(context.Background())
-			conn, err := db.Conn(ctx)
-			if err != nil {
-				t.Fatal(err)
-			}
-			defer func() {
-				if err := conn.Close(); err != nil {
-					t.Error(err)
-				}
-			}()
-
-			err = conn.Raw(func(driverConn interface{}) error {
-				d, ok := driverConn.(driver.ConnBeginTx)
-				if !ok {
-					t.Fatal("unexpected: wrong type")
-				}
-				// checks that conn.Raw can be used to get *SQLiteConn
-				if _, ok = driverConn.(*SQLiteConn); !ok {
-					t.Fatalf("conn.Raw() driverConn type=%T, expected *SQLiteConn", driverConn)
-				}
-
-				go cancel() // make it cancel concurrently with exec("BEGIN");
-				tx, err := d.BeginTx(ctx, driver.TxOptions{})
-				switch err {
-				case nil:
-					switch err := tx.Rollback(); err {
-					case nil, sql.ErrTxDone:
-					default:
-						return err
-					}
-				case context.Canceled:
-				default:
-					// must not fail with "cannot start a transaction within a transaction"
-					return err
-				}
-				return nil
-			})
-			if err != nil {
-				t.Fatal(err)
-			}
-		}()
-	}
-}
-
-func TestStmtReadonly(t *testing.T) {
-	db, err := sql.Open("sqlite3", ":memory:")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	_, err = db.Exec("CREATE TABLE t (count INT)")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	isRO := func(query string) bool {
-		c, err := db.Conn(context.Background())
-		if err != nil {
-			return false
-		}
-
-		var ro bool
-		c.Raw(func(dc interface{}) error {
-			stmt, err := dc.(*SQLiteConn).Prepare(query)
-			if err != nil {
-				return err
-			}
-			if stmt == nil {
-				return errors.New("stmt is nil")
-			}
-			ro = stmt.(*SQLiteStmt).Readonly()
-			return nil
-		})
-		return ro // On errors ro will remain false.
-	}
-
-	if !isRO(`select * from t`) {
-		t.Error("select not seen as read-only")
-	}
-	if isRO(`insert into t values (1), (2)`) {
-		t.Error("insert seen as read-only")
-	}
-}

sqlite3_go18.go

@@ -1,4 +1,4 @@
-// Copyright (C) 2019 Yasuhiro Matsumoto <mattn.jp@gmail.com>.
+// Copyright (C) 2014 Yasuhiro Matsumoto <mattn.jp@gmail.com>.
 //
 // Use of this source code is governed by an MIT-style
 // license that can be found in the LICENSE file.
@@ -10,6 +10,7 @@ package sqlite3
 
 import (
 	"database/sql/driver"
+	"errors"
 
 	"context"
 )
@@ -17,20 +18,27 @@ import (
 // Ping implement Pinger.
 func (c *SQLiteConn) Ping(ctx context.Context) error {
 	if c.db == nil {
-		// must be ErrBadConn for sql to close the database
+		return errors.New("Connection was closed")
-		return driver.ErrBadConn
 	}
 	return nil
 }
 
 // QueryContext implement QueryerContext.
 func (c *SQLiteConn) QueryContext(ctx context.Context, query string, args []driver.NamedValue) (driver.Rows, error) {
-	return c.query(ctx, query, args)
+	list := make([]namedValue, len(args))
+	for i, nv := range args {
+		list[i] = namedValue(nv)
+	}
+	return c.query(ctx, query, list)
 }
 
 // ExecContext implement ExecerContext.
 func (c *SQLiteConn) ExecContext(ctx context.Context, query string, args []driver.NamedValue) (driver.Result, error) {
-	return c.exec(ctx, query, args)
+	list := make([]namedValue, len(args))
+	for i, nv := range args {
+		list[i] = namedValue(nv)
+	}
+	return c.exec(ctx, query, list)
 }
 
 // PrepareContext implement ConnPrepareContext.
@@ -45,10 +53,18 @@ func (c *SQLiteConn) BeginTx(ctx context.Context, opts driver.TxOptions) (driver
 
 // QueryContext implement QueryerContext.
 func (s *SQLiteStmt) QueryContext(ctx context.Context, args []driver.NamedValue) (driver.Rows, error) {
-	return s.query(ctx, args)
+	list := make([]namedValue, len(args))
+	for i, nv := range args {
+		list[i] = namedValue(nv)
+	}
+	return s.query(ctx, list)
 }
 
 // ExecContext implement ExecerContext.
 func (s *SQLiteStmt) ExecContext(ctx context.Context, args []driver.NamedValue) (driver.Result, error) {
-	return s.exec(ctx, args)
+	list := make([]namedValue, len(args))
+	for i, nv := range args {
+		list[i] = namedValue(nv)
+	}
+	return s.exec(ctx, list)
 }

sqlite3_go18_test.go

@@ -1,9 +1,9 @@
-// Copyright (C) 2019 Yasuhiro Matsumoto <mattn.jp@gmail.com>.
+// Copyright (C) 2014 Yasuhiro Matsumoto <mattn.jp@gmail.com>.
 //
 // Use of this source code is governed by an MIT-style
 // license that can be found in the LICENSE file.
 
-// +build go1.8,cgo
+// +build go1.8
 
 package sqlite3
 
@@ -11,10 +11,8 @@ import (
 	"context"
 	"database/sql"
 	"fmt"
-	"io/ioutil"
 	"math/rand"
 	"os"
-	"sync"
 	"testing"
 	"time"
 )
@@ -136,137 +134,6 @@ func TestShortTimeout(t *testing.T) {
 	}
 }
 
-func TestExecContextCancel(t *testing.T) {
-	srcTempFilename := TempFilename(t)
-	defer os.Remove(srcTempFilename)
-
-	db, err := sql.Open("sqlite3", srcTempFilename)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	defer db.Close()
-
-	ts := time.Now()
-	initDatabase(t, db, 1000)
-	spent := time.Since(ts)
-	const minTestTime = 100 * time.Millisecond
-	if spent < minTestTime {
-		t.Skipf("test will be too racy (spent=%s < min=%s) as ExecContext below will be too fast.",
-			spent.String(), minTestTime.String(),
-		)
-	}
-
-	// expected to be extremely slow query
-	q := `
-INSERT INTO test_table (key1, key_id, key2, key3, key4, key5, key6, data)
-SELECT t1.key1 || t2.key1, t1.key_id || t2.key_id, t1.key2 || t2.key2, t1.key3 || t2.key3, t1.key4 || t2.key4, t1.key5 || t2.key5, t1.key6 || t2.key6, t1.data || t2.data
-FROM test_table t1 LEFT OUTER JOIN test_table t2`
-	// expect query above take ~ same time as setup above
-	// This is racy: the context must be valid so sql/db.ExecContext calls the sqlite3 driver.
-	// It starts the query, the context expires, then calls sqlite3_interrupt
-	ctx, cancel := context.WithTimeout(context.Background(), minTestTime/2)
-	defer cancel()
-	ts = time.Now()
-	r, err := db.ExecContext(ctx, q)
-	// racy check
-	if r != nil {
-		n, err := r.RowsAffected()
-		t.Logf("query should not have succeeded: rows=%d; err=%v; duration=%s",
-			n, err, time.Since(ts).String())
-	}
-	if err != context.DeadlineExceeded {
-		t.Fatal(err, ctx.Err())
-	}
-}
-
-func TestQueryRowContextCancel(t *testing.T) {
-	srcTempFilename := TempFilename(t)
-	defer os.Remove(srcTempFilename)
-
-	db, err := sql.Open("sqlite3", srcTempFilename)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer db.Close()
-	initDatabase(t, db, 100)
-
-	const query = `SELECT key_id FROM test_table ORDER BY key2 ASC`
-	var keyID string
-	unexpectedErrors := make(map[string]int)
-	for i := 0; i < 10000; i++ {
-		ctx, cancel := context.WithCancel(context.Background())
-		row := db.QueryRowContext(ctx, query)
-
-		cancel()
-		// it is fine to get "nil" as context cancellation can be handled with delay
-		if err := row.Scan(&keyID); err != nil && err != context.Canceled {
-			if err.Error() == "sql: Rows are closed" {
-				// see https://github.com/golang/go/issues/24431
-				// fixed in 1.11.1 to properly return context error
-				continue
-			}
-			unexpectedErrors[err.Error()]++
-		}
-	}
-	for errText, count := range unexpectedErrors {
-		t.Error(errText, count)
-	}
-}
-
-func TestQueryRowContextCancelParallel(t *testing.T) {
-	srcTempFilename := TempFilename(t)
-	defer os.Remove(srcTempFilename)
-
-	db, err := sql.Open("sqlite3", srcTempFilename)
-	if err != nil {
-		t.Fatal(err)
-	}
-	db.SetMaxOpenConns(10)
-	db.SetMaxIdleConns(5)
-
-	defer db.Close()
-	initDatabase(t, db, 100)
-
-	const query = `SELECT key_id FROM test_table ORDER BY key2 ASC`
-	wg := sync.WaitGroup{}
-	defer wg.Wait()
-
-	testCtx, cancel := context.WithCancel(context.Background())
-	defer cancel()
-
-	for i := 0; i < 10; i++ {
-		wg.Add(1)
-		go func() {
-			defer wg.Done()
-
-			var keyID string
-			for {
-				select {
-				case <-testCtx.Done():
-					return
-				default:
-				}
-				ctx, cancel := context.WithCancel(context.Background())
-				row := db.QueryRowContext(ctx, query)
-
-				cancel()
-				_ = row.Scan(&keyID) // see TestQueryRowContextCancel
-			}
-		}()
-	}
-
-	var keyID string
-	for i := 0; i < 10000; i++ {
-		// note that testCtx is not cancelled during query execution
-		row := db.QueryRowContext(testCtx, query)
-
-		if err := row.Scan(&keyID); err != nil {
-			t.Fatal(i, err)
-		}
-	}
-}
-
 func TestExecCancel(t *testing.T) {
 	db, err := sql.Open("sqlite3", ":memory:")
 	if err != nil {
@@ -287,217 +154,3 @@ func TestExecCancel(t *testing.T) {
 		}
 	}
 }
-
-func doTestOpenContext(t *testing.T, option string) (string, error) {
-	tempFilename := TempFilename(t)
-	url := tempFilename + option
-
-	defer func() {
-		err := os.Remove(tempFilename)
-		if err != nil {
-			t.Error("temp file remove error:", err)
-		}
-	}()
-
-	db, err := sql.Open("sqlite3", url)
-	if err != nil {
-		return "Failed to open database:", err
-	}
-
-	defer func() {
-		err = db.Close()
-		if err != nil {
-			t.Error("db close error:", err)
-		}
-	}()
-
-	ctx, cancel := context.WithTimeout(context.Background(), 55*time.Second)
-	err = db.PingContext(ctx)
-	cancel()
-	if err != nil {
-		return "ping error:", err
-	}
-
-	ctx, cancel = context.WithTimeout(context.Background(), 55*time.Second)
-	_, err = db.ExecContext(ctx, "drop table foo")
-	cancel()
-	ctx, cancel = context.WithTimeout(context.Background(), 55*time.Second)
-	_, err = db.ExecContext(ctx, "create table foo (id integer)")
-	cancel()
-	if err != nil {
-		return "Failed to create table:", err
-	}
-
-	if stat, err := os.Stat(tempFilename); err != nil || stat.IsDir() {
-		return "Failed to create ./foo.db", nil
-	}
-
-	return "", nil
-}
-
-func TestOpenContext(t *testing.T) {
-	cases := map[string]bool{
-		"":                   true,
-		"?_txlock=immediate": true,
-		"?_txlock=deferred":  true,
-		"?_txlock=exclusive": true,
-		"?_txlock=bogus":     false,
-	}
-	for option, expectedPass := range cases {
-		result, err := doTestOpenContext(t, option)
-		if result == "" {
-			if !expectedPass {
-				errmsg := fmt.Sprintf("_txlock error not caught at dbOpen with option: %s", option)
-				t.Fatal(errmsg)
-			}
-		} else if expectedPass {
-			if err == nil {
-				t.Fatal(result)
-			} else {
-				t.Fatal(result, err)
-			}
-		}
-	}
-}
-
-func TestFileCopyTruncate(t *testing.T) {
-	var err error
-	tempFilename := TempFilename(t)
-
-	defer func() {
-		err = os.Remove(tempFilename)
-		if err != nil {
-			t.Error("temp file remove error:", err)
-		}
-	}()
-
-	db, err := sql.Open("sqlite3", tempFilename)
-	if err != nil {
-		t.Fatal("open error:", err)
-	}
-
-	defer func() {
-		err = db.Close()
-		if err != nil {
-			t.Error("db close error:", err)
-		}
-	}()
-
-	ctx, cancel := context.WithTimeout(context.Background(), 55*time.Second)
-	err = db.PingContext(ctx)
-	cancel()
-	if err != nil {
-		t.Fatal("ping error:", err)
-	}
-
-	ctx, cancel = context.WithTimeout(context.Background(), 55*time.Second)
-	_, err = db.ExecContext(ctx, "drop table foo")
-	cancel()
-	ctx, cancel = context.WithTimeout(context.Background(), 55*time.Second)
-	_, err = db.ExecContext(ctx, "create table foo (id integer)")
-	cancel()
-	if err != nil {
-		t.Fatal("create table error:", err)
-	}
-
-	// copy db to new file
-	var data []byte
-	data, err = ioutil.ReadFile(tempFilename)
-	if err != nil {
-		t.Fatal("read file error:", err)
-	}
-
-	var f *os.File
-	f, err = os.Create(tempFilename + "-db-copy")
-	if err != nil {
-		t.Fatal("create file error:", err)
-	}
-
-	defer func() {
-		err = os.Remove(tempFilename + "-db-copy")
-		if err != nil {
-			t.Error("temp file moved remove error:", err)
-		}
-	}()
-
-	_, err = f.Write(data)
-	if err != nil {
-		f.Close()
-		t.Fatal("write file error:", err)
-	}
-	err = f.Close()
-	if err != nil {
-		t.Fatal("close file error:", err)
-	}
-
-	// truncate current db file
-	f, err = os.OpenFile(tempFilename, os.O_WRONLY|os.O_TRUNC, 0666)
-	if err != nil {
-		t.Fatal("open file error:", err)
-	}
-	err = f.Close()
-	if err != nil {
-		t.Fatal("close file error:", err)
-	}
-
-	// test db after file truncate
-	ctx, cancel = context.WithTimeout(context.Background(), 55*time.Second)
-	err = db.PingContext(ctx)
-	cancel()
-	if err != nil {
-		t.Fatal("ping error:", err)
-	}
-
-	ctx, cancel = context.WithTimeout(context.Background(), 55*time.Second)
-	_, err = db.ExecContext(ctx, "drop table foo")
-	cancel()
-	if err == nil {
-		t.Fatal("drop table no error")
-	}
-
-	ctx, cancel = context.WithTimeout(context.Background(), 55*time.Second)
-	_, err = db.ExecContext(ctx, "create table foo (id integer)")
-	cancel()
-	if err != nil {
-		t.Fatal("create table error:", err)
-	}
-
-	err = db.Close()
-	if err != nil {
-		t.Error("db close error:", err)
-	}
-
-	// test copied file
-	db, err = sql.Open("sqlite3", tempFilename+"-db-copy")
-	if err != nil {
-		t.Fatal("open error:", err)
-	}
-
-	defer func() {
-		err = db.Close()
-		if err != nil {
-			t.Error("db close error:", err)
-		}
-	}()
-
-	ctx, cancel = context.WithTimeout(context.Background(), 55*time.Second)
-	err = db.PingContext(ctx)
-	cancel()
-	if err != nil {
-		t.Fatal("ping error:", err)
-	}
-
-	ctx, cancel = context.WithTimeout(context.Background(), 55*time.Second)
-	_, err = db.ExecContext(ctx, "drop table foo")
-	cancel()
-	if err != nil {
-		t.Fatal("drop table error:", err)
-	}
-
-	ctx, cancel = context.WithTimeout(context.Background(), 55*time.Second)
-	_, err = db.ExecContext(ctx, "create table foo (id integer)")
-	cancel()
-	if err != nil {
-		t.Fatal("create table error:", err)
-	}
-}

sqlite3_libsqlite3.go

@@ -1,4 +1,4 @@
-// Copyright (C) 2019 Yasuhiro Matsumoto <mattn.jp@gmail.com>.
+// Copyright (C) 2014 Yasuhiro Matsumoto <mattn.jp@gmail.com>.
 //
 // Use of this source code is governed by an MIT-style
 // license that can be found in the LICENSE file.
@@ -11,9 +11,7 @@ package sqlite3
 #cgo CFLAGS: -DUSE_LIBSQLITE3
 #cgo linux LDFLAGS: -lsqlite3
 #cgo darwin LDFLAGS: -L/usr/local/opt/sqlite/lib -lsqlite3
-#cgo darwin CFLAGS: -I/usr/local/opt/sqlite/include
 #cgo openbsd LDFLAGS: -lsqlite3
 #cgo solaris LDFLAGS: -lsqlite3
-#cgo windows LDFLAGS: -lsqlite3
 */
 import "C"

sqlite3_load_extension.go

@@ -1,4 +1,4 @@
-// Copyright (C) 2019 Yasuhiro Matsumoto <mattn.jp@gmail.com>.
+// Copyright (C) 2014 Yasuhiro Matsumoto <mattn.jp@gmail.com>.
 //
 // Use of this source code is governed by an MIT-style
 // license that can be found in the LICENSE file.
@@ -9,7 +9,7 @@ package sqlite3
 
 /*
 #ifndef USE_LIBSQLITE3
-#include "sqlite3-binding.h"
+#include <sqlite3-binding.h>
 #else
 #include <sqlite3.h>
 #endif
@@ -28,9 +28,12 @@ func (c *SQLiteConn) loadExtensions(extensions []string) error {
 	}
 
 	for _, extension := range extensions {
-		if err := c.loadExtension(extension, nil); err != nil {
+		cext := C.CString(extension)
+		defer C.free(unsafe.Pointer(cext))
+		rv = C.sqlite3_load_extension(c.db, cext, nil, nil)
+		if rv != C.SQLITE_OK {
 			C.sqlite3_enable_load_extension(c.db, 0)
-			return err
+			return errors.New(C.GoString(C.sqlite3_errmsg(c.db)))
 		}
 	}
 
@@ -38,7 +41,6 @@ func (c *SQLiteConn) loadExtensions(extensions []string) error {
 	if rv != C.SQLITE_OK {
 		return errors.New(C.GoString(C.sqlite3_errmsg(c.db)))
 	}
-
 	return nil
 }
 
@@ -49,9 +51,14 @@ func (c *SQLiteConn) LoadExtension(lib string, entry string) error {
 		return errors.New(C.GoString(C.sqlite3_errmsg(c.db)))
 	}
 
-	if err := c.loadExtension(lib, &entry); err != nil {
+	clib := C.CString(lib)
-		C.sqlite3_enable_load_extension(c.db, 0)
+	defer C.free(unsafe.Pointer(clib))
-		return err
+	centry := C.CString(entry)
+	defer C.free(unsafe.Pointer(centry))
+
+	rv = C.sqlite3_load_extension(c.db, clib, centry, nil)
+	if rv != C.SQLITE_OK {
+		return errors.New(C.GoString(C.sqlite3_errmsg(c.db)))
 	}
 
 	rv = C.sqlite3_enable_load_extension(c.db, 0)
@@ -61,24 +68,3 @@ func (c *SQLiteConn) LoadExtension(lib string, entry string) error {
 
 	return nil
 }
-
-func (c *SQLiteConn) loadExtension(lib string, entry *string) error {
-	clib := C.CString(lib)
-	defer C.free(unsafe.Pointer(clib))
-
-	var centry *C.char
-	if entry != nil {
-		centry = C.CString(*entry)
-		defer C.free(unsafe.Pointer(centry))
-	}
-
-	var errMsg *C.char
-	defer C.sqlite3_free(unsafe.Pointer(errMsg))
-
-	rv := C.sqlite3_load_extension(c.db, clib, centry, &errMsg)
-	if rv != C.SQLITE_OK {
-		return errors.New(C.GoString(errMsg))
-	}
-
-	return nil
-}

sqlite3_load_extension_omit.go

@@ -1,4 +1,4 @@
-// Copyright (C) 2019 Yasuhiro Matsumoto <mattn.jp@gmail.com>.
+// Copyright (C) 2014 Yasuhiro Matsumoto <mattn.jp@gmail.com>.
 //
 // Use of this source code is governed by an MIT-style
 // license that can be found in the LICENSE file.

sqlite3_load_extension_test.go

@@ -1,63 +0,0 @@
-// Copyright (C) 2019 Yasuhiro Matsumoto <mattn.jp@gmail.com>.
-//
-// Use of this source code is governed by an MIT-style
-// license that can be found in the LICENSE file.
-
-// +build !sqlite_omit_load_extension
-
-package sqlite3
-
-import (
-	"database/sql"
-	"testing"
-)
-
-func TestExtensionsError(t *testing.T) {
-	sql.Register("sqlite3_TestExtensionsError",
-		&SQLiteDriver{
-			Extensions: []string{
-				"foobar",
-			},
-		},
-	)
-
-	db, err := sql.Open("sqlite3_TestExtensionsError", ":memory:")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer db.Close()
-
-	err = db.Ping()
-	if err == nil {
-		t.Fatal("expected error loading non-existent extension")
-	}
-
-	if err.Error() == "not an error" {
-		t.Fatal("expected error from sqlite3_enable_load_extension to be returned")
-	}
-}
-
-func TestLoadExtensionError(t *testing.T) {
-	sql.Register("sqlite3_TestLoadExtensionError",
-		&SQLiteDriver{
-			ConnectHook: func(c *SQLiteConn) error {
-				return c.LoadExtension("foobar", "")
-			},
-		},
-	)
-
-	db, err := sql.Open("sqlite3_TestLoadExtensionError", ":memory:")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer db.Close()
-
-	err = db.Ping()
-	if err == nil {
-		t.Fatal("expected error loading non-existent extension")
-	}
-
-	if err.Error() == "not an error" {
-		t.Fatal("expected error from sqlite3_enable_load_extension to be returned")
-	}
-}

sqlite3_opt_allow_uri_authority.go

@@ -1,4 +1,4 @@
-// Copyright (C) 2019 Yasuhiro Matsumoto <mattn.jp@gmail.com>.
+// Copyright (C) 2014 Yasuhiro Matsumoto <mattn.jp@gmail.com>.
 // Copyright (C) 2018 G.J.R. Timmer <gjr.timmer@gmail.com>.
 //
 // Use of this source code is governed by an MIT-style

sqlite3_opt_app_armor.go

@@ -1,6 +1,6 @@
-// Copyright (C) 2019 Yasuhiro Matsumoto <mattn.jp@gmail.com>.
+// Copyright (C) 2014 Yasuhiro Matsumoto <mattn.jp@gmail.com>.
 // Copyright (C) 2018 G.J.R. Timmer <gjr.timmer@gmail.com>.
-//
+
 // Use of this source code is governed by an MIT-style
 // license that can be found in the LICENSE file.
 

sqlite3_opt_column_metadata.go

@@ -1,21 +0,0 @@
-// +build sqlite_column_metadata
-
-package sqlite3
-
-/*
-#ifndef USE_LIBSQLITE3
-#cgo CFLAGS: -DSQLITE_ENABLE_COLUMN_METADATA
-#include <sqlite3-binding.h>
-#else
-#include <sqlite3.h>
-#endif
-*/
-import "C"
-
-// ColumnTableName returns the table that is the origin of a particular result
-// column in a SELECT statement.
-//
-// See https://www.sqlite.org/c3ref/column_database_name.html
-func (s *SQLiteStmt) ColumnTableName(n int) string {
-	return C.GoString(C.sqlite3_column_table_name(s.s, C.int(n)))
-}

sqlite3_opt_column_metadata_test.go

@@ -1,39 +0,0 @@
-// +build sqlite_column_metadata
-
-package sqlite3
-
-import "testing"
-
-func TestColumnTableName(t *testing.T) {
-	d := SQLiteDriver{}
-	conn, err := d.Open(":memory:")
-	if err != nil {
-		t.Fatal("failed to get database connection:", err)
-	}
-	defer conn.Close()
-	sqlite3conn := conn.(*SQLiteConn)
-
-	_, err = sqlite3conn.Exec(`CREATE TABLE foo (name string)`, nil)
-	if err != nil {
-		t.Fatal("Failed to create table:", err)
-	}
-	_, err = sqlite3conn.Exec(`CREATE TABLE bar (name string)`, nil)
-	if err != nil {
-		t.Fatal("Failed to create table:", err)
-	}
-
-	stmt, err := sqlite3conn.Prepare(`SELECT * FROM foo JOIN bar ON foo.name = bar.name`)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if exp, got := "foo", stmt.(*SQLiteStmt).ColumnTableName(0); exp != got {
-		t.Fatalf("Incorrect table name returned expected: %s, got: %s", exp, got)
-	}
-	if exp, got := "bar", stmt.(*SQLiteStmt).ColumnTableName(1); exp != got {
-		t.Fatalf("Incorrect table name returned expected: %s, got: %s", exp, got)
-	}
-	if exp, got := "", stmt.(*SQLiteStmt).ColumnTableName(2); exp != got {
-		t.Fatalf("Incorrect table name returned expected: %s, got: %s", exp, got)
-	}
-}

sqlite3_opt_foreign_keys.go

@@ -1,4 +1,4 @@
-// Copyright (C) 2019 Yasuhiro Matsumoto <mattn.jp@gmail.com>.
+// Copyright (C) 2014 Yasuhiro Matsumoto <mattn.jp@gmail.com>.
 // Copyright (C) 2018 G.J.R. Timmer <gjr.timmer@gmail.com>.
 //
 // Use of this source code is governed by an MIT-style

sqlite3_opt_fts3_test.go

@@ -1,10 +1,8 @@
-// Copyright (C) 2019 Yasuhiro Matsumoto <mattn.jp@gmail.com>.
+// Copyright (C) 2015 Yasuhiro Matsumoto <mattn.jp@gmail.com>.
 //
 // Use of this source code is governed by an MIT-style
 // license that can be found in the LICENSE file.
 
-// +build cgo
-
 package sqlite3
 
 import (

sqlite3_opt_fts5.go

@@ -1,4 +1,4 @@
-// Copyright (C) 2019 Yasuhiro Matsumoto <mattn.jp@gmail.com>.
+// Copyright (C) 2014 Yasuhiro Matsumoto <mattn.jp@gmail.com>.
 //
 // Use of this source code is governed by an MIT-style
 // license that can be found in the LICENSE file.

sqlite3_opt_icu.go

@@ -1,4 +1,4 @@
-// Copyright (C) 2019 Yasuhiro Matsumoto <mattn.jp@gmail.com>.
+// Copyright (C) 2014 Yasuhiro Matsumoto <mattn.jp@gmail.com>.
 //
 // Use of this source code is governed by an MIT-style
 // license that can be found in the LICENSE file.

sqlite3_opt_introspect.go

@@ -1,4 +1,4 @@
-// Copyright (C) 2019 Yasuhiro Matsumoto <mattn.jp@gmail.com>.
+// Copyright (C) 2014 Yasuhiro Matsumoto <mattn.jp@gmail.com>.
 // Copyright (C) 2018 G.J.R. Timmer <gjr.timmer@gmail.com>.
 
 // Use of this source code is governed by an MIT-style

sqlite3_opt_json1.go

@@ -0,0 +1,13 @@
+// Copyright (C) 2014 Yasuhiro Matsumoto <mattn.jp@gmail.com>.
+//
+// Use of this source code is governed by an MIT-style
+// license that can be found in the LICENSE file.
+
+// +build sqlite_json sqlite_json1 json1
+
+package sqlite3
+
+/*
+#cgo CFLAGS: -DSQLITE_ENABLE_JSON1
+*/
+import "C"

sqlite3_opt_math_functions.go

@@ -1,14 +0,0 @@
-// Copyright (C) 2022 Yasuhiro Matsumoto <mattn.jp@gmail.com>.
-//
-// Use of this source code is governed by an MIT-style
-// license that can be found in the LICENSE file.
-
-// +build sqlite_math_functions
-
-package sqlite3
-
-/*
-#cgo CFLAGS: -DSQLITE_ENABLE_MATH_FUNCTIONS
-#cgo LDFLAGS: -lm
-*/
-import "C"

sqlite3_opt_math_functions_test.go

@@ -1,29 +0,0 @@
-// +build sqlite_math_functions
-
-package sqlite3
-
-import (
-	"database/sql"
-	"testing"
-)
-
-func TestMathFunctions(t *testing.T) {
-	db, err := sql.Open("sqlite3", ":memory:")
-	if err != nil {
-		t.Fatal("Failed to open database:", err)
-	}
-	defer db.Close()
-
-	queries := []string{
-		`SELECT acos(1)`,
-		`SELECT log(10, 100)`,
-		`SELECT power(2, 2)`,
-	}
-
-	for _, query := range queries {
-		var result float64
-		if err := db.QueryRow(query).Scan(&result); err != nil {
-			t.Errorf("invoking math function query %q: %v", query, err)
-		}
-	}
-}

sqlite3_opt_os_trace.go

@@ -1,15 +0,0 @@
-// Copyright (C) 2022 Yasuhiro Matsumoto <mattn.jp@gmail.com>.
-//
-// Use of this source code is governed by an MIT-style
-// license that can be found in the LICENSE file.
-
-//go:build sqlite_os_trace
-// +build sqlite_os_trace
-
-package sqlite3
-
-/*
-#cgo CFLAGS: -DSQLITE_FORCE_OS_TRACE=1
-#cgo CFLAGS: -DSQLITE_DEBUG_OS_TRACE=1
-*/
-import "C"

sqlite3_opt_preupdate.go

@@ -1,20 +0,0 @@
-// Copyright (C) 2019 G.J.R. Timmer <gjr.timmer@gmail.com>.
-// Copyright (C) 2018 segment.com <friends@segment.com>
-//
-// Use of this source code is governed by an MIT-style
-// license that can be found in the LICENSE file.
-
-// +build cgo
-
-package sqlite3
-
-// SQLitePreUpdateData represents all of the data available during a
-// pre-update hook call.
-type SQLitePreUpdateData struct {
-	Conn         *SQLiteConn
-	Op           int
-	DatabaseName string
-	TableName    string
-	OldRowID     int64
-	NewRowID     int64
-}

sqlite3_opt_preupdate_hook.go

@@ -1,112 +0,0 @@
-// Copyright (C) 2019 G.J.R. Timmer <gjr.timmer@gmail.com>.
-// Copyright (C) 2018 segment.com <friends@segment.com>
-//
-// Use of this source code is governed by an MIT-style
-// license that can be found in the LICENSE file.
-
-// +build sqlite_preupdate_hook
-
-package sqlite3
-
-/*
-#cgo CFLAGS: -DSQLITE_ENABLE_PREUPDATE_HOOK
-#cgo LDFLAGS: -lm
-
-#ifndef USE_LIBSQLITE3
-#include "sqlite3-binding.h"
-#else
-#include <sqlite3.h>
-#endif
-#include <stdlib.h>
-#include <string.h>
-
-void preUpdateHookTrampoline(void*, sqlite3 *, int, char *, char *, sqlite3_int64, sqlite3_int64);
-*/
-import "C"
-import (
-	"errors"
-	"unsafe"
-)
-
-// RegisterPreUpdateHook sets the pre-update hook for a connection.
-//
-// The callback is passed a SQLitePreUpdateData struct with the data for
-// the update, as well as methods for fetching copies of impacted data.
-//
-// If there is an existing preupdate hook for this connection, it will be
-// removed. If callback is nil the existing hook (if any) will be removed
-// without creating a new one.
-func (c *SQLiteConn) RegisterPreUpdateHook(callback func(SQLitePreUpdateData)) {
-	if callback == nil {
-		C.sqlite3_preupdate_hook(c.db, nil, nil)
-	} else {
-		C.sqlite3_preupdate_hook(c.db, (*[0]byte)(unsafe.Pointer(C.preUpdateHookTrampoline)), unsafe.Pointer(newHandle(c, callback)))
-	}
-}
-
-// Depth returns the source path of the write, see sqlite3_preupdate_depth()
-func (d *SQLitePreUpdateData) Depth() int {
-	return int(C.sqlite3_preupdate_depth(d.Conn.db))
-}
-
-// Count returns the number of columns in the row
-func (d *SQLitePreUpdateData) Count() int {
-	return int(C.sqlite3_preupdate_count(d.Conn.db))
-}
-
-func (d *SQLitePreUpdateData) row(dest []interface{}, new bool) error {
-	for i := 0; i < d.Count() && i < len(dest); i++ {
-		var val *C.sqlite3_value
-		var src interface{}
-
-		// Initially I tried making this just a function pointer argument, but
-		// it's absurdly complicated to pass C function pointers.
-		if new {
-			C.sqlite3_preupdate_new(d.Conn.db, C.int(i), &val)
-		} else {
-			C.sqlite3_preupdate_old(d.Conn.db, C.int(i), &val)
-		}
-
-		switch C.sqlite3_value_type(val) {
-		case C.SQLITE_INTEGER:
-			src = int64(C.sqlite3_value_int64(val))
-		case C.SQLITE_FLOAT:
-			src = float64(C.sqlite3_value_double(val))
-		case C.SQLITE_BLOB:
-			len := C.sqlite3_value_bytes(val)
-			blobptr := C.sqlite3_value_blob(val)
-			src = C.GoBytes(blobptr, len)
-		case C.SQLITE_TEXT:
-			len := C.sqlite3_value_bytes(val)
-			cstrptr := unsafe.Pointer(C.sqlite3_value_text(val))
-			src = C.GoBytes(cstrptr, len)
-		case C.SQLITE_NULL:
-			src = nil
-		}
-
-		err := convertAssign(&dest[i], src)
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-// Old populates dest with the row data to be replaced. This works similar to
-// database/sql's Rows.Scan()
-func (d *SQLitePreUpdateData) Old(dest ...interface{}) error {
-	if d.Op == SQLITE_INSERT {
-		return errors.New("There is no old row for INSERT operations")
-	}
-	return d.row(dest, false)
-}
-
-// New populates dest with the replacement row data. This works similar to
-// database/sql's Rows.Scan()
-func (d *SQLitePreUpdateData) New(dest ...interface{}) error {
-	if d.Op == SQLITE_DELETE {
-		return errors.New("There is no new row for DELETE operations")
-	}
-	return d.row(dest, true)
-}

sqlite3_opt_preupdate_hook_test.go

@@ -1,128 +0,0 @@
-// Copyright (C) 2019 G.J.R. Timmer <gjr.timmer@gmail.com>.
-// Copyright (C) 2018 segment.com <friends@segment.com>
-//
-// Use of this source code is governed by an MIT-style
-// license that can be found in the LICENSE file.
-
-// +build sqlite_preupdate_hook
-
-package sqlite3
-
-import (
-	"database/sql"
-	"testing"
-)
-
-type preUpdateHookDataForTest struct {
-	databaseName string
-	tableName    string
-	count        int
-	op           int
-	oldRow       []interface{}
-	newRow       []interface{}
-}
-
-func TestPreUpdateHook(t *testing.T) {
-	var events []preUpdateHookDataForTest
-
-	sql.Register("sqlite3_PreUpdateHook", &SQLiteDriver{
-		ConnectHook: func(conn *SQLiteConn) error {
-			conn.RegisterPreUpdateHook(func(data SQLitePreUpdateData) {
-				eval := -1
-				oldRow := []interface{}{eval}
-				if data.Op != SQLITE_INSERT {
-					err := data.Old(oldRow...)
-					if err != nil {
-						t.Fatalf("Unexpected error calling SQLitePreUpdateData.Old: %v", err)
-					}
-				}
-
-				eval2 := -1
-				newRow := []interface{}{eval2}
-				if data.Op != SQLITE_DELETE {
-					err := data.New(newRow...)
-					if err != nil {
-						t.Fatalf("Unexpected error calling SQLitePreUpdateData.New: %v", err)
-					}
-				}
-
-				// tests dest bound checks in loop
-				var tooSmallRow []interface{}
-				if data.Op != SQLITE_INSERT {
-					err := data.Old(tooSmallRow...)
-					if err != nil {
-						t.Fatalf("Unexpected error calling SQLitePreUpdateData.Old: %v", err)
-					}
-					if len(tooSmallRow) != 0 {
-						t.Errorf("Expected tooSmallRow to be empty, got: %v", tooSmallRow)
-					}
-				}
-
-				events = append(events, preUpdateHookDataForTest{
-					databaseName: data.DatabaseName,
-					tableName:    data.TableName,
-					count:        data.Count(),
-					op:           data.Op,
-					oldRow:       oldRow,
-					newRow:       newRow,
-				})
-			})
-			return nil
-		},
-	})
-
-	db, err := sql.Open("sqlite3_PreUpdateHook", ":memory:")
-	if err != nil {
-		t.Fatal("Failed to open database:", err)
-	}
-	defer db.Close()
-
-	statements := []string{
-		"create table foo (id integer primary key)",
-		"insert into foo values (9)",
-		"update foo set id = 99 where id = 9",
-		"delete from foo where id = 99",
-	}
-	for _, statement := range statements {
-		_, err = db.Exec(statement)
-		if err != nil {
-			t.Fatalf("Unable to prepare test data [%v]: %v", statement, err)
-		}
-	}
-
-	if len(events) != 3 {
-		t.Errorf("Events should be 3 entries, got: %d", len(events))
-	}
-
-	if events[0].op != SQLITE_INSERT {
-		t.Errorf("Op isn't as expected: %v", events[0].op)
-	}
-
-	if events[1].op != SQLITE_UPDATE {
-		t.Errorf("Op isn't as expected: %v", events[1].op)
-	}
-
-	if events[1].count != 1 {
-		t.Errorf("Expected event row 1 to have 1 column, had: %v", events[1].count)
-	}
-
-	newRow_0_0 := events[0].newRow[0].(int64)
-	if newRow_0_0 != 9 {
-		t.Errorf("Expected event row 0 new column 0 to be == 9, got: %v", newRow_0_0)
-	}
-
-	oldRow_1_0 := events[1].oldRow[0].(int64)
-	if oldRow_1_0 != 9 {
-		t.Errorf("Expected event row 1 old column 0 to be == 9, got: %v", oldRow_1_0)
-	}
-
-	newRow_1_0 := events[1].newRow[0].(int64)
-	if newRow_1_0 != 99 {
-		t.Errorf("Expected event row 1 new column 0 to be == 99, got: %v", newRow_1_0)
-	}
-
-	oldRow_2_0 := events[2].oldRow[0].(int64)
-	if oldRow_2_0 != 99 {
-		t.Errorf("Expected event row 1 new column 0 to be == 99, got: %v", oldRow_2_0)
-	}
-}

sqlite3_opt_preupdate_omit.go

@@ -1,21 +0,0 @@
-// Copyright (C) 2019 G.J.R. Timmer <gjr.timmer@gmail.com>.
-// Copyright (C) 2018 segment.com <friends@segment.com>
-//
-// Use of this source code is governed by an MIT-style
-// license that can be found in the LICENSE file.
-
-// +build !sqlite_preupdate_hook,cgo
-
-package sqlite3
-
-// RegisterPreUpdateHook sets the pre-update hook for a connection.
-//
-// The callback is passed a SQLitePreUpdateData struct with the data for
-// the update, as well as methods for fetching copies of impacted data.
-//
-// If there is an existing preupdate hook for this connection, it will be
-// removed. If callback is nil the existing hook (if any) will be removed
-// without creating a new one.
-func (c *SQLiteConn) RegisterPreUpdateHook(callback func(SQLitePreUpdateData)) {
-	// NOOP
-}

sqlite3_opt_secure_delete.go

@@ -1,4 +1,4 @@
-// Copyright (C) 2019 Yasuhiro Matsumoto <mattn.jp@gmail.com>.
+// Copyright (C) 2014 Yasuhiro Matsumoto <mattn.jp@gmail.com>.
 // Copyright (C) 2018 G.J.R. Timmer <gjr.timmer@gmail.com>.
 //
 // Use of this source code is governed by an MIT-style

sqlite3_opt_secure_delete_fast.go

@@ -1,4 +1,4 @@
-// Copyright (C) 2019 Yasuhiro Matsumoto <mattn.jp@gmail.com>.
+// Copyright (C) 2014 Yasuhiro Matsumoto <mattn.jp@gmail.com>.
 // Copyright (C) 2018 G.J.R. Timmer <gjr.timmer@gmail.com>.
 //
 // Use of this source code is governed by an MIT-style

sqlite3_opt_serialize.go

@@ -1,82 +0,0 @@
-// +build !libsqlite3 sqlite_serialize
-
-package sqlite3
-
-/*
-#ifndef USE_LIBSQLITE3
-#include <sqlite3-binding.h>
-#else
-#include <sqlite3.h>
-#endif
-#include <stdlib.h>
-#include <stdint.h>
-*/
-import "C"
-
-import (
-	"fmt"
-	"math"
-	"reflect"
-	"unsafe"
-)
-
-// Serialize returns a byte slice that is a serialization of the database.
-//
-// See https://www.sqlite.org/c3ref/serialize.html
-func (c *SQLiteConn) Serialize(schema string) ([]byte, error) {
-	if schema == "" {
-		schema = "main"
-	}
-	var zSchema *C.char
-	zSchema = C.CString(schema)
-	defer C.free(unsafe.Pointer(zSchema))
-
-	var sz C.sqlite3_int64
-	ptr := C.sqlite3_serialize(c.db, zSchema, &sz, 0)
-	if ptr == nil {
-		return nil, fmt.Errorf("serialize failed")
-	}
-	defer C.sqlite3_free(unsafe.Pointer(ptr))
-
-	if sz > C.sqlite3_int64(math.MaxInt) {
-		return nil, fmt.Errorf("serialized database is too large (%d bytes)", sz)
-	}
-
-	cBuf := *(*[]byte)(unsafe.Pointer(&reflect.SliceHeader{
-		Data: uintptr(unsafe.Pointer(ptr)),
-		Len:  int(sz),
-		Cap:  int(sz),
-	}))
-
-	res := make([]byte, int(sz))
-	copy(res, cBuf)
-	return res, nil
-}
-
-// Deserialize causes the connection to disconnect from the current database and
-// then re-open as an in-memory database based on the contents of the byte slice.
-//
-// See https://www.sqlite.org/c3ref/deserialize.html
-func (c *SQLiteConn) Deserialize(b []byte, schema string) error {
-	if schema == "" {
-		schema = "main"
-	}
-	var zSchema *C.char
-	zSchema = C.CString(schema)
-	defer C.free(unsafe.Pointer(zSchema))
-
-	tmpBuf := (*C.uchar)(C.sqlite3_malloc64(C.sqlite3_uint64(len(b))))
-	cBuf := *(*[]byte)(unsafe.Pointer(&reflect.SliceHeader{
-		Data: uintptr(unsafe.Pointer(tmpBuf)),
-		Len:  len(b),
-		Cap:  len(b),
-	}))
-	copy(cBuf, b)
-
-	rc := C.sqlite3_deserialize(c.db, zSchema, tmpBuf, C.sqlite3_int64(len(b)),
-		C.sqlite3_int64(len(b)), C.SQLITE_DESERIALIZE_FREEONCLOSE)
-	if rc != C.SQLITE_OK {
-		return fmt.Errorf("deserialize failed with return %v", rc)
-	}
-	return nil
-}

sqlite3_opt_serialize_omit.go

@@ -1,20 +0,0 @@
-// +build libsqlite3,!sqlite_serialize
-
-package sqlite3
-
-import (
-	"errors"
-)
-
-/*
-#cgo CFLAGS: -DSQLITE_OMIT_DESERIALIZE
-*/
-import "C"
-
-func (c *SQLiteConn) Serialize(schema string) ([]byte, error) {
-	return nil, errors.New("sqlite3: Serialize requires the sqlite_serialize build tag when using the libsqlite3 build tag")
-}
-
-func (c *SQLiteConn) Deserialize(b []byte, schema string) error {
-	return errors.New("sqlite3: Deserialize requires the sqlite_serialize build tag when using the libsqlite3 build tag")
-}

sqlite3_opt_serialize_test.go

@@ -1,99 +0,0 @@
-// +build !libsqlite3 sqlite_serialize
-
-package sqlite3
-
-import (
-	"context"
-	"database/sql"
-	"os"
-	"testing"
-)
-
-func TestSerializeDeserialize(t *testing.T) {
-	// Connect to the source database.
-	srcTempFilename := TempFilename(t)
-	defer os.Remove(srcTempFilename)
-	srcDb, err := sql.Open(driverName, srcTempFilename)
-	if err != nil {
-		t.Fatal("Failed to open the source database:", err)
-	}
-	defer srcDb.Close()
-	err = srcDb.Ping()
-	if err != nil {
-		t.Fatal("Failed to connect to the source database:", err)
-	}
-
-	// Connect to the destination database.
-	destTempFilename := TempFilename(t)
-	defer os.Remove(destTempFilename)
-	destDb, err := sql.Open(driverName, destTempFilename)
-	if err != nil {
-		t.Fatal("Failed to open the destination database:", err)
-	}
-	defer destDb.Close()
-	err = destDb.Ping()
-	if err != nil {
-		t.Fatal("Failed to connect to the destination database:", err)
-	}
-
-	// Write data to source database.
-	_, err = srcDb.Exec(`CREATE TABLE foo (name string)`)
-	if err != nil {
-		t.Fatal("Failed to create table in source database:", err)
-	}
-	_, err = srcDb.Exec(`INSERT INTO foo(name) VALUES("alice")`)
-	if err != nil {
-		t.Fatal("Failed to insert data into source database", err)
-	}
-
-	// Serialize the source database
-	srcConn, err := srcDb.Conn(context.Background())
-	if err != nil {
-		t.Fatal("Failed to get connection to source database:", err)
-	}
-	defer srcConn.Close()
-
-	var serialized []byte
-	if err := srcConn.Raw(func(raw interface{}) error {
-		var err error
-		serialized, err = raw.(*SQLiteConn).Serialize("")
-		return err
-	}); err != nil {
-		t.Fatal("Failed to serialize source database:", err)
-	}
-	srcConn.Close()
-
-	// Confirm that the destination database is initially empty.
-	var destTableCount int
-	err = destDb.QueryRow("SELECT COUNT(*) FROM sqlite_master WHERE type = 'table'").Scan(&destTableCount)
-	if err != nil {
-		t.Fatal("Failed to check the destination table count:", err)
-	}
-	if destTableCount != 0 {
-		t.Fatalf("The destination database is not empty; %v table(s) found.", destTableCount)
-	}
-
-	// Deserialize to destination database
-	destConn, err := destDb.Conn(context.Background())
-	if err != nil {
-		t.Fatal("Failed to get connection to destination database:", err)
-	}
-	defer destConn.Close()
-
-	if err := destConn.Raw(func(raw interface{}) error {
-		return raw.(*SQLiteConn).Deserialize(serialized, "")
-	}); err != nil {
-		t.Fatal("Failed to deserialize source database:", err)
-	}
-	destConn.Close()
-
-	// Confirm that destination database has been loaded correctly.
-	var destRowCount int
-	err = destDb.QueryRow(`SELECT COUNT(*) FROM foo`).Scan(&destRowCount)
-	if err != nil {
-		t.Fatal("Failed to count rows in destination database table", err)
-	}
-	if destRowCount != 1 {
-		t.Fatalf("Destination table does not have the expected records")
-	}
-}

sqlite3_opt_stat4.go

@@ -1,4 +1,4 @@
-// Copyright (C) 2019 Yasuhiro Matsumoto <mattn.jp@gmail.com>.
+// Copyright (C) 2014 Yasuhiro Matsumoto <mattn.jp@gmail.com>.
 // Copyright (C) 2018 G.J.R. Timmer <gjr.timmer@gmail.com>.
 //
 // Use of this source code is governed by an MIT-style

sqlite3_opt_unlock_notify.c

@@ -5,7 +5,7 @@
 
 #ifdef SQLITE_ENABLE_UNLOCK_NOTIFY
 #include <stdio.h>
-#include "sqlite3-binding.h"
+#include <sqlite3-binding.h>
 
 extern int unlock_notify_wait(sqlite3 *db);
 

sqlite3_opt_unlock_notify.go

@@ -1,4 +1,4 @@
-// Copyright (C) 2019 Yasuhiro Matsumoto <mattn.jp@gmail.com>.
+// Copyright (C) 2018 Yasuhiro Matsumoto <mattn.jp@gmail.com>.
 //
 // Use of this source code is governed by an MIT-style
 // license that can be found in the LICENSE file.
@@ -12,7 +12,7 @@ package sqlite3
 #cgo CFLAGS: -DSQLITE_ENABLE_UNLOCK_NOTIFY
 
 #include <stdlib.h>
-#include "sqlite3-binding.h"
+#include <sqlite3-binding.h>
 
 extern void unlock_notify_callback(void *arg, int argc);
 */

sqlite3_opt_unlock_notify_test.go

@@ -1,4 +1,4 @@
-// Copyright (C) 2019 Yasuhiro Matsumoto <mattn.jp@gmail.com>.
+// Copyright (C) 2018 Yasuhiro Matsumoto <mattn.jp@gmail.com>.
 //
 // Use of this source code is governed by an MIT-style
 // license that can be found in the LICENSE file.

sqlite3_opt_userauth.go

@@ -11,7 +11,7 @@ package sqlite3
 #cgo CFLAGS: -DSQLITE_USER_AUTHENTICATION
 #cgo LDFLAGS: -lm
 #ifndef USE_LIBSQLITE3
-#include "sqlite3-binding.h"
+#include <sqlite3-binding.h>
 #else
 #include <sqlite3.h>
 #endif

sqlite3_opt_userauth_test.go

@@ -60,14 +60,7 @@ func init() {
 			file = TempFilename(t)
 		}
 
-		params := "?_auth"
+		db, err = sql.Open("sqlite3_with_conn", "file:"+file+fmt.Sprintf("?_auth&_auth_user=%s&_auth_pass=%s", username, password))
-		if len(username) > 0 {
-			params = fmt.Sprintf("%s&_auth_user=%s", params, username)
-		}
-		if len(password) > 0 {
-			params = fmt.Sprintf("%s&_auth_pass=%s", params, password)
-		}
-		db, err = sql.Open("sqlite3_with_conn", "file:"+file+params)
 		if err != nil {
 			defer os.Remove(file)
 			return file, nil, nil, err
@@ -171,23 +164,6 @@ func TestUserAuthCreateDatabase(t *testing.T) {
 	}
 }
 
-func TestUserAuthCreateDatabaseWithoutArgs(t *testing.T) {
-	_, db, c, err := connect(t, "", "", "")
-	if err == nil && c == nil && db == nil {
-		t.Fatal("Should have failed due to missing _auth_* parameters")
-	}
-
-	_, db, c, err = connect(t, "", "", "admin")
-	if err == nil && c == nil && db == nil {
-		t.Fatal("Should have failed due to missing _auth_user parameter")
-	}
-
-	_, db, c, err = connect(t, "", "admin", "")
-	if err == nil && c == nil && db == nil {
-		t.Fatal("Should have failed due to missing _auth_pass parameter")
-	}
-}
-
 func TestUserAuthLogin(t *testing.T) {
 	f1, err := create(t, "admin", "admin")
 	if err != nil {

sqlite3_opt_vacuum_full.go

@@ -1,4 +1,4 @@
-// Copyright (C) 2019 Yasuhiro Matsumoto <mattn.jp@gmail.com>.
+// Copyright (C) 2014 Yasuhiro Matsumoto <mattn.jp@gmail.com>.
 // Copyright (C) 2018 G.J.R. Timmer <gjr.timmer@gmail.com>.
 //
 // Use of this source code is governed by an MIT-style

sqlite3_opt_vacuum_incr.go

@@ -1,4 +1,4 @@
-// Copyright (C) 2019 Yasuhiro Matsumoto <mattn.jp@gmail.com>.
+// Copyright (C) 2014 Yasuhiro Matsumoto <mattn.jp@gmail.com>.
 // Copyright (C) 2018 G.J.R. Timmer <gjr.timmer@gmail.com>.
 //
 // Use of this source code is governed by an MIT-style

sqlite3_opt_vtable.go

@@ -1,4 +1,4 @@
-// Copyright (C) 2019 Yasuhiro Matsumoto <mattn.jp@gmail.com>.
+// Copyright (C) 2014 Yasuhiro Matsumoto <mattn.jp@gmail.com>.
 //
 // Use of this source code is governed by an MIT-style
 // license that can be found in the LICENSE file.
@@ -19,7 +19,7 @@ package sqlite3
 #cgo CFLAGS: -Wno-deprecated-declarations
 
 #ifndef USE_LIBSQLITE3
-#include "sqlite3-binding.h"
+#include <sqlite3-binding.h>
 #else
 #include <sqlite3.h>
 #endif
@@ -226,43 +226,11 @@ static sqlite3_module goModule = {
 	0	                     // xRollbackTo
 };
 
-// See https://sqlite.org/vtab.html#eponymous_only_virtual_tables
-static sqlite3_module goModuleEponymousOnly = {
-	0,                       // iVersion
-	0,                       // xCreate - create a table, which here is null
-	cXConnect,               // xConnect - connect to an existing table
-	cXBestIndex,             // xBestIndex - Determine search strategy
-	cXDisconnect,            // xDisconnect - Disconnect from a table
-	cXDestroy,               // xDestroy - Drop a table
-	cXOpen,                  // xOpen - open a cursor
-	cXClose,                 // xClose - close a cursor
-	cXFilter,                // xFilter - configure scan constraints
-	cXNext,                  // xNext - advance a cursor
-	cXEof,                   // xEof
-	cXColumn,                // xColumn - read data
-	cXRowid,                 // xRowid - read data
-	cXUpdate,                // xUpdate - write data
-// Not implemented
-	0,                       // xBegin - begin transaction
-	0,                       // xSync - sync transaction
-	0,                       // xCommit - commit transaction
-	0,                       // xRollback - rollback transaction
-	0,                       // xFindFunction - function overloading
-	0,                       // xRename - rename the table
-	0,                       // xSavepoint
-	0,                       // xRelease
-	0	                     // xRollbackTo
-};
-
 void goMDestroy(void*);
 
 static int _sqlite3_create_module(sqlite3 *db, const char *zName, uintptr_t pClientData) {
   return sqlite3_create_module_v2(db, zName, &goModule, (void*) pClientData, goMDestroy);
 }
-
-static int _sqlite3_create_module_eponymous_only(sqlite3 *db, const char *zName, uintptr_t pClientData) {
-  return sqlite3_create_module_v2(db, zName, &goModuleEponymousOnly, (void*) pClientData, goMDestroy);
-}
 */
 import "C"
 
@@ -320,13 +288,10 @@ type InfoOrderBy struct {
 }
 
 func constraints(info *C.sqlite3_index_info) []InfoConstraint {
-	slice := *(*[]C.struct_sqlite3_index_constraint)(unsafe.Pointer(&reflect.SliceHeader{
+	l := info.nConstraint
-		Data: uintptr(unsafe.Pointer(info.aConstraint)),
+	slice := (*[1 << 30]C.struct_sqlite3_index_constraint)(unsafe.Pointer(info.aConstraint))[:l:l]
-		Len:  int(info.nConstraint),
-		Cap:  int(info.nConstraint),
-	}))
 
-	cst := make([]InfoConstraint, 0, len(slice))
+	cst := make([]InfoConstraint, 0, l)
 	for _, c := range slice {
 		var usable bool
 		if c.usable > 0 {
@@ -342,13 +307,10 @@ func constraints(info *C.sqlite3_index_info) []InfoConstraint {
 }
 
 func orderBys(info *C.sqlite3_index_info) []InfoOrderBy {
-	slice := *(*[]C.struct_sqlite3_index_orderby)(unsafe.Pointer(&reflect.SliceHeader{
+	l := info.nOrderBy
-		Data: uintptr(unsafe.Pointer(info.aOrderBy)),
+	slice := (*[1 << 30]C.struct_sqlite3_index_orderby)(unsafe.Pointer(info.aOrderBy))[:l:l]
-		Len:  int(info.nOrderBy),
-		Cap:  int(info.nOrderBy),
-	}))
 
-	ob := make([]InfoOrderBy, 0, len(slice))
+	ob := make([]InfoOrderBy, 0, l)
 	for _, c := range slice {
 		var desc bool
 		if c.desc > 0 {
@@ -385,7 +347,7 @@ func mPrintf(format, arg string) *C.char {
 
 //export goMInit
 func goMInit(db, pClientData unsafe.Pointer, argc C.int, argv **C.char, pzErr **C.char, isCreate C.int) C.uintptr_t {
-	m := lookupHandle(pClientData).(*sqliteModule)
+	m := lookupHandle(uintptr(pClientData)).(*sqliteModule)
 	if m.c.db != (*C.sqlite3)(db) {
 		*pzErr = mPrintf("%s", "Inconsistent db handles")
 		return 0
@@ -411,12 +373,12 @@ func goMInit(db, pClientData unsafe.Pointer, argc C.int, argv **C.char, pzErr **
 	}
 	vt := sqliteVTab{m, vTab}
 	*pzErr = nil
-	return C.uintptr_t(uintptr(newHandle(m.c, &vt)))
+	return C.uintptr_t(newHandle(m.c, &vt))
 }
 
 //export goVRelease
 func goVRelease(pVTab unsafe.Pointer, isDestroy C.int) *C.char {
-	vt := lookupHandle(pVTab).(*sqliteVTab)
+	vt := lookupHandle(uintptr(pVTab)).(*sqliteVTab)
 	var err error
 	if isDestroy == 1 {
 		err = vt.vTab.Destroy()
@@ -431,7 +393,7 @@ func goVRelease(pVTab unsafe.Pointer, isDestroy C.int) *C.char {
 
 //export goVOpen
 func goVOpen(pVTab unsafe.Pointer, pzErr **C.char) C.uintptr_t {
-	vt := lookupHandle(pVTab).(*sqliteVTab)
+	vt := lookupHandle(uintptr(pVTab)).(*sqliteVTab)
 	vTabCursor, err := vt.vTab.Open()
 	if err != nil {
 		*pzErr = mPrintf("%s", err.Error())
@@ -439,12 +401,12 @@ func goVOpen(pVTab unsafe.Pointer, pzErr **C.char) C.uintptr_t {
 	}
 	vtc := sqliteVTabCursor{vt, vTabCursor}
 	*pzErr = nil
-	return C.uintptr_t(uintptr(newHandle(vt.module.c, &vtc)))
+	return C.uintptr_t(newHandle(vt.module.c, &vtc))
 }
 
 //export goVBestIndex
 func goVBestIndex(pVTab unsafe.Pointer, icp unsafe.Pointer) *C.char {
-	vt := lookupHandle(pVTab).(*sqliteVTab)
+	vt := lookupHandle(uintptr(pVTab)).(*sqliteVTab)
 	info := (*C.sqlite3_index_info)(icp)
 	csts := constraints(info)
 	res, err := vt.vTab.BestIndex(csts, orderBys(info))
@@ -456,37 +418,22 @@ func goVBestIndex(pVTab unsafe.Pointer, icp unsafe.Pointer) *C.char {
 	}
 
 	// Get a pointer to constraint_usage struct so we can update in place.
-
+	l := info.nConstraint
-	slice := *(*[]C.struct_sqlite3_index_constraint_usage)(unsafe.Pointer(&reflect.SliceHeader{
+	s := (*[1 << 30]C.struct_sqlite3_index_constraint_usage)(unsafe.Pointer(info.aConstraintUsage))[:l:l]
-		Data: uintptr(unsafe.Pointer(info.aConstraintUsage)),
-		Len:  int(info.nConstraint),
-		Cap:  int(info.nConstraint),
-	}))
 	index := 1
-	for i := range slice {
+	for i := C.int(0); i < info.nConstraint; i++ {
 		if res.Used[i] {
-			slice[i].argvIndex = C.int(index)
+			s[i].argvIndex = C.int(index)
-			slice[i].omit = C.uchar(1)
+			s[i].omit = C.uchar(1)
 			index++
 		}
 	}
 
 	info.idxNum = C.int(res.IdxNum)
-	info.idxStr = (*C.char)(C.sqlite3_malloc(C.int(len(res.IdxStr) + 1)))
+	idxStr := C.CString(res.IdxStr)
-	if info.idxStr == nil {
+	defer C.free(unsafe.Pointer(idxStr))
-		// C.malloc and C.CString ordinarily do this for you. See https://golang.org/cmd/cgo/
+	info.idxStr = idxStr
-		panic("out of memory")
+	info.needToFreeIdxStr = C.int(0)
-	}
-	info.needToFreeIdxStr = C.int(1)
-
-	idxStr := *(*[]byte)(unsafe.Pointer(&reflect.SliceHeader{
-		Data: uintptr(unsafe.Pointer(info.idxStr)),
-		Len:  len(res.IdxStr) + 1,
-		Cap:  len(res.IdxStr) + 1,
-	}))
-	copy(idxStr, res.IdxStr)
-	idxStr[len(idxStr)-1] = 0 // null-terminated string
-
 	if res.AlreadyOrdered {
 		info.orderByConsumed = C.int(1)
 	}
@@ -498,7 +445,7 @@ func goVBestIndex(pVTab unsafe.Pointer, icp unsafe.Pointer) *C.char {
 
 //export goVClose
 func goVClose(pCursor unsafe.Pointer) *C.char {
-	vtc := lookupHandle(pCursor).(*sqliteVTabCursor)
+	vtc := lookupHandle(uintptr(pCursor)).(*sqliteVTabCursor)
 	err := vtc.vTabCursor.Close()
 	if err != nil {
 		return mPrintf("%s", err.Error())
@@ -508,13 +455,13 @@ func goVClose(pCursor unsafe.Pointer) *C.char {
 
 //export goMDestroy
 func goMDestroy(pClientData unsafe.Pointer) {
-	m := lookupHandle(pClientData).(*sqliteModule)
+	m := lookupHandle(uintptr(pClientData)).(*sqliteModule)
 	m.module.DestroyModule()
 }
 
 //export goVFilter
 func goVFilter(pCursor unsafe.Pointer, idxNum C.int, idxName *C.char, argc C.int, argv **C.sqlite3_value) *C.char {
-	vtc := lookupHandle(pCursor).(*sqliteVTabCursor)
+	vtc := lookupHandle(uintptr(pCursor)).(*sqliteVTabCursor)
 	args := (*[(math.MaxInt32 - 1) / unsafe.Sizeof((*C.sqlite3_value)(nil))]*C.sqlite3_value)(unsafe.Pointer(argv))[:argc:argc]
 	vals := make([]interface{}, 0, argc)
 	for _, v := range args {
@@ -533,7 +480,7 @@ func goVFilter(pCursor unsafe.Pointer, idxNum C.int, idxName *C.char, argc C.int
 
 //export goVNext
 func goVNext(pCursor unsafe.Pointer) *C.char {
-	vtc := lookupHandle(pCursor).(*sqliteVTabCursor)
+	vtc := lookupHandle(uintptr(pCursor)).(*sqliteVTabCursor)
 	err := vtc.vTabCursor.Next()
 	if err != nil {
 		return mPrintf("%s", err.Error())
@@ -543,7 +490,7 @@ func goVNext(pCursor unsafe.Pointer) *C.char {
 
 //export goVEof
 func goVEof(pCursor unsafe.Pointer) C.int {
-	vtc := lookupHandle(pCursor).(*sqliteVTabCursor)
+	vtc := lookupHandle(uintptr(pCursor)).(*sqliteVTabCursor)
 	err := vtc.vTabCursor.EOF()
 	if err {
 		return 1
@@ -553,7 +500,7 @@ func goVEof(pCursor unsafe.Pointer) C.int {
 
 //export goVColumn
 func goVColumn(pCursor, cp unsafe.Pointer, col C.int) *C.char {
-	vtc := lookupHandle(pCursor).(*sqliteVTabCursor)
+	vtc := lookupHandle(uintptr(pCursor)).(*sqliteVTabCursor)
 	c := (*SQLiteContext)(cp)
 	err := vtc.vTabCursor.Column(c, int(col))
 	if err != nil {
@@ -564,7 +511,7 @@ func goVColumn(pCursor, cp unsafe.Pointer, col C.int) *C.char {
 
 //export goVRowid
 func goVRowid(pCursor unsafe.Pointer, pRowid *C.sqlite3_int64) *C.char {
-	vtc := lookupHandle(pCursor).(*sqliteVTabCursor)
+	vtc := lookupHandle(uintptr(pCursor)).(*sqliteVTabCursor)
 	rowid, err := vtc.vTabCursor.Rowid()
 	if err != nil {
 		return mPrintf("%s", err.Error())
@@ -575,7 +522,7 @@ func goVRowid(pCursor unsafe.Pointer, pRowid *C.sqlite3_int64) *C.char {
 
 //export goVUpdate
 func goVUpdate(pVTab unsafe.Pointer, argc C.int, argv **C.sqlite3_value, pRowid *C.sqlite3_int64) *C.char {
-	vt := lookupHandle(pVTab).(*sqliteVTab)
+	vt := lookupHandle(uintptr(pVTab)).(*sqliteVTab)
 
 	var tname string
 	if n, ok := vt.vTab.(interface {
@@ -638,13 +585,6 @@ type Module interface {
 	DestroyModule()
 }
 
-// EponymousOnlyModule is a "virtual table module" (as above), but
-// for defining "eponymous only" virtual tables See: https://sqlite.org/vtab.html#eponymous_only_virtual_tables
-type EponymousOnlyModule interface {
-	Module
-	EponymousOnlyModule()
-}
-
 // VTab describes a particular instance of the virtual table.
 // See: http://sqlite.org/c3ref/vtab.html
 type VTab interface {
@@ -702,19 +642,9 @@ func (c *SQLiteConn) CreateModule(moduleName string, module Module) error {
 	mname := C.CString(moduleName)
 	defer C.free(unsafe.Pointer(mname))
 	udm := sqliteModule{c, moduleName, module}
-	switch module.(type) {
+	rv := C._sqlite3_create_module(c.db, mname, C.uintptr_t(newHandle(c, &udm)))
-	case EponymousOnlyModule:
+	if rv != C.SQLITE_OK {
-		rv := C._sqlite3_create_module_eponymous_only(c.db, mname, C.uintptr_t(uintptr(newHandle(c, &udm))))
+		return c.lastError()
-		if rv != C.SQLITE_OK {
-			return c.lastError()
-		}
-		return nil
-	case Module:
-		rv := C._sqlite3_create_module(c.db, mname, C.uintptr_t(uintptr(newHandle(c, &udm))))
-		if rv != C.SQLITE_OK {
-			return c.lastError()
-		}
-		return nil
 	}
 	return nil
 }

sqlite3_opt_vtable_test.go

@@ -1,9 +1,8 @@
-// Copyright (C) 2019 Yasuhiro Matsumoto <mattn.jp@gmail.com>.
+// Copyright (C) 2014 Yasuhiro Matsumoto <mattn.jp@gmail.com>.
 //
 // Use of this source code is governed by an MIT-style
 // license that can be found in the LICENSE file.
 
-//go:build sqlite_vtable || vtable
 // +build sqlite_vtable vtable
 
 package sqlite3
@@ -485,125 +484,3 @@ func (c *vtabUpdateCursor) Rowid() (int64, error) {
 func (c *vtabUpdateCursor) Close() error {
 	return nil
 }
-
-type testModuleEponymousOnly struct {
-	t        *testing.T
-	intarray []int
-}
-
-type testVTabEponymousOnly struct {
-	intarray []int
-}
-
-type testVTabCursorEponymousOnly struct {
-	vTab  *testVTabEponymousOnly
-	index int
-}
-
-func (m testModuleEponymousOnly) EponymousOnlyModule() {}
-
-func (m testModuleEponymousOnly) Create(c *SQLiteConn, args []string) (VTab, error) {
-	err := c.DeclareVTab("CREATE TABLE x(test INT)")
-	if err != nil {
-		return nil, err
-	}
-	return &testVTabEponymousOnly{m.intarray}, nil
-}
-
-func (m testModuleEponymousOnly) Connect(c *SQLiteConn, args []string) (VTab, error) {
-	return m.Create(c, args)
-}
-
-func (m testModuleEponymousOnly) DestroyModule() {}
-
-func (v *testVTabEponymousOnly) BestIndex(cst []InfoConstraint, ob []InfoOrderBy) (*IndexResult, error) {
-	used := make([]bool, 0, len(cst))
-	for range cst {
-		used = append(used, false)
-	}
-	return &IndexResult{
-		Used:           used,
-		IdxNum:         0,
-		IdxStr:         "test-index",
-		AlreadyOrdered: true,
-		EstimatedCost:  100,
-		EstimatedRows:  200,
-	}, nil
-}
-
-func (v *testVTabEponymousOnly) Disconnect() error {
-	return nil
-}
-
-func (v *testVTabEponymousOnly) Destroy() error {
-	return nil
-}
-
-func (v *testVTabEponymousOnly) Open() (VTabCursor, error) {
-	return &testVTabCursorEponymousOnly{v, 0}, nil
-}
-
-func (vc *testVTabCursorEponymousOnly) Close() error {
-	return nil
-}
-
-func (vc *testVTabCursorEponymousOnly) Filter(idxNum int, idxStr string, vals []interface{}) error {
-	vc.index = 0
-	return nil
-}
-
-func (vc *testVTabCursorEponymousOnly) Next() error {
-	vc.index++
-	return nil
-}
-
-func (vc *testVTabCursorEponymousOnly) EOF() bool {
-	return vc.index >= len(vc.vTab.intarray)
-}
-
-func (vc *testVTabCursorEponymousOnly) Column(c *SQLiteContext, col int) error {
-	if col != 0 {
-		return fmt.Errorf("column index out of bounds: %d", col)
-	}
-	c.ResultInt(vc.vTab.intarray[vc.index])
-	return nil
-}
-
-func (vc *testVTabCursorEponymousOnly) Rowid() (int64, error) {
-	return int64(vc.index), nil
-}
-
-func TestCreateModuleEponymousOnly(t *testing.T) {
-	tempFilename := TempFilename(t)
-	defer os.Remove(tempFilename)
-	intarray := []int{1, 2, 3}
-	sql.Register("sqlite3_TestCreateModuleEponymousOnly", &SQLiteDriver{
-		ConnectHook: func(conn *SQLiteConn) error {
-			return conn.CreateModule("test", testModuleEponymousOnly{t, intarray})
-		},
-	})
-	db, err := sql.Open("sqlite3_TestCreateModuleEponymousOnly", tempFilename)
-	if err != nil {
-		t.Fatalf("could not open db: %v", err)
-	}
-
-	var i, value int
-	rows, err := db.Query("SELECT rowid, * FROM test")
-	if err != nil {
-		t.Fatalf("couldn't select from virtual table: %v", err)
-	}
-	for rows.Next() {
-		err := rows.Scan(&i, &value)
-		if err != nil {
-			t.Fatal(err)
-		}
-		if intarray[i] != value {
-			t.Fatalf("want %v but %v", intarray[i], value)
-		}
-	}
-
-	_, err = db.Exec("DROP TABLE test")
-	if err != nil {
-		t.Logf("couldn't drop virtual table: %v", err)
-	}
-}

sqlite3_other.go

@@ -1,4 +1,4 @@
-// Copyright (C) 2019 Yasuhiro Matsumoto <mattn.jp@gmail.com>.
+// Copyright (C) 2014 Yasuhiro Matsumoto <mattn.jp@gmail.com>.
 //
 // Use of this source code is governed by an MIT-style
 // license that can be found in the LICENSE file.

sqlite3_solaris.go

@@ -1,4 +1,4 @@
-// Copyright (C) 2019 Yasuhiro Matsumoto <mattn.jp@gmail.com>.
+// Copyright (C) 2018 Yasuhiro Matsumoto <mattn.jp@gmail.com>.
 //
 // Use of this source code is governed by an MIT-style
 // license that can be found in the LICENSE file.

sqlite3_test.go

@@ -1,11 +1,8 @@
-// Copyright (C) 2019 Yasuhiro Matsumoto <mattn.jp@gmail.com>.
+// Copyright (C) 2014 Yasuhiro Matsumoto <mattn.jp@gmail.com>.
 //
 // Use of this source code is governed by an MIT-style
 // license that can be found in the LICENSE file.
 
-//go:build cgo
-// +build cgo
-
 package sqlite3
 
 import (
@@ -20,7 +17,6 @@ import (
 	"os"
 	"reflect"
 	"regexp"
-	"runtime"
 	"strconv"
 	"strings"
 	"sync"
@@ -28,7 +24,7 @@ import (
 	"time"
 )
 
-func TempFilename(t testing.TB) string {
+func TempFilename(t *testing.T) string {
 	f, err := ioutil.TempFile("", "go-sqlite3-test-")
 	if err != nil {
 		t.Fatal(err)
@@ -38,32 +34,20 @@ func TempFilename(t testing.TB) string {
 }
 
 func doTestOpen(t *testing.T, option string) (string, error) {
+	var url string
 	tempFilename := TempFilename(t)
-	url := tempFilename + option
+	defer os.Remove(tempFilename)
-
+	if option != "" {
-	defer func() {
+		url = tempFilename + option
-		err := os.Remove(tempFilename)
+	} else {
-		if err != nil {
+		url = tempFilename
-			t.Error("temp file remove error:", err)
+	}
-		}
-	}()
-
 	db, err := sql.Open("sqlite3", url)
 	if err != nil {
 		return "Failed to open database:", err
 	}
-
+	defer os.Remove(tempFilename)
-	defer func() {
+	defer db.Close()
-		err = db.Close()
-		if err != nil {
-			t.Error("db close error:", err)
-		}
-	}()
-
-	err = db.Ping()
-	if err != nil {
-		return "ping error:", err
-	}
 
 	_, err = db.Exec("drop table foo")
 	_, err = db.Exec("create table foo (id integer)")
@@ -103,43 +87,6 @@ func TestOpen(t *testing.T) {
 	}
 }
 
-func TestOpenWithVFS(t *testing.T) {
-	filename := t.Name() + ".sqlite"
-
-	if err := os.Remove(filename); err != nil && !os.IsNotExist(err) {
-		t.Fatal(err)
-	}
-	defer os.Remove(filename)
-
-	db, err := sql.Open("sqlite3", fmt.Sprintf("file:%s?vfs=hello", filename))
-	if err != nil {
-		t.Fatal("Failed to open", err)
-	}
-	err = db.Ping()
-	if err == nil {
-		t.Fatal("Failed to open", err)
-	}
-	db.Close()
-
-	defer os.Remove(filename)
-
-	var vfs string
-	if runtime.GOOS == "windows" {
-		vfs = "win32-none"
-	} else {
-		vfs = "unix-none"
-	}
-	db, err = sql.Open("sqlite3", fmt.Sprintf("file:%s?vfs=%s", filename, vfs))
-	if err != nil {
-		t.Fatal("Failed to open", err)
-	}
-	err = db.Ping()
-	if err != nil {
-		t.Fatal("Failed to ping", err)
-	}
-	db.Close()
-}
-
 func TestOpenNoCreate(t *testing.T) {
 	filename := t.Name() + ".sqlite"
 
@@ -248,43 +195,6 @@ func TestForeignKeys(t *testing.T) {
 	}
 }
 
-func TestDeferredForeignKey(t *testing.T) {
-	fname := TempFilename(t)
-	uri := "file:" + fname + "?_foreign_keys=1"
-	db, err := sql.Open("sqlite3", uri)
-	if err != nil {
-		os.Remove(fname)
-		t.Errorf("sql.Open(\"sqlite3\", %q): %v", uri, err)
-	}
-	_, err = db.Exec("CREATE TABLE bar (id INTEGER PRIMARY KEY)")
-	if err != nil {
-		t.Errorf("failed creating tables: %v", err)
-	}
-	_, err = db.Exec("CREATE TABLE foo (bar_id INTEGER, FOREIGN KEY(bar_id) REFERENCES bar(id) DEFERRABLE INITIALLY DEFERRED)")
-	if err != nil {
-		t.Errorf("failed creating tables: %v", err)
-	}
-	tx, err := db.Begin()
-	if err != nil {
-		t.Errorf("Failed to begin transaction: %v", err)
-	}
-	_, err = tx.Exec("INSERT INTO foo (bar_id) VALUES (123)")
-	if err != nil {
-		t.Errorf("Failed to insert row: %v", err)
-	}
-	err = tx.Commit()
-	if err == nil {
-		t.Errorf("Expected an error: %v", err)
-	}
-	_, err = db.Begin()
-	if err != nil {
-		t.Errorf("Failed to begin transaction: %v", err)
-	}
-
-	db.Close()
-	os.Remove(fname)
-}
-
 func TestRecursiveTriggers(t *testing.T) {
 	cases := map[string]bool{
 		"?_recursive_triggers=1": true,
@@ -381,8 +291,8 @@ func TestInsert(t *testing.T) {
 
 func TestUpsert(t *testing.T) {
 	_, n, _ := Version()
-	if n < 3024000 {
+	if !(n >= 3024000) {
-		t.Skip("UPSERT requires sqlite3 >= 3.24.0")
+		t.Skip("UPSERT requires sqlite3 => 3.24.0")
 	}
 	tempFilename := TempFilename(t)
 	defer os.Remove(tempFilename)
@@ -1100,44 +1010,34 @@ func TestQueryer(t *testing.T) {
 	defer db.Close()
 
 	_, err = db.Exec(`
-		create table foo (id integer);
+	create table foo (id integer);
 	`)
 	if err != nil {
 		t.Error("Failed to call db.Query:", err)
 	}
 
-	_, err = db.Exec(`
-		insert into foo(id) values(?);
-		insert into foo(id) values(?);
-		insert into foo(id) values(?);
-	`, 3, 2, 1)
-	if err != nil {
-		t.Error("Failed to call db.Exec:", err)
-	}
 	rows, err := db.Query(`
-		select id from foo order by id;
+	insert into foo(id) values(?);
-	`)
+	insert into foo(id) values(?);
+	insert into foo(id) values(?);
+	select id from foo order by id;
+	`, 3, 2, 1)
 	if err != nil {
 		t.Error("Failed to call db.Query:", err)
 	}
 	defer rows.Close()
-	n := 0
+	n := 1
-	for rows.Next() {
+	if rows != nil {
-		var id int
+		for rows.Next() {
-		err = rows.Scan(&id)
+			var id int
-		if err != nil {
+			err = rows.Scan(&id)
-			t.Error("Failed to db.Query:", err)
+			if err != nil {
+				t.Error("Failed to db.Query:", err)
+			}
+			if id != n {
+				t.Error("Failed to db.Query: not matched results")
+			}
 		}
-		if id != n + 1 {
-			t.Error("Failed to db.Query: not matched results")
-		}
-		n = n + 1
-	}
-	if err := rows.Err(); err != nil {
-		t.Errorf("Post-scan failed: %v\n", err)
-	}
-	if n != 3 {
-		t.Errorf("Expected 3 rows but retrieved %v", n)
 	}
 }
 
@@ -1416,16 +1316,16 @@ func TestFunctionRegistration(t *testing.T) {
 		{"SELECT addf32_64(1.5,1.5)", float64(3)},
 		{"SELECT not(1)", false},
 		{"SELECT not(0)", true},
-		{`SELECT regex('^foo.*', 'foobar')`, true},
+		{`SELECT regex("^foo.*", "foobar")`, true},
-		{`SELECT regex('^foo.*', 'barfoobar')`, false},
+		{`SELECT regex("^foo.*", "barfoobar")`, false},
 		{"SELECT generic(1)", int64(1)},
 		{"SELECT generic(1.1)", int64(2)},
 		{`SELECT generic(NULL)`, int64(3)},
-		{`SELECT generic('foo')`, int64(4)},
+		{`SELECT generic("foo")`, int64(4)},
 		{"SELECT variadic(1,2)", int64(3)},
 		{"SELECT variadic(1,2,3,4)", int64(10)},
 		{"SELECT variadic(1,1,1,1,1,1,1,1,1,1)", int64(10)},
-		{`SELECT variadicGeneric(1,'foo',2.3, NULL)`, int64(4)},
+		{`SELECT variadicGeneric(1,"foo",2.3, NULL)`, int64(4)},
 	}
 
 	for _, op := range ops {
@@ -1496,63 +1396,6 @@ func TestAggregatorRegistration(t *testing.T) {
 	}
 }
 
-type mode struct {
-        counts   map[interface{}]int
-        top      interface{}
-        topCount int
-}
-
-func newMode() *mode {
-        return &mode{
-                counts: map[interface{}]int{},
-        }
-}
-
-func (m *mode) Step(x interface{}) {
-        m.counts[x]++
-        c := m.counts[x]
-        if c > m.topCount {
-                m.top = x
-                m.topCount = c
-        }
-}
-
-func (m *mode) Done() interface{} {
-        return m.top
-}
-
-func TestAggregatorRegistration_GenericReturn(t *testing.T) {
-	sql.Register("sqlite3_AggregatorRegistration_GenericReturn", &SQLiteDriver{
-		ConnectHook: func(conn *SQLiteConn) error {
-			return conn.RegisterAggregator("mode", newMode, true)
-		},
-	})
-	db, err := sql.Open("sqlite3_AggregatorRegistration_GenericReturn", ":memory:")
-	if err != nil {
-		t.Fatal("Failed to open database:", err)
-	}
-	defer db.Close()
-
-	_, err = db.Exec("create table foo (department integer, profits integer)")
-        if err != nil {
-                t.Fatal("Failed to create table:", err)
-        }
-        _, err = db.Exec("insert into foo values (1, 10), (1, 20), (1, 45), (2, 42), (2, 115), (2, 20)")
-        if err != nil {
-                t.Fatal("Failed to insert records:", err)
-        }
-
-	var mode int
-        err = db.QueryRow("select mode(profits) from foo").Scan(&mode)
-        if err != nil {
-                t.Fatal("MODE query error:", err)
-        }
-
-	if mode != 20 {
-		t.Fatal("Got incorrect mode. Wanted 20, got: ", mode)
-	}
-}
-
 func rot13(r rune) rune {
 	switch {
 	case r >= 'A' && r <= 'Z':
@@ -1592,11 +1435,11 @@ func TestCollationRegistration(t *testing.T) {
 
 	populate := []string{
 		`CREATE TABLE test (s TEXT)`,
-		`INSERT INTO test VALUES ('aaaa')`,
+		`INSERT INTO test VALUES ("aaaa")`,
-		`INSERT INTO test VALUES ('ffff')`,
+		`INSERT INTO test VALUES ("ffff")`,
-		`INSERT INTO test VALUES ('qqqq')`,
+		`INSERT INTO test VALUES ("qqqq")`,
-		`INSERT INTO test VALUES ('tttt')`,
+		`INSERT INTO test VALUES ("tttt")`,
-		`INSERT INTO test VALUES ('zzzz')`,
+		`INSERT INTO test VALUES ("zzzz")`,
 	}
 	for _, stmt := range populate {
 		if _, err := db.Exec(stmt); err != nil {
@@ -1691,7 +1534,7 @@ func TestDeclTypes(t *testing.T) {
 		t.Fatal("Failed to create table:", err)
 	}
 
-	_, err = sqlite3conn.Exec("insert into foo(name) values('bar')", nil)
+	_, err = sqlite3conn.Exec("insert into foo(name) values(\"bar\")", nil)
 	if err != nil {
 		t.Fatal("Failed to insert:", err)
 	}
@@ -1827,43 +1670,6 @@ func TestAuthorizer(t *testing.T) {
 	}
 }
 
-func TestSetFileControlInt(t *testing.T) {
-	t.Run("PERSIST_WAL", func(t *testing.T) {
-		tempFilename := TempFilename(t)
-		defer os.Remove(tempFilename)
-
-		sql.Register("sqlite3_FCNTL_PERSIST_WAL", &SQLiteDriver{
-			ConnectHook: func(conn *SQLiteConn) error {
-				if err := conn.SetFileControlInt("", SQLITE_FCNTL_PERSIST_WAL, 1); err != nil {
-					return fmt.Errorf("Unexpected error from SetFileControlInt(): %w", err)
-				}
-				return nil
-			},
-		})
-
-		db, err := sql.Open("sqlite3_FCNTL_PERSIST_WAL", tempFilename)
-		if err != nil {
-			t.Fatal("Failed to open database:", err)
-		}
-		defer db.Close()
-
-		// Set to WAL mode & write a page.
-		if _, err := db.Exec(`PRAGMA journal_mode = wal`); err != nil {
-			t.Fatal("Failed to set journal mode:", err)
-		} else if _, err := db.Exec(`CREATE TABLE t (x)`); err != nil {
-			t.Fatal("Failed to create table:", err)
-		}
-		if err := db.Close(); err != nil {
-			t.Fatal("Failed to close database", err)
-		}
-
-		// Ensure WAL file persists after close.
-		if _, err := os.Stat(tempFilename + "-wal"); err != nil {
-			t.Fatal("Expected WAL file to be persisted after close", err)
-		}
-	})
-}
-
 func TestNonColumnString(t *testing.T) {
 	db, err := sql.Open("sqlite3", ":memory:")
 	if err != nil {
@@ -1958,45 +1764,6 @@ func TestInsertNilByteSlice(t *testing.T) {
 	}
 }
 
-func TestNamedParam(t *testing.T) {
-	tempFilename := TempFilename(t)
-	defer os.Remove(tempFilename)
-	db, err := sql.Open("sqlite3", tempFilename)
-	if err != nil {
-		t.Fatal("Failed to open database:", err)
-	}
-	defer db.Close()
-
-	_, err = db.Exec("drop table foo")
-	_, err = db.Exec("create table foo (id integer, name text, amount integer)")
-	if err != nil {
-		t.Fatal("Failed to create table:", err)
-	}
-
-	_, err = db.Exec("insert into foo(id, name, amount) values(:id, @name, $amount)",
-		sql.Named("bar", 42), sql.Named("baz", "quux"),
-		sql.Named("amount", 123), sql.Named("corge", "waldo"),
-		sql.Named("id", 2), sql.Named("name", "grault"))
-	if err != nil {
-		t.Fatal("Failed to insert record with named parameters:", err)
-	}
-
-	rows, err := db.Query("select id, name, amount from foo")
-	if err != nil {
-		t.Fatal("Failed to select records:", err)
-	}
-	defer rows.Close()
-
-	rows.Next()
-
-	var id, amount int
-	var name string
-	rows.Scan(&id, &name, &amount)
-	if id != 2 || name != "grault" || amount != 123 {
-		t.Errorf("Expected %d, %q, %d for fetched result, but got %d, %q, %d:", 2, "grault", 123, id, name, amount)
-	}
-}
-
 var customFunctionOnce sync.Once
 
 func BenchmarkCustomFunctions(b *testing.B) {
@@ -2030,21 +1797,28 @@ func BenchmarkCustomFunctions(b *testing.B) {
 }
 
 func TestSuite(t *testing.T) {
-	initializeTestDB(t)
+	tempFilename := TempFilename(t)
-	defer freeTestDB()
+	defer os.Remove(tempFilename)
-
+	d, err := sql.Open("sqlite3", tempFilename+"?_busy_timeout=99999")
-	for _, test := range tests {
+	if err != nil {
-		t.Run(test.Name, test.F)
+		t.Fatal(err)
 	}
-}
+	defer d.Close()
 
-func BenchmarkSuite(b *testing.B) {
+	db = &TestDB{t, d, SQLITE, sync.Once{}}
-	initializeTestDB(b)
+	ok := testing.RunTests(func(string, string) (bool, error) { return true, nil }, tests)
-	defer freeTestDB()
+	if !ok {
-
+		t.Fatal("A subtest failed")
-	for _, benchmark := range benchmarks {
-		b.Run(benchmark.Name, benchmark.F)
 	}
+
+	if !testing.Short() {
+		for _, b := range benchmarks {
+			fmt.Printf("%-20s", b.Name)
+			r := testing.Benchmark(b.F)
+			fmt.Printf("%10d %10.0f req/s\n", r.N, float64(r.N)/r.T.Seconds())
+		}
+	}
+	db.tearDown()
 }
 
 // Dialect is a type of dialect of databases.
@@ -2059,37 +1833,14 @@ const (
 
 // DB provide context for the tests
 type TestDB struct {
-	testing.TB
+	*testing.T
 	*sql.DB
-	dialect      Dialect
+	dialect Dialect
-	once         sync.Once
+	once    sync.Once
-	tempFilename string
 }
 
 var db *TestDB
 
-func initializeTestDB(t testing.TB) {
-	tempFilename := TempFilename(t)
-	d, err := sql.Open("sqlite3", tempFilename+"?_busy_timeout=99999")
-	if err != nil {
-		os.Remove(tempFilename)
-		t.Fatal(err)
-	}
-
-	db = &TestDB{t, d, SQLITE, sync.Once{}, tempFilename}
-}
-
-func freeTestDB() {
-	err := db.DB.Close()
-	if err != nil {
-		panic(err)
-	}
-	err = os.Remove(db.tempFilename)
-	if err != nil {
-		panic(err)
-	}
-}
-
 // the following tables will be created and dropped during the test
 var testTables = []string{"foo", "bar", "t", "bench"}
 
@@ -2101,7 +1852,6 @@ var tests = []testing.InternalTest{
 	{Name: "TestManyQueryRow", F: testManyQueryRow},
 	{Name: "TestTxQuery", F: testTxQuery},
 	{Name: "TestPreparedStmt", F: testPreparedStmt},
-	{Name: "TestExecEmptyQuery", F: testExecEmptyQuery},
 }
 
 var benchmarks = []testing.InternalBenchmark{
@@ -2432,25 +2182,6 @@ func testPreparedStmt(t *testing.T) {
 	wg.Wait()
 }
 
-// testEmptyQuery is test for validating the API in case of empty query
-func testExecEmptyQuery(t *testing.T) {
-	db.tearDown()
-	res, err := db.Exec(" -- this is just a comment ")
-	if err != nil {
-		t.Fatalf("empty query err: %v", err)
-	}
-
-	_, err = res.LastInsertId()
-	if err != nil {
-		t.Fatalf("LastInsertId returned an error: %v", err)
-	}
-
-	_, err = res.RowsAffected()
-	if err != nil {
-		t.Fatalf("RowsAffected returned an error: %v", err)
-	}
-}
-
 // Benchmarks need to use panic() since b.Error errors are lost when
 // running via testing.Benchmark() I would like to run these via go
 // test -bench but calling Benchmark() from a benchmark test

sqlite3_trace.go

@@ -1,4 +1,4 @@
-// Copyright (C) 2019 Yasuhiro Matsumoto <mattn.jp@gmail.com>.
+// Copyright (C) 2016 Yasuhiro Matsumoto <mattn.jp@gmail.com>.
 //
 // Use of this source code is governed by an MIT-style
 // license that can be found in the LICENSE file.
@@ -9,7 +9,7 @@ package sqlite3
 
 /*
 #ifndef USE_LIBSQLITE3
-#include "sqlite3-binding.h"
+#include <sqlite3-binding.h>
 #else
 #include <sqlite3.h>
 #endif
@@ -89,7 +89,6 @@ func fillExpandedSQL(info *TraceInfo, db *C.sqlite3, pStmt unsafe.Pointer) {
 	}
 
 	expSQLiteCStr := C.sqlite3_expanded_sql((*C.sqlite3_stmt)(pStmt))
-	defer C.sqlite3_free(unsafe.Pointer(expSQLiteCStr))
 	if expSQLiteCStr == nil {
 		fillDBError(&info.DBError, db)
 		return
@@ -215,6 +214,7 @@ func addTraceMapping(connHandle uintptr, traceConf TraceConfig) {
 			traceConf, connHandle, oldEntryCopy.config))
 	}
 	traceMap[connHandle] = traceMapEntry{config: traceConf}
+	fmt.Printf("Added trace config %v: handle 0x%x.\n", traceConf, connHandle)
 }
 
 func lookupTraceMapping(connHandle uintptr) (TraceConfig, bool) {
@@ -233,6 +233,7 @@ func popTraceMapping(connHandle uintptr) (TraceConfig, bool) {
 	entryCopy, found := traceMap[connHandle]
 	if found {
 		delete(traceMap, connHandle)
+		fmt.Printf("Pop handle 0x%x: deleted trace config %v.\n", connHandle, entryCopy.config)
 	}
 	return entryCopy.config, found
 }

sqlite3_type.go

@@ -1,21 +1,16 @@
-// Copyright (C) 2019 Yasuhiro Matsumoto <mattn.jp@gmail.com>.
-// Use of this source code is governed by an MIT-style
-// license that can be found in the LICENSE file.
-
 package sqlite3
 
 /*
 #ifndef USE_LIBSQLITE3
-#include "sqlite3-binding.h"
+#include <sqlite3-binding.h>
 #else
 #include <sqlite3.h>
 #endif
 */
 import "C"
 import (
-	"database/sql"
 	"reflect"
-	"strings"
+	"time"
 )
 
 // ColumnTypeDatabaseTypeName implement RowsColumnTypeDatabaseTypeName.
@@ -40,69 +35,23 @@ func (rc *SQLiteRows) ColumnTypeNullable(i int) (nullable, ok bool) {
 
 // ColumnTypeScanType implement RowsColumnTypeScanType.
 func (rc *SQLiteRows) ColumnTypeScanType(i int) reflect.Type {
-	//ct := C.sqlite3_column_type(rc.s.s, C.int(i))  // Always returns 5
+	switch C.sqlite3_column_type(rc.s.s, C.int(i)) {
-	return scanType(C.GoString(C.sqlite3_column_decltype(rc.s.s, C.int(i))))
+	case C.SQLITE_INTEGER:
-}
+		switch C.GoString(C.sqlite3_column_decltype(rc.s.s, C.int(i))) {
-
+		case "timestamp", "datetime", "date":
-const (
+			return reflect.TypeOf(time.Time{})
-	SQLITE_INTEGER = iota
+		case "boolean":
-	SQLITE_TEXT
+			return reflect.TypeOf(false)
-	SQLITE_BLOB
+		}
-	SQLITE_REAL
+		return reflect.TypeOf(int64(0))
-	SQLITE_NUMERIC
+	case C.SQLITE_FLOAT:
-	SQLITE_TIME
+		return reflect.TypeOf(float64(0))
-	SQLITE_BOOL
+	case C.SQLITE_BLOB:
-	SQLITE_NULL
+		return reflect.SliceOf(reflect.TypeOf(byte(0)))
-)
+	case C.SQLITE_NULL:
-
+		return reflect.TypeOf(nil)
-func scanType(cdt string) reflect.Type {
+	case C.SQLITE_TEXT:
-	t := strings.ToUpper(cdt)
+		return reflect.TypeOf("")
-	i := databaseTypeConvSqlite(t)
+	}
-	switch i {
+	return reflect.SliceOf(reflect.TypeOf(byte(0)))
-	case SQLITE_INTEGER:
-		return reflect.TypeOf(sql.NullInt64{})
-	case SQLITE_TEXT:
-		return reflect.TypeOf(sql.NullString{})
-	case SQLITE_BLOB:
-		return reflect.TypeOf(sql.RawBytes{})
-	case SQLITE_REAL:
-		return reflect.TypeOf(sql.NullFloat64{})
-	case SQLITE_NUMERIC:
-		return reflect.TypeOf(sql.NullFloat64{})
-	case SQLITE_BOOL:
-		return reflect.TypeOf(sql.NullBool{})
-	case SQLITE_TIME:
-		return reflect.TypeOf(sql.NullTime{})
-	}
-	return reflect.TypeOf(new(interface{}))
-}
-
-func databaseTypeConvSqlite(t string) int {
-	if strings.Contains(t, "INT") {
-		return SQLITE_INTEGER
-	}
-	if t == "CLOB" || t == "TEXT" ||
-		strings.Contains(t, "CHAR") {
-		return SQLITE_TEXT
-	}
-	if t == "BLOB" {
-		return SQLITE_BLOB
-	}
-	if t == "REAL" || t == "FLOAT" ||
-		strings.Contains(t, "DOUBLE") {
-		return SQLITE_REAL
-	}
-	if t == "DATE" || t == "DATETIME" ||
-		t == "TIMESTAMP" {
-		return SQLITE_TIME
-	}
-	if t == "NUMERIC" ||
-		strings.Contains(t, "DECIMAL") {
-		return SQLITE_NUMERIC
-	}
-	if t == "BOOLEAN" {
-		return SQLITE_BOOL
-	}
-
-	return SQLITE_NULL
 }

sqlite3_usleep_windows.go

@@ -15,9 +15,7 @@ package sqlite3
 // This code should improve performance on windows because
 // without the presence of usleep SQLite waits 1 second.
 //
-// Source:  https://github.com/php/php-src/blob/PHP-5.0/win32/time.c
+// Source: https://stackoverflow.com/questions/5801813/c-usleep-is-obsolete-workarounds-for-windows-mingw?utm_medium=organic&utm_source=google_rich_qa&utm_campaign=google_rich_qa
-// License: https://github.com/php/php-src/blob/PHP-5.0/LICENSE
-// Details: https://stackoverflow.com/questions/5801813/c-usleep-is-obsolete-workarounds-for-windows-mingw?utm_medium=organic&utm_source=google_rich_qa&utm_campaign=google_rich_qa
 
 /*
 #include <windows.h>

sqlite3_windows.go

@@ -1,4 +1,4 @@
-// Copyright (C) 2019 Yasuhiro Matsumoto <mattn.jp@gmail.com>.
+// Copyright (C) 2014 Yasuhiro Matsumoto <mattn.jp@gmail.com>.
 //
 // Use of this source code is governed by an MIT-style
 // license that can be found in the LICENSE file.
@@ -12,6 +12,7 @@ package sqlite3
 #cgo CFLAGS: -fno-stack-check
 #cgo CFLAGS: -fno-stack-protector
 #cgo CFLAGS: -mno-stack-arg-probe
+#cgo LDFLAGS: -lmingwex -lmingw32
 #cgo windows,386 CFLAGS: -D_USE_32BIT_TIME_T
 */
 import "C"

sqlite3ext.h

@@ -19,10 +19,6 @@
 #ifndef SQLITE3EXT_H
 #define SQLITE3EXT_H
 #include "sqlite3-binding.h"
-#ifdef __clang__
-#define assert(condition) ((void)0)
-#endif
-
 
 /*
 ** The following structure holds pointers to all of the SQLite API
@@ -327,41 +323,6 @@ struct sqlite3_api_routines {
   /* Version 3.28.0 and later */
   int (*stmt_isexplain)(sqlite3_stmt*);
   int (*value_frombind)(sqlite3_value*);
-  /* Version 3.30.0 and later */
-  int (*drop_modules)(sqlite3*,const char**);
-  /* Version 3.31.0 and later */
-  sqlite3_int64 (*hard_heap_limit64)(sqlite3_int64);
-  const char *(*uri_key)(const char*,int);
-  const char *(*filename_database)(const char*);
-  const char *(*filename_journal)(const char*);
-  const char *(*filename_wal)(const char*);
-  /* Version 3.32.0 and later */
-  char *(*create_filename)(const char*,const char*,const char*,
-                           int,const char**);
-  void (*free_filename)(char*);
-  sqlite3_file *(*database_file_object)(const char*);
-  /* Version 3.34.0 and later */
-  int (*txn_state)(sqlite3*,const char*);
-  /* Version 3.36.1 and later */
-  sqlite3_int64 (*changes64)(sqlite3*);
-  sqlite3_int64 (*total_changes64)(sqlite3*);
-  /* Version 3.37.0 and later */
-  int (*autovacuum_pages)(sqlite3*,
-     unsigned int(*)(void*,const char*,unsigned int,unsigned int,unsigned int),
-     void*, void(*)(void*));
-  /* Version 3.38.0 and later */
-  int (*error_offset)(sqlite3*);
-  int (*vtab_rhs_value)(sqlite3_index_info*,int,sqlite3_value**);
-  int (*vtab_distinct)(sqlite3_index_info*);
-  int (*vtab_in)(sqlite3_index_info*,int,int);
-  int (*vtab_in_first)(sqlite3_value*,sqlite3_value**);
-  int (*vtab_in_next)(sqlite3_value*,sqlite3_value**);
-  /* Version 3.39.0 and later */
-  int (*deserialize)(sqlite3*,const char*,unsigned char*,
-                     sqlite3_int64,sqlite3_int64,unsigned);
-  unsigned char *(*serialize)(sqlite3*,const char *,sqlite3_int64*,
-                              unsigned int);
-  const char *(*db_name)(sqlite3*,int);
 };
 
 /*
@@ -652,40 +613,8 @@ typedef int (*sqlite3_loadext_entry)(
 /* Version 3.26.0 and later */
 #define sqlite3_normalized_sql         sqlite3_api->normalized_sql
 /* Version 3.28.0 and later */
-#define sqlite3_stmt_isexplain         sqlite3_api->stmt_isexplain
+#define sqlite3_stmt_isexplain         sqlite3_api->isexplain
-#define sqlite3_value_frombind         sqlite3_api->value_frombind
+#define sqlite3_value_frombind         sqlite3_api->frombind
-/* Version 3.30.0 and later */
-#define sqlite3_drop_modules           sqlite3_api->drop_modules
-/* Version 3.31.0 and later */
-#define sqlite3_hard_heap_limit64      sqlite3_api->hard_heap_limit64
-#define sqlite3_uri_key                sqlite3_api->uri_key
-#define sqlite3_filename_database      sqlite3_api->filename_database
-#define sqlite3_filename_journal       sqlite3_api->filename_journal
-#define sqlite3_filename_wal           sqlite3_api->filename_wal
-/* Version 3.32.0 and later */
-#define sqlite3_create_filename        sqlite3_api->create_filename
-#define sqlite3_free_filename          sqlite3_api->free_filename
-#define sqlite3_database_file_object   sqlite3_api->database_file_object
-/* Version 3.34.0 and later */
-#define sqlite3_txn_state              sqlite3_api->txn_state
-/* Version 3.36.1 and later */
-#define sqlite3_changes64              sqlite3_api->changes64
-#define sqlite3_total_changes64        sqlite3_api->total_changes64
-/* Version 3.37.0 and later */
-#define sqlite3_autovacuum_pages       sqlite3_api->autovacuum_pages
-/* Version 3.38.0 and later */
-#define sqlite3_error_offset           sqlite3_api->error_offset
-#define sqlite3_vtab_rhs_value         sqlite3_api->vtab_rhs_value
-#define sqlite3_vtab_distinct          sqlite3_api->vtab_distinct
-#define sqlite3_vtab_in                sqlite3_api->vtab_in
-#define sqlite3_vtab_in_first          sqlite3_api->vtab_in_first
-#define sqlite3_vtab_in_next           sqlite3_api->vtab_in_next
-/* Version 3.39.0 and later */
-#ifndef SQLITE_OMIT_DESERIALIZE
-#define sqlite3_deserialize            sqlite3_api->deserialize
-#define sqlite3_serialize              sqlite3_api->serialize
-#endif
-#define sqlite3_db_name                sqlite3_api->db_name
 #endif /* !defined(SQLITE_CORE) && !defined(SQLITE_OMIT_LOAD_EXTENSION) */
 
 #if !defined(SQLITE_CORE) && !defined(SQLITE_OMIT_LOAD_EXTENSION)

static_mock.go

@@ -1,8 +1,3 @@
-// Copyright (C) 2019 Yasuhiro Matsumoto <mattn.jp@gmail.com>.
-//
-// Use of this source code is governed by an MIT-style
-// license that can be found in the LICENSE file.
-
 // +build !cgo
 
 package sqlite3
@@ -13,25 +8,14 @@ import (
 	"errors"
 )
 
-var errorMsg = errors.New("Binary was compiled with 'CGO_ENABLED=0', go-sqlite3 requires cgo to work. This is a stub")
-
 func init() {
-	sql.Register("sqlite3", &SQLiteDriver{})
+	sql.Register("sqlite3", &SQLiteDriverMock{})
 }
 
-type (
+type SQLiteDriverMock struct{}
-	SQLiteDriver struct {
-		Extensions  []string
-		ConnectHook func(*SQLiteConn) error
-	}
-	SQLiteConn struct{}
-)
 
-func (SQLiteDriver) Open(s string) (driver.Conn, error)                        { return nil, errorMsg }
+var errorMsg = errors.New("Binary was compiled with 'CGO_ENABLED=0', go-sqlite3 requires cgo to work. This is a stub")
-func (c *SQLiteConn) RegisterAggregator(string, interface{}, bool) error       { return errorMsg }
+
-func (c *SQLiteConn) RegisterAuthorizer(func(int, string, string, string) int) {}
+func (SQLiteDriverMock) Open(s string) (driver.Conn, error) {
-func (c *SQLiteConn) RegisterCollation(string, func(string, string) int) error { return errorMsg }
+	return nil, errorMsg
-func (c *SQLiteConn) RegisterCommitHook(func() int)                            {}
+}
-func (c *SQLiteConn) RegisterFunc(string, interface{}, bool) error             { return errorMsg }
-func (c *SQLiteConn) RegisterRollbackHook(func())                              {}
-func (c *SQLiteConn) RegisterUpdateHook(func(int, string, string, int64))      {}

upgrade/go.mod

@@ -1,5 +0,0 @@
-module github.com/mattn/go-sqlite3/upgrade
-
-go 1.16
-
-require github.com/PuerkitoBio/goquery v1.7.1 // indirect

upgrade/go.sum

@@ -1,12 +0,0 @@
-github.com/PuerkitoBio/goquery v1.7.1 h1:oE+T06D+1T7LNrn91B4aERsRIeCLJ/oPSa6xB9FPnz4=
-github.com/PuerkitoBio/goquery v1.7.1/go.mod h1:XY0pP4kfraEmmV1O7Uf6XyjoslwsneBbgeDjLYuN8xY=
-github.com/andybalholm/cascadia v1.2.0 h1:vuRCkM5Ozh/BfmsaTm26kbjm0mIOM3yS5Ek/F5h18aE=
-github.com/andybalholm/cascadia v1.2.0/go.mod h1:YCyR8vOZT9aZ1CHEd8ap0gMVm2aFgxBp0T0eFw1RUQY=
-golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20210614182718-04defd469f4e h1:XpT3nA5TvE525Ne3hInMh6+GETgn27Zfm9dxsThnX2Q=
-golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=

upgrade/upgrade.go

@@ -1,5 +1,5 @@
-//go:build !cgo && upgrade && ignore
+// +build !cgo
-// +build !cgo,upgrade,ignore
+// +build upgrade
 
 package main
 
@@ -98,25 +98,16 @@ func mergeFile(src string, dst string) error {
 func main() {
 	fmt.Println("Go-SQLite3 Upgrade Tool")
 
-	wd, err := os.Getwd()
-	if err != nil {
-		log.Fatal(err)
-	}
-	if filepath.Base(wd) != "upgrade" {
-		log.Printf("Current directory is %q but should run in upgrade directory", wd)
-		os.Exit(1)
-	}
-
 	// Download Amalgamation
 	_, amalgamation, err := download("sqlite-amalgamation-")
 	if err != nil {
-		log.Fatalf("Failed to download: sqlite-amalgamation; %s", err)
+		fmt.Println("Failed to download: sqlite-amalgamation; %s", err)
 	}
 
 	// Download Source
 	_, source, err := download("sqlite-src-")
 	if err != nil {
-		log.Fatalf("Failed to download: sqlite-src; %s", err)
+		fmt.Println("Failed to download: sqlite-src; %s", err)
 	}
 
 	// Create Amalgamation Zip Reader
@@ -136,11 +127,11 @@ func main() {
 		var f *os.File
 		switch path.Base(zf.Name) {
 		case "sqlite3.c":
-			f, err = os.Create("../sqlite3-binding.c")
+			f, err = os.Create("sqlite3-binding.c")
 		case "sqlite3.h":
-			f, err = os.Create("../sqlite3-binding.h")
+			f, err = os.Create("sqlite3-binding.h")
 		case "sqlite3ext.h":
-			f, err = os.Create("../sqlite3ext.h")
+			f, err = os.Create("sqlite3ext.h")
 		default:
 			continue
 		}
@@ -162,11 +153,7 @@ func main() {
 		for scanner.Scan() {
 			text := scanner.Text()
 			if text == `#include "sqlite3.h"` {
-				text = `#include "sqlite3-binding.h"
+				text = `#include "sqlite3-binding.h"`
-#ifdef __clang__
-#define assert(condition) ((void)0)
-#endif
-`
 			}
 			_, err = fmt.Fprintln(f, text)
 			if err != nil {
@@ -195,9 +182,9 @@ func main() {
 		var f *os.File
 		switch path.Base(zf.Name) {
 		case "userauth.c":
-			f, err = os.Create("../userauth.c")
+			f, err = os.Create("userauth.c")
 		case "sqlite3userauth.h":
-			f, err = os.Create("../userauth.h")
+			f, err = os.Create("userauth.h")
 		default:
 			continue
 		}
@@ -220,10 +207,10 @@ func main() {
 	}
 
 	// Merge SQLite User Authentication into amalgamation
-	if err := mergeFile("../userauth.c", "../sqlite3-binding.c"); err != nil {
+	if err := mergeFile("userauth.c", "sqlite3-binding.c"); err != nil {
 		log.Fatal(err)
 	}
-	if err := mergeFile("../userauth.h", "../sqlite3-binding.h"); err != nil {
+	if err := mergeFile("userauth.h", "sqlite3-binding.h"); err != nil {
 		log.Fatal(err)
 	}