Commit Graph

954 Commits

Author SHA1 Message Date
Denis Fondras 1f85ebd7c4
Allow building on OpenBSD (#976) 2021-10-26 00:02:17 +09:00
Ross Smith II 628398eed2
chore: readme: Fix link, typos, copy editing (#974)
* chore: readme: Fix link, typos, copy editing

Also closes #914, #939.

* Update README.md
2021-10-22 16:35:44 +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
Ichinose Shogo 3392062c72
bump codecov/codecov-action@v2 (#957) 2021-07-20 22:28:26 +09:00
mattn cba6eaee48
Update amalgamation code (#955)
* Update amalgamation code

* Apply realPy's patch
2021-07-15 22:31:14 +09:00
mattn 1157a4212d
Update amalgamation code (#940) 2021-04-15 00:44:23 +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 323de98a4c
Go get go-acc with environment variable for go modules (#915)
* Go get go-acc with environment variable for go modules

* Go get with modules for windows as well
2021-02-16 22:01:58 +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
mattn 52436d4074
Update amalgamation code (#896) 2020-12-26 23:18:41 +09:00
Patrick DeVivo 92d23714a8
add support for defining an "eponymous only" virtual table (#885)
* add support for defining an "eponymous only" virtual table

As suggested here: https://github.com/mattn/go-sqlite3/issues/846#issuecomment-736206222

* add an example of an eponymous only vtab module

* add a test case for an eponymous only vtab module
2020-12-26 23:11:17 +09:00
Jinzhu 66ff625f34
RowsColumnTypeNullable not implemented (#848) 2020-12-26 23:07:28 +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
Brad Rydzewski e30206cd31
clarify usleep license (#893) 2020-12-26 23:04:03 +09:00
Yasuhiro Matsumoto 223d277c80
Fix ci 2020-11-18 00:34:04 +09:00
mattn ae4208e73a
Drop go1.11 (#852)
* Drop go1.11

* Use go1.12
2020-11-17 10:04:27 +09:00
Buk Bukowski 0709612629
README.md: use link in markdown (#859) 2020-11-17 10:04:13 +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
Evan Jones 6da13a7bd9
.github/workflows: stop using deprecated add-path command (#873)
Github is disabling the add-path command in workflows on 2020-11-16.
Switch to their new preferred way of doing this, by appending to the
file referred to with $GITHUB_PATH. See:

https://github.blog/changelog/2020-10-01-github-actions-deprecating-set-env-and-add-path-commands/
https://docs.github.com/en/free-pro-team@latest/actions/reference/workflow-commands-for-github-actions#adding-a-system-path

This should fix the following warning from the workflows:

.github#L1
The `add-path` command is deprecated and will be disabled on November
16th. Please upgrade to using Environment Files. For more information
see:
https://github.blog/changelog/2020-10-01-github-actions-deprecating-set-env-and-add-path-commands/
2020-11-17 01:56:45 +09:00
mattn 1fbedab173
Support vfs for Open (#877)
Closes #876
2020-11-17 01:54:21 +09:00
Evan Jones 3fb3c0de37
TestExecContextCancel: Reduce timeout to make less flaky (#879)
This test fails fairly often. On my system, I can trigger it with:

    go test . -run=TestExecContextCancel -count=10 -failfast -v

This makes the test less flaky by timing out the context after a
consistent 50 millisecond delay. This was enough time for the query
to start, then get cancelled with sqlite3_interrupt() in my tests.
This now passes the above check.

This is a modified version of the change suggested in:
https://github.com/mattn/go-sqlite3/pull/865
2020-11-17 01:52:56 +09:00
Evan Jones 70c77097f2
sqlite3_test.go: Move Go 1.13 test to sqlite3_go113_test.go (#883)
Commit 4f7abea96e added a test that uses Conn.Raw, which was added in
Go >= 1.13. The go-sqlite3 project runs tests with Go >= 1.11. Remove
the test from sqlite3_test.go, so it only runs with the correct
versions of Go.

Instead of adding a new test, modify the existing test that already
uses Conn.Raw() to check the type of driverConn.
2020-11-17 01:52:26 +09:00
Evan Jones 4f7abea96e
doc.go: you can use Conn.Raw to get *SQLiteConn (#882)
This can be easier that registering a new driver, in some cases.
Add a test to verify that this works.
2020-11-16 23:42:00 +09:00
Macaully James Muir 784c625194
Expand documentation for extension functions (#880)
This relates to #870; it's not immediately clear that you need to pass a
different driver name to sql.Open from the documentation.
2020-11-16 23:40:44 +09:00
Yunus Ayar 92f580b350
Fix #860 extenstion entry bug (#861)
Fix overshadowing of entrypoint variable.
2020-10-02 17:13:14 +09:00
mattn 4120733fec
Add build tag ignore for upgrade script (#851) 2020-09-11 16:06:34 +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
rittneje 59d4145b7f
treat vtable C arrays as Go slices rather than giant Go arrays (#840) 2020-08-26 03:22:54 +09:00
raa0121 4b46e2b60d
coveralls to codecov (#845)
* coveralls to codecov

* README badge coveralls to codecov
2020-08-25 18:13:57 +09:00
Yasuhiro Matsumoto c14096f123 Fix go.yaml 2020-08-25 14:24:45 +09:00
Yasuhiro Matsumoto fd606f826a Update README.md 2020-08-25 13:59:58 +09:00
raa0121 09fcd35eaa
Add Github Actions yaml and set LDFLAGS on windows (#843)
and remove .travis.yml
2020-08-25 13:56:34 +09:00
mattn 2329c6ea75
Update amalgamation code (#842)
* Update amalgamation code

* Drop go1.9 and go1.10
2020-08-19 20:15:57 +09:00
Olivier Mengué 4c2df3cc46
Travis-CI: set go_import_path (#829)
Set go_import_path to tell Travis-CI where to checkout the code, so the
Travis build can also work on forks. This is important when building
without Go modules support.
2020-07-21 17:00:10 +09:00
Olivier Mengué 979ea59e5a
Travis-CI: add Go 1.14.x, change order of Go versions (#830)
Changes in Go versions for the Travis-CI builds:
- reverse order of Go versions so the latest ones are checked first
- add Go 1.14.x (latest stable) at the first position
- use 'tip' instead of 'master' (like https://tip.golang.org) and move
  it just after 1.14.x
2020-07-21 16:59:02 +09:00
Yasuhiro Matsumoto aa77c03e2f
Update README.md 2020-06-18 22:22:56 +09:00
mattn baaf8a9784
upgrade amalgamation code (#821) 2020-06-06 12:49:38 +09:00
Martin Tournoij 0cec2d7524
Add mock versions of SQLiteDriver and SQLiteConn for +build !cgo (#819)
My app can use PostgreSQL and – optionally – SQLite. I would like to be
able to compile the app without cgo when SQLite isn't used, as this
removes the need for a C compiler which makes builds easier and faster,
especially for end-users.

In the simple case, this is not a problem go-sqlite3 already provides a
simple non-cgo mock so it compiles and gives a runtime error if you try
to use it anyway.

However, now I'd like to register a function for my SQLite connection to
match a PostgreSQL function like so:

	sql.Register("sqlite3_custom", &sqlite3.SQLiteDriver{
		ConnectHook: func(conn *sqlite3.SQLiteConn) error {
			return conn.RegisterFunc("pow", pow, true); err != nil {
		},
	})

But this makes it quite hard to keep the same logic since it refers to
types that don't exist with CGO_ENABLED=0. I will need to create a db.go
with `+build !cgo` and db_cgo.go with `+buid cgo` which duplicates all
the logic but with the sqlite hooks. In my case, this actually affects
quite a lot; for example I have a helper function which connects and
runs migrations and whatnot which looks like:

	type ConnectOptions struct {
		Connect    string // Connect string.
		Schema     []byte // Database schema to create on startup.
		Migrate    *Migrate
		SQLiteHook func(*sqlite3.SQLiteConn) error
	}

And I'd have to have two versions of that, too. You could perhaps do
something with interfaces, but because the sql.Register() call above
references the `sqlite3.SQLiteDriver.ConnectHook` struct field that's
not so straightforward (and wrapping stuff in interfaces probably won't
do much for the general clarity either).

This simplifies all of that by providing some common types that may be
used when setting up a SQLite connectin. I renamed the
`SQLiteDriverMock` to `&SQLiteDriver` for this reason. As far as I can
tell in my testing, this has no real downsides (but perhaps I missed
something?)

---

Note: it might also be worth doing something similar for error.go, as I
already have two variants of the below function (one with cgo as below,
and one without cgo which checks just PostgreSQL):

	// ErrUnique reports if this error reports a UNIQUE constraint violation.
	//
	// This is the cgo version which works for PostgreSQL and SQLite.
	func ErrUnique(err error) bool {
		var sqlErr *sqlite3.Error
		if errors.As(err, &sqlErr) && sqlErr.ExtendedCode == sqlite3.ErrConstraintUnique {
			return true
		}
		var pqErr *pq.Error
		if errors.As(err, &pqErr) && pqErr.Code == "23505" {
			return true
		}
		return false
	}

This is a lot more manageable than the ConnectHook case, but it would be
nicer if it would work without the need for build tags.
2020-06-05 22:06:55 +09:00
turtlemaster19 f600c4bddb
Edited note in README (#817) 2020-06-01 22:39:02 +09:00
Vishnu Mohandas e77f7dd61e
Document requirements for cross compiling from OSX (#804)
* Document requirements for cross compiling from OSX 

Inspiration: https://github.com/mattn/go-sqlite3/issues/384#issuecomment-433584967

* Document cross compilation steps using xgo for MACOSX
2020-05-16 00:48:12 +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
Diego Becciolini 44b2a6394a
Fix #808: remove goconvey (#809)
* don't need smartystreets/goconvey any longer

* synchronise coveralls
2020-05-14 23:24:58 +09:00
ShanePerron 61ad8da9d6
Fix for early termination of returned rows (#805)
Once the regex encountered the first instance of a non-match, it would return without processing the rest of the rows in the statement. This change allows it to process the remaining, only setting the sqlite3_result_int to zero then continuing. This worked fine for the example as it only had one item to process.
2020-05-03 00:42:42 +09:00
rittneje 98a44bcf59
report actual error message if sqlite3_load_extension fails (#800)
* report actual error message if sqlite3_load_extension fails

* more fixes and test cases

Co-authored-by: Jesse Rittner <jrittner@lutron.com>
2020-04-16 14:45:59 +09:00
Paul Bergeron 58b2310c97
Add extension-functions.c info to README (#779) 2020-04-16 14:44:20 +09:00
Yasuhiro Matsumoto 77fdcc27bb
Update dependencies 2020-04-16 14:43:15 +09:00