Commit Graph

322 Commits

Author SHA1 Message Date
Charlie Vieth c61eeb5d1d remove superfluous use of runtime.SetFinalizer on SQLiteRows
The commit removes the use of runtime.SetFinalizer to finalize
SQLiteRows since only serves to close the associated SQLiteStmt which
already has a registered finalizer.

It also fixes a race and potential panic in SQLiteRows.Close around the
SQLiteRows.s field (*SQLiteStmt) which is accessed without a mutex being
held, but modified with it held (null'd out). Further the mutex we are
holding is that of the SQLiteStmt so a subsequent call to Close will
cause a panic sine it'll attempt to dereference a nil field. The fix
here is to add a mutex for closing to SQLiteRows.

Since we now also set the s field to nil when closing this commit
removes the "closed" field (since checking if s is nil is the same) and
also changes the type of "nc" (number of columns) to an int32 so that we
can pack the nc and cls fields, and add the close mutex without making
the struct any bigger.

```
goos: darwin
goarch: arm64
pkg: github.com/charlievieth/go-sqlite3
cpu: Apple M4 Pro
                                          │   x1.txt    │               x4.txt                │
                                          │   sec/op    │   sec/op     vs base                │
Suite/BenchmarkExec/Params-14               719.2n ± 2%   716.9n ± 1%        ~ (p=0.897 n=10)
Suite/BenchmarkExec/NoParams-14             506.5n ± 3%   500.1n ± 0%   -1.25% (p=0.002 n=10)
Suite/BenchmarkExecContext/Params-14        1.584µ ± 0%   1.567µ ± 1%   -1.07% (p=0.007 n=10)
Suite/BenchmarkExecContext/NoParams-14      1.524µ ± 1%   1.524µ ± 1%        ~ (p=0.539 n=10)
Suite/BenchmarkExecStep-14                  443.9µ ± 3%   441.4µ ± 0%   -0.55% (p=0.011 n=10)
Suite/BenchmarkExecContextStep-14           447.8µ ± 1%   442.9µ ± 0%   -1.10% (p=0.000 n=10)
Suite/BenchmarkExecTx-14                    1.643µ ± 1%   1.640µ ± 0%        ~ (p=0.642 n=10)
Suite/BenchmarkQuery-14                     1.968µ ± 3%   1.821µ ± 1%   -7.52% (p=0.000 n=10)
Suite/BenchmarkQuerySimple-14               1.207µ ± 2%   1.040µ ± 1%  -13.84% (p=0.000 n=10)
Suite/BenchmarkQueryContext/Background-14   2.400µ ± 1%   2.320µ ± 0%   -3.31% (p=0.000 n=10)
Suite/BenchmarkQueryContext/WithCancel-14   8.847µ ± 5%   8.512µ ± 4%   -3.79% (p=0.007 n=10)
Suite/BenchmarkParams-14                    2.131µ ± 2%   1.967µ ± 1%   -7.70% (p=0.000 n=10)
Suite/BenchmarkStmt-14                      1.444µ ± 1%   1.359µ ± 1%   -5.89% (p=0.000 n=10)
Suite/BenchmarkRows-14                      61.57µ ± 1%   60.24µ ± 1%   -2.16% (p=0.000 n=10)
Suite/BenchmarkStmtRows-14                  60.15µ ± 1%   59.08µ ± 1%   -1.78% (p=0.000 n=10)
Suite/BenchmarkQueryParallel-14             960.9n ± 1%   420.8n ± 2%  -56.21% (p=0.000 n=10)
geomean                                     4.795µ        4.430µ        -7.62%
```
2024-12-09 13:00:34 +09:00
Yasuhiro Matsumoto 82bc911e85 close statement when missing query arguments
fixes #1280
2024-10-04 23:58:44 +09:00
pomadev 18cdded900 fix: some typos 2024-02-22 14:15:27 +09:00
Yasuhiro Matsumoto 6ee3e6746e close channel 2024-02-03 02:00:28 +09:00
Yasuhiro Matsumoto 1f0dc0a0ef go fmt ./... 2024-01-25 22:55:22 +09:00
Yasuhiro Matsumoto c91bca4fb4 update go version to 1.19 2024-01-25 22:55:22 +09:00
leso-kn 00b02e0ba9 Fix musl build (#1164) 2023-12-15 10:23:24 +09:00
Charlie Vieth 7ce62b2ade
Replace namedValue with driver.NamedValue to avoid copying exec/query args (#1128) 2023-02-11 17:14:42 -05:00
Joshua Hull 4ef63c9c0d
Rollback on constraint failure (#1071)
Always rollback on a commit error
2022-09-01 22:45:11 -04:00
Ben Johnson ae2a61f847 Add sqlite3_file_control() support
This commit adds the SQLiteConn.FileControlInt() method which calls the
underlying sqlite3_file_control() function with an int argument. This can
be used for low-level operations on SQLite databases such as persisting
the WAL file after database close.
2022-01-29 01:58:27 +09:00
Yasuhiro Matsumoto c0fa5ea6d6 Add driverName to be possible change driver name 2022-01-10 23:30:33 +09:00
Hanzhen Yi 2b131e01c1
change angle bracket import to quotes (#868) 2021-10-26 00:23:19 +09:00
Dan Peterson 3bb6941859
sqlite3.go: use PRAGMA to set busy_timeout (#910)
The busy_timeout pragma was added in sqlite 3.7.15 as an alternative
to calling sqlite3_busy_timeout directly:

https://sqlite.org/pragma.html#pragma_busy_timeout

While there's no functional change here, using the pragma does align
setting busy_timeout with other settings and removes the special case
for calling sqlite3_busy_timeout directly.
2021-10-26 00:08:40 +09:00
Denis Fondras 1f85ebd7c4
Allow building on OpenBSD (#976) 2021-10-26 00:02:17 +09:00
Aviv Klasquin Komissar 3900dc3187
return non-nil result when calling exec with empty query (#973)
fixes #963
2021-10-19 18:18:21 +09:00
Jesse Rittner ab91e9342b make column metadata functionality opt-in 2021-02-18 13:34:41 -05:00
Philip O'Toole 95e88ca693
Export sqlite3_column_table_name (#900) 2021-02-18 11:58:21 +09:00
Catena cyber 16175c1389
Adds a fuzz target (#908)
* Adds a fuzz target

* Fixes memory leak
2021-02-15 22:57:26 +09:00
Martin Tournoij 3cbdae750e
Export sqlite3_stmt_readonly() via SQLiteStmt.Readonly() (#895)
This can be used like in the test; I wrote a little wrapper around
sql.DB which uses this, and allows concurrent reads but just one single
write. This is perhaps a better generic "table locked"-solution than
setting the connections to 1 and/or cache=shared (although even better
would be to design your app in such a way that this doesn't happpen in
the first place, but even then a little seat belt isn't a bad thing).

The parsing adds about 0.1ms to 0.2ms of overhead in the wrapper, which
isn't too bad (and it caches the results, so only needs to do this
once).

At any rate, I can't really access functions from sqlite3-binding.c from
my application, so expose it via SQLiteStmt.
2020-12-28 08:52:08 +09:00
Martin Tournoij 02ce7ec581
Add ?_cache_size=[..] to connection parameters (#894)
Add a shortcut for PRAGMA cache_size; this is a pretty useful setting:
the default of -2000 (2M) is not especially high, and a lot of people
will probably want to increase this.

For example, while running a bunch of fairy expensive queries in
parallel:

	With SetMaxOpenConns(1):
	 -2000:  5762ms
	-20000:  4714ms

	With SetMaxOpenConns(20):
	 -2000:  3067ms
	-20000:  2532ms

Which isn't a bad performance boost for changing a single number.
2020-12-26 23:05:20 +09:00
Evan Jones 943e8f860d
sqlite3.go: Remove -DSQLITE_ENABLE_FTS4_UNICODE61: not supported (#872)
This option was enabled by default in sqlite3 on 2014-07-03.
This setting does nothing. It can now be disabled with
SQLITE_DISABLE_FTS3_UNICODE. See the upstream commit:
https://sqlite.org/src/info/0cc0230ae9cfc976

I think this change was imported into this project with commit
ee9da4840d on 2015-06-12.
2020-11-17 02:00:32 +09:00
Evan Jones 8e02107ef7
sqlite3.go: remove -DSQLITE_DISABLE_INTRINSIC: better builds (#878)
This "disables the use of compiler-specific built-in functions such
as __builtin_bswap32()" (from the SQLite docs) so this change might
produce slightly better code. My primary motivation, however, is that
the "default" configuration for SQLite, which is widely tested, does
not set this preprocessor macro.

From looking at Github issues, it appears this was added to avoid a
build error on Mac OS X 10.11, in 2017:
https://github.com/mattn/go-sqlite3/issues/386

There have been a number of changes to sqlite3 since we tried this
last. I think it would be worth trying to remove this setting again.
I found a machine running Mac OS X 10.11.6. It was able to build and
run the tests in this package with this change.

Mac OS X 10.11 is has not been supported by Apple since 2018
(currently Apple is releasing updates for Mac OS 10.13 and newer; 11
is the current release). However, Go 1.14 is supported, and it
requires Mac OS X 10.11 or newer: https://golang.org/doc/go1.14
Go 1.15 only supports Mac OS 10.12 and newer:
https://golang.org/doc/go1.15
2020-11-17 01:59:22 +09:00
mattn 1fbedab173
Support vfs for Open (#877)
Closes #876
2020-11-17 01:54:21 +09:00
Andrii Zavorotnii 862b95943f
Fix "cannot start a transaction within a transaction" issue (#764) (#765)
* Fix "cannot start a transaction within a transaction" issue

[why]
If db.BeginTx(ctx, nil) context is cancelled too fast, "BEGIN" statement can be
completed inside DB, but we still try to cancel it with sqlite3_interrupt.
In such case we get context.Cancelled or context.DeadlineExceeded from exec(),
but operation really completed. Connection returned into pool, and returns "cannot
start a transaction within a transaction" error for next db.BeginTx() call.

[how]
Handle status code returned from cancelled operation.

[testing]
Added unit-test which reproduces issue.

* Reduce TestQueryRowContextCancelParallel concurrency

[why]
Tests times out in travis-ci when run with -race option.
2020-08-29 00:43:21 +09:00
mattn 6a8b30186d
Use go-pointer instead of uintptr hacks. (#814)
* Use go-pointer instead of uintptr hacks.

Fixes #791

* Do same of go-pointer

* Drop older verion of Go

* Fix build

* Fix build
2020-08-26 09:36:43 +09:00
gber db4c9426f8
Enable all prefixes for named parameters and allow for unused named parameters (#811)
* Allow unused named parameters

Try to bind all named parameters and ignore those not used.

* Allow "@" and "$" for named parameters

* Add tests for named parameters

Co-authored-by: Guido Berhoerster <guido+go-sqlite3@berhoerster.name>
2020-05-14 23:28:04 +09:00
rittneje 53cff3fceb fix typo in doc comment (#770) 2019-12-17 16:07:49 +09:00
rittneje b4f5cc77d1 add SystemErrno to Error (#740)
* adding SystemErrno to Error, and fixing error logic when open fails

* fix for old versions of libsqlite3 that do not have sqlite3_system_errno defined

* fixing pre-processor logic
2019-12-17 15:58:28 +09:00
mattn 590d44c02b
Merge pull request #744 from azavorotnii/ctx_cancel
Fix context cancellation racy handling
2019-11-19 01:19:53 +09:00
Yasuhiro Matsumoto fc06e55305
Add build constraints for non cgo 2019-11-18 18:03:31 +09:00
Andrii Zavorotnii 27d3ed467c Fix typo in "_locking_mode" DSN handling 2019-09-23 14:57:24 -07:00
Andrii Zavorotnii c4a8658099 Fix Open() journal mode regression
[why]
see https://github.com/mattn/go-sqlite3/issues/607

SQLite default journal mode is DELETE, but forcing it on open causes "database is locked"
if other connection exists with WAL mode, for example.

[how]
Don't set DELETE mode if not set in DSN explicitly.

[testing]
Run tests in my project where WAL mode is used.
2019-09-23 14:56:04 -07:00
Andrii Zavorotnii 7e1a61dbcd Fix context cancellation racy handling
[why]
Context cancellation goroutine is not in sync with Next() method lifetime.
It leads to sql.ErrNoRows instead of context.Canceled often (easy to reproduce).
It leads to interruption of next query executed on same connection (harder to reproduce).

[how]
Do query in goroutine, wait when interruption done.

[testing]
Add unit test that reproduces error cases.
2019-09-06 12:15:53 -07:00
G.J.R. Timmer e3726ad6eb Fixed operator 2019-08-22 14:53:27 +02:00
G.J.R. Timmer b22da71572 Fix _auth_* parameter check
Fixes: #724
2019-08-22 14:53:27 +02:00
= 85bf186e05 Issue #651: Fix of typo
https://github.com/mattn/go-sqlite3/issues/651
2019-08-19 15:53:09 +02:00
Yasuhiro Matsumoto 81b9db8126
Fix type of variadic 2019-05-10 23:23:32 +09:00
Dimitri Roche ae5cbb218c
column_type SQLITE_TEXT returned as string by default 2019-02-11 00:48:38 +09:00
Dimitri Roche abc8991d4d
column types text, varchar, *char return as strings:
As opposed to []byte arrays. This brings sqlite closer
in line with other dbs like postgres, allowing downstream
consumers to assume the scanned value is string across underlying
dbs.
2019-02-11 00:48:28 +09:00
Jesse Rittner 291594080b Revert "SQLITE_OPEN_CREATE should be specified for sqlite3_open_v2 if mode is not rw"
This reverts commit 03b96a53ba.
2018-12-08 08:01:50 -05:00
Yasuhiro Matsumoto 03b96a53ba
SQLITE_OPEN_CREATE should be specified for sqlite3_open_v2 if mode is not rw
Fixes #667
Fixes #669
2018-12-07 16:07:16 +09:00
Yasuhiro Matsumoto 8f4ea282cf
Close db even if sqlite3_open_v2 return non-zero. 2018-12-07 13:13:49 +09:00
mattn 6a9185d7b1
Merge pull request #626 from otoolep/fix_data_race
Fix data race in AutoCommit()
2018-11-22 01:49:42 +09:00
mattn 873ec57005
Merge pull request #643 from akalin/zero-length-blob
Distinguish between NULL and zero-length blobs on query
2018-11-22 01:48:38 +09:00
mattn c880439687
Merge pull request #644 from akalin/fix-pointer-conversion
Clean up blob to byte slice conversion
2018-11-22 01:47:23 +09:00
Mario Trangoni b76b90f754 Fix misspell issues.
See,
$ gometalinter --vendor --disable-all --enable=misspell ./...
sqlite3.go:1379:45⚠️ "succesfully" is a misspelling of "successfully" (misspell)
sqlite3.go:1390:30⚠️ "registerd" is a misspelling of "registered" (misspell)
sqlite3_func_crypt.go:16:27⚠️ "ceasar" is a misspelling of "caesar" (misspell)
sqlite3_func_crypt.go:43:59⚠️ "Ceasar" is a misspelling of "Caesar" (misspell)
sqlite3_opt_userauth_test.go:450:27⚠️ "succesful" is a misspelling of "successful" (misspell)
sqlite3_opt_userauth_test.go:456:27⚠️ "succesful" is a misspelling of "successful" (misspell)
2018-11-21 11:30:42 +01:00
Kevin Burke 6a26e21416
all: fix cgo compile failures on tip
Apparently the cgo typechecks get better on tip, so use C.int instead
of Go integers.

Build tip as part of the Travis build, so we can ensure that any
errors are resolved before they get released to a wider audience.
2018-11-01 20:42:26 -10:00
Mura Li 68e53de11e Rename the wrapper functions to not pollute the sqlite3_* namespace 2018-10-20 23:02:21 +08:00
Mura Li eb08795f52 Add support for sqlite3_unlock_notify 2018-10-20 10:15:13 +08:00
Frederick Akalin 2364b288cc Use GoBytes 2018-09-22 11:29:00 -07:00