From ba97a23a7f0670fd1ff44e16ba61d10f66c6899d Mon Sep 17 00:00:00 2001
From: Gert-Jan Timmer <gjr.timmer@gmail.com>
Date: Wed, 23 May 2018 22:20:06 +0200
Subject: [PATCH 01/22] Rename

Renamed files containing current features.
---
 sqlite3_fts3_test.go => sqlite3_opt_fts3_test.go     | 0
 sqlite3_fts5.go => sqlite3_opt_fts5.go               | 0
 sqlite3_icu.go => sqlite3_opt_icu.go                 | 0
 sqlite3_json1.go => sqlite3_opt_json1.go             | 0
 sqlite3_vtable.go => sqlite3_opt_vtable.go           | 0
 sqlite3_vtable_test.go => sqlite3_opt_vtable_test.go | 0
 6 files changed, 0 insertions(+), 0 deletions(-)
 rename sqlite3_fts3_test.go => sqlite3_opt_fts3_test.go (100%)
 rename sqlite3_fts5.go => sqlite3_opt_fts5.go (100%)
 rename sqlite3_icu.go => sqlite3_opt_icu.go (100%)
 rename sqlite3_json1.go => sqlite3_opt_json1.go (100%)
 rename sqlite3_vtable.go => sqlite3_opt_vtable.go (100%)
 rename sqlite3_vtable_test.go => sqlite3_opt_vtable_test.go (100%)

diff --git a/sqlite3_fts3_test.go b/sqlite3_opt_fts3_test.go
similarity index 100%
rename from sqlite3_fts3_test.go
rename to sqlite3_opt_fts3_test.go
diff --git a/sqlite3_fts5.go b/sqlite3_opt_fts5.go
similarity index 100%
rename from sqlite3_fts5.go
rename to sqlite3_opt_fts5.go
diff --git a/sqlite3_icu.go b/sqlite3_opt_icu.go
similarity index 100%
rename from sqlite3_icu.go
rename to sqlite3_opt_icu.go
diff --git a/sqlite3_json1.go b/sqlite3_opt_json1.go
similarity index 100%
rename from sqlite3_json1.go
rename to sqlite3_opt_json1.go
diff --git a/sqlite3_vtable.go b/sqlite3_opt_vtable.go
similarity index 100%
rename from sqlite3_vtable.go
rename to sqlite3_opt_vtable.go
diff --git a/sqlite3_vtable_test.go b/sqlite3_opt_vtable_test.go
similarity index 100%
rename from sqlite3_vtable_test.go
rename to sqlite3_opt_vtable_test.go

From de217e4b87906a1f5ee05d43cd8f5ee1dbf40c62 Mon Sep 17 00:00:00 2001
From: Gert-Jan Timmer <gjr.timmer@gmail.com>
Date: Wed, 23 May 2018 22:20:35 +0200
Subject: [PATCH 02/22] Add: SQLITE_ALLOW_URI_AUTHORITY

---
 sqlite3_opt_allow_uri_authority.go | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 sqlite3_opt_allow_uri_authority.go

diff --git a/sqlite3_opt_allow_uri_authority.go b/sqlite3_opt_allow_uri_authority.go
new file mode 100644
index 0000000..d67b05d
--- /dev/null
+++ b/sqlite3_opt_allow_uri_authority.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 allow_uri_authority
+
+package sqlite3
+
+/*
+#cgo CFLAGS: -DSQLITE_ALLOW_URI_AUTHORITY
+#cgo LDFLAGS: -lm
+*/
+import "C"

From 507e9be49b9990eab8866105b80c616d66e3dd52 Mon Sep 17 00:00:00 2001
From: Gert-Jan Timmer <gjr.timmer@gmail.com>
Date: Wed, 23 May 2018 22:20:48 +0200
Subject: [PATCH 03/22] Add: SQLITE_ENABLE_API_ARMOR

---
 sqlite3_opt_app_armor.go | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 sqlite3_opt_app_armor.go

diff --git a/sqlite3_opt_app_armor.go b/sqlite3_opt_app_armor.go
new file mode 100644
index 0000000..0dfc99b
--- /dev/null
+++ b/sqlite3_opt_app_armor.go
@@ -0,0 +1,14 @@
+// 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 !windows
+// +build app_armor
+
+package sqlite3
+
+/*
+#cgo CFLAGS: -DSQLITE_ENABLE_API_ARMOR
+#cgo LDFLAGS: -lm
+*/
+import "C"

From e2fc6d49c609a3ad60c3a43d60089f27dd79b56d Mon Sep 17 00:00:00 2001
From: Gert-Jan Timmer <gjr.timmer@gmail.com>
Date: Wed, 23 May 2018 22:21:00 +0200
Subject: [PATCH 04/22] Add: SQLITE_DEFAULT_FOREIGN_KEYS

---
 sqlite3_opt_foreign_keys.go | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 sqlite3_opt_foreign_keys.go

diff --git a/sqlite3_opt_foreign_keys.go b/sqlite3_opt_foreign_keys.go
new file mode 100644
index 0000000..4aa938c
--- /dev/null
+++ b/sqlite3_opt_foreign_keys.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 foreign_keys
+
+package sqlite3
+
+/*
+#cgo CFLAGS: -DSQLITE_DEFAULT_FOREIGN_KEYS=1
+#cgo LDFLAGS: -lm
+*/
+import "C"

From bdda6e10e3e81e0e81c629d80fd384f680cbdf67 Mon Sep 17 00:00:00 2001
From: Gert-Jan Timmer <gjr.timmer@gmail.com>
Date: Wed, 23 May 2018 22:21:11 +0200
Subject: [PATCH 05/22] Add: SQLITE_INTROSPECTION_PRAGMAS

---
 sqlite3_opt_introspect.go | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 sqlite3_opt_introspect.go

diff --git a/sqlite3_opt_introspect.go b/sqlite3_opt_introspect.go
new file mode 100644
index 0000000..5d692a7
--- /dev/null
+++ b/sqlite3_opt_introspect.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 introspect
+
+package sqlite3
+
+/*
+#cgo CFLAGS: -DSQLITE_INTROSPECTION_PRAGMAS
+#cgo LDFLAGS: -lm
+*/
+import "C"

From c5ff80d7a812e46daa1551af04e71ab079853247 Mon Sep 17 00:00:00 2001
From: Gert-Jan Timmer <gjr.timmer@gmail.com>
Date: Wed, 23 May 2018 22:21:22 +0200
Subject: [PATCH 06/22] Add: SQLITE_SECURE_DELETE

---
 sqlite3_opt_secure_delete.go | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 sqlite3_opt_secure_delete.go

diff --git a/sqlite3_opt_secure_delete.go b/sqlite3_opt_secure_delete.go
new file mode 100644
index 0000000..c3bb4ad
--- /dev/null
+++ b/sqlite3_opt_secure_delete.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 secure_delete
+
+package sqlite3
+
+/*
+#cgo CFLAGS: -DSQLITE_SECURE_DELETE
+#cgo LDFLAGS: -lm
+*/
+import "C"

From 6929098dc1f0d89c5dd24eda3c1965da8572fb33 Mon Sep 17 00:00:00 2001
From: Gert-Jan Timmer <gjr.timmer@gmail.com>
Date: Wed, 23 May 2018 22:21:33 +0200
Subject: [PATCH 07/22] Add: SQLITE_ENABLE_STAT4

---
 sqlite3_opt_stat4.go | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 sqlite3_opt_stat4.go

diff --git a/sqlite3_opt_stat4.go b/sqlite3_opt_stat4.go
new file mode 100644
index 0000000..60c4bff
--- /dev/null
+++ b/sqlite3_opt_stat4.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 stat4
+
+package sqlite3
+
+/*
+#cgo CFLAGS: -DSQLITE_ENABLE_STAT4
+#cgo LDFLAGS: -lm
+*/
+import "C"

From ebb175735b944bed52645590d75909a2d3ca8b74 Mon Sep 17 00:00:00 2001
From: Gert-Jan Timmer <gjr.timmer@gmail.com>
Date: Wed, 23 May 2018 22:21:51 +0200
Subject: [PATCH 08/22] Add: SQLITE_DEFAULT_AUTOVACUUM

---
 sqlite3_opt_vacuum_full.go | 13 +++++++++++++
 sqlite3_opt_vacuum_incr.go | 13 +++++++++++++
 2 files changed, 26 insertions(+)
 create mode 100644 sqlite3_opt_vacuum_full.go
 create mode 100644 sqlite3_opt_vacuum_incr.go

diff --git a/sqlite3_opt_vacuum_full.go b/sqlite3_opt_vacuum_full.go
new file mode 100644
index 0000000..73881a2
--- /dev/null
+++ b/sqlite3_opt_vacuum_full.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 vacuum_full
+
+package sqlite3
+
+/*
+#cgo CFLAGS: -DSQLITE_DEFAULT_AUTOVACUUM=1
+#cgo LDFLAGS: -lm
+*/
+import "C"
diff --git a/sqlite3_opt_vacuum_incr.go b/sqlite3_opt_vacuum_incr.go
new file mode 100644
index 0000000..9b31a80
--- /dev/null
+++ b/sqlite3_opt_vacuum_incr.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 vacuum_incr
+
+package sqlite3
+
+/*
+#cgo CFLAGS: -DSQLITE_DEFAULT_AUTOVACUUM=2
+#cgo LDFLAGS: -lm
+*/
+import "C"

From a909aeb37fc75dee528be0b90efdbe7f8dd1926d Mon Sep 17 00:00:00 2001
From: Gert-Jan Timmer <gjr.timmer@gmail.com>
Date: Wed, 23 May 2018 22:23:23 +0200
Subject: [PATCH 09/22] Update: README

Add: Feature Table
Add: Links
Add: TOC
Fix: References for TOC
---
 README.md | 75 +++++++++++++++++++++++++++++++++++++------------------
 1 file changed, 51 insertions(+), 24 deletions(-)

diff --git a/README.md b/README.md
index 4870adf..42cc66e 100644
--- a/README.md
+++ b/README.md
@@ -6,13 +6,19 @@ go-sqlite3
 [![Coverage Status](https://coveralls.io/repos/mattn/go-sqlite3/badge.svg?branch=master)](https://coveralls.io/r/mattn/go-sqlite3?branch=master)
 [![Go Report Card](https://goreportcard.com/badge/github.com/mattn/go-sqlite3)](https://goreportcard.com/report/github.com/mattn/go-sqlite3)
 
-Description
------------
+# Description
 
 sqlite3 driver conforming to the built-in database/sql interface
 
-Installation
-------------
+### Overview
+
+- [Installation](#installation)
+- [API Reference](#api-reference)
+- [Features](#features)
+- [FAQ](#faq)
+- [License](#license)
+
+# Installation
 
 This package can be installed with the go get command:
 
@@ -22,56 +28,79 @@ _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.
 
-Documentation
--------------
+# API Reference
 
 API documentation can be found here: http://godoc.org/github.com/mattn/go-sqlite3
 
-Examples can be found under the `./_example` directory
+Examples can be found under the [examples](./_example) directory
 
-FAQ
----
+# Features
 
-* Want to build go-sqlite3 with libsqlite3 on my linux.
+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 for more information about build tags / constraints.](https://golang.org/pkg/go/build/#hdr-Build_Constraints)
+
+| Extension | Build Tag | Description |
+|-----------|-----------|-------------|
+| Additional Statistics | stat4 | This option adds additional logic to the ANALYZE command and to the query planner that can help SQLite to chose a better query plan under certain situations. The ANALYZE command is enhanced to collect histogram data from all columns of every index and store that data in the sqlite_stat4 table.<br><br>The query planner will then use the histogram data to help it make better index choices. The downside of this compile-time option is that it violates the query planner stability guarantee making it more difficult to ensure consistent performance in mass-produced applications.<br><br>SQLITE_ENABLE_STAT4 is an enhancement of SQLITE_ENABLE_STAT3. STAT3 only recorded histogram data for the left-most column of each index whereas the STAT4 enhancement records histogram data from all columns of each index.<br><br>The SQLITE_ENABLE_STAT3 compile-time option is a no-op and is ignored if the SQLITE_ENABLE_STAT4 compile-time option is used |
+| Allow URI Authority | 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 | 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`. |
+| Foreign Keys | 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 | vacuum_full | Set the default auto vacuum to full |
+| Incremental Auto Vacuum | vacuum_incr | Set the default auto vacuum to incremental |
+| Full Text Search Engine | fts5 | When this option is defined in the amalgamation, versions 5 of the full-text search engine (fts5) is added to the build automatically |
+|  International Components for Unicode | icu | This option causes the International Components for Unicode or "ICU" extension to SQLite to be added to the build |
+| Introspect PRAGMAS | 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 | json1 | When this option is defined in the amalgamation, the JSON SQL functions are added to the build automatically |
+| Secure Delete | 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 |
+
+# FAQ
+
+- Want to build go-sqlite3 with libsqlite3 on my linux.
 
     Use `go build --tags "libsqlite3 linux"`
 
-* Want to build go-sqlite3 with libsqlite3 on OS X.
+- Want to build go-sqlite3 with libsqlite3 on OS X.
 
     Install sqlite3 from homebrew: `brew install sqlite3`
 
     Use `go build --tags "libsqlite3 darwin"`
 
-* Want to build go-sqlite3 with icu extension.
+- Want to build go-sqlite3 with additional extensions / features.
 
-   Use `go build --tags "icu"`
+    Use `go build --tags "<FEATURE>"`
 
-   Available extensions: `json1`, `fts5`, `icu`
+    When using multiple build tags, all the different tags should be space delimted.
 
-* Can't build go-sqlite3 on windows 64bit.
+    For available features / extensions see [Features](#features).
+
+    Example building multiple features: `go build --tags "icu json1 fts5 secure_delete"`
+
+- Can't build go-sqlite3 on windows 64bit.
 
     > Probably, you are using go 1.0, go1.0 has a problem when it comes to compiling/linking on windows 64bit.
     > See: [#27](https://github.com/mattn/go-sqlite3/issues/27)
 
-* Getting insert error while query is opened.
+- Getting insert error while query is opened.
 
     > You can pass some arguments into the connection string, for example, a URI.
     > See: [#39](https://github.com/mattn/go-sqlite3/issues/39)
 
-* Do you want to cross compile? mingw on Linux or Mac?
+- Do you want to cross compile? mingw on Linux or Mac?
 
     > See: [#106](https://github.com/mattn/go-sqlite3/issues/106)
     > See also: http://www.limitlessfx.com/cross-compile-golang-app-for-windows-from-linux.html
 
-* Want to get time.Time with current locale
+- Want to get time.Time with current locale
 
     Use `_loc=auto` in SQLite3 filename schema like `file:foo.db?_loc=auto`.
 
-* Can I use this in multiple routines concurrently?
+- Can I use this in multiple routines concurrently?
 
     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 is it racy if I use a `sql.Open("sqlite3", ":memory:")` database?
+- 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
     the stdlib's sql engine happens to open another connection and you've only
@@ -80,8 +109,7 @@ FAQ
     connection to this string will point to the same in-memory database. See
     [#204](https://github.com/mattn/go-sqlite3/issues/204) for more info.
 
-License
--------
+# License
 
 MIT: http://mattn.mit-license.org/2012
 
@@ -91,7 +119,6 @@ The -binding suffix was added to avoid build failures under gccgo.
 
 In this repository, those files are an amalgamation of code that was copied from SQLite3. The license of that code is the same as the license of SQLite3.
 
-Author
-------
+# Author
 
 Yasuhiro Matsumoto (a.k.a mattn)

From 6f78e03131d97429e48f307d0483c9fcfcc841b8 Mon Sep 17 00:00:00 2001
From: Gert-Jan Timmer <gjr.timmer@gmail.com>
Date: Thu, 24 May 2018 11:53:45 +0200
Subject: [PATCH 10/22] Update build tags with prefix `sqlite_`

---
 sqlite3_opt_allow_uri_authority.go | 2 +-
 sqlite3_opt_app_armor.go           | 2 +-
 sqlite3_opt_foreign_keys.go        | 2 +-
 sqlite3_opt_introspect.go          | 2 +-
 sqlite3_opt_secure_delete.go       | 2 +-
 sqlite3_opt_stat4.go               | 2 +-
 sqlite3_opt_vacuum_full.go         | 2 +-
 sqlite3_opt_vacuum_incr.go         | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/sqlite3_opt_allow_uri_authority.go b/sqlite3_opt_allow_uri_authority.go
index d67b05d..2a5c497 100644
--- a/sqlite3_opt_allow_uri_authority.go
+++ b/sqlite3_opt_allow_uri_authority.go
@@ -2,7 +2,7 @@
 //
 // Use of this source code is governed by an MIT-style
 // license that can be found in the LICENSE file.
-// +build allow_uri_authority
+// +build sqlite_allow_uri_authority
 
 package sqlite3
 
diff --git a/sqlite3_opt_app_armor.go b/sqlite3_opt_app_armor.go
index 0dfc99b..7108c5d 100644
--- a/sqlite3_opt_app_armor.go
+++ b/sqlite3_opt_app_armor.go
@@ -3,7 +3,7 @@
 // Use of this source code is governed by an MIT-style
 // license that can be found in the LICENSE file.
 // +build !windows
-// +build app_armor
+// +build sqlite_app_armor
 
 package sqlite3
 
diff --git a/sqlite3_opt_foreign_keys.go b/sqlite3_opt_foreign_keys.go
index 4aa938c..882a1cd 100644
--- a/sqlite3_opt_foreign_keys.go
+++ b/sqlite3_opt_foreign_keys.go
@@ -2,7 +2,7 @@
 //
 // Use of this source code is governed by an MIT-style
 // license that can be found in the LICENSE file.
-// +build foreign_keys
+// +build sqlite_foreign_keys
 
 package sqlite3
 
diff --git a/sqlite3_opt_introspect.go b/sqlite3_opt_introspect.go
index 5d692a7..19fd3ee 100644
--- a/sqlite3_opt_introspect.go
+++ b/sqlite3_opt_introspect.go
@@ -2,7 +2,7 @@
 //
 // Use of this source code is governed by an MIT-style
 // license that can be found in the LICENSE file.
-// +build introspect
+// +build sqlite_introspect
 
 package sqlite3
 
diff --git a/sqlite3_opt_secure_delete.go b/sqlite3_opt_secure_delete.go
index c3bb4ad..0ea5594 100644
--- a/sqlite3_opt_secure_delete.go
+++ b/sqlite3_opt_secure_delete.go
@@ -2,7 +2,7 @@
 //
 // Use of this source code is governed by an MIT-style
 // license that can be found in the LICENSE file.
-// +build secure_delete
+// +build sqlite_secure_delete
 
 package sqlite3
 
diff --git a/sqlite3_opt_stat4.go b/sqlite3_opt_stat4.go
index 60c4bff..706cb87 100644
--- a/sqlite3_opt_stat4.go
+++ b/sqlite3_opt_stat4.go
@@ -2,7 +2,7 @@
 //
 // Use of this source code is governed by an MIT-style
 // license that can be found in the LICENSE file.
-// +build stat4
+// +build sqlite_stat4
 
 package sqlite3
 
diff --git a/sqlite3_opt_vacuum_full.go b/sqlite3_opt_vacuum_full.go
index 73881a2..7217f95 100644
--- a/sqlite3_opt_vacuum_full.go
+++ b/sqlite3_opt_vacuum_full.go
@@ -2,7 +2,7 @@
 //
 // Use of this source code is governed by an MIT-style
 // license that can be found in the LICENSE file.
-// +build vacuum_full
+// +build sqlite_vacuum_full
 
 package sqlite3
 
diff --git a/sqlite3_opt_vacuum_incr.go b/sqlite3_opt_vacuum_incr.go
index 9b31a80..8dccc43 100644
--- a/sqlite3_opt_vacuum_incr.go
+++ b/sqlite3_opt_vacuum_incr.go
@@ -2,7 +2,7 @@
 //
 // Use of this source code is governed by an MIT-style
 // license that can be found in the LICENSE file.
-// +build vacuum_incr
+// +build sqlite_vacuum_incr
 
 package sqlite3
 

From 765f6e93d28885358c2b14c885a63424d8bd68a8 Mon Sep 17 00:00:00 2001
From: Gert-Jan Timmer <gjr.timmer@gmail.com>
Date: Thu, 24 May 2018 11:55:02 +0200
Subject: [PATCH 11/22] Update prefix of build tags to `sqlite_`

* Keep current build tags backwards compliant
* Added alias for `sqlite_json1` => `sqlite_json`
---
 sqlite3_opt_fts5.go        | 2 +-
 sqlite3_opt_icu.go         | 2 +-
 sqlite3_opt_json1.go       | 2 +-
 sqlite3_opt_vtable.go      | 2 +-
 sqlite3_opt_vtable_test.go | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/sqlite3_opt_fts5.go b/sqlite3_opt_fts5.go
index 0e65d69..9126272 100644
--- a/sqlite3_opt_fts5.go
+++ b/sqlite3_opt_fts5.go
@@ -2,7 +2,7 @@
 //
 // Use of this source code is governed by an MIT-style
 // license that can be found in the LICENSE file.
-// +build fts5
+// +build sqlite_fts5 fts5
 
 package sqlite3
 
diff --git a/sqlite3_opt_icu.go b/sqlite3_opt_icu.go
index e960626..8807aef 100644
--- a/sqlite3_opt_icu.go
+++ b/sqlite3_opt_icu.go
@@ -2,7 +2,7 @@
 //
 // Use of this source code is governed by an MIT-style
 // license that can be found in the LICENSE file.
-// +build icu
+// +build sqlite_icu icu
 
 package sqlite3
 
diff --git a/sqlite3_opt_json1.go b/sqlite3_opt_json1.go
index a7b2473..993f037 100644
--- a/sqlite3_opt_json1.go
+++ b/sqlite3_opt_json1.go
@@ -2,7 +2,7 @@
 //
 // Use of this source code is governed by an MIT-style
 // license that can be found in the LICENSE file.
-// +build json1
+// +build sqlite_json sqlite_json1 json1
 
 package sqlite3
 
diff --git a/sqlite3_opt_vtable.go b/sqlite3_opt_vtable.go
index 8bef291..3391756 100644
--- a/sqlite3_opt_vtable.go
+++ b/sqlite3_opt_vtable.go
@@ -2,7 +2,7 @@
 //
 // Use of this source code is governed by an MIT-style
 // license that can be found in the LICENSE file.
-// +build vtable
+// +build sqlite_vtable vtable
 
 package sqlite3
 
diff --git a/sqlite3_opt_vtable_test.go b/sqlite3_opt_vtable_test.go
index ce6a48c..51dcd0f 100644
--- a/sqlite3_opt_vtable_test.go
+++ b/sqlite3_opt_vtable_test.go
@@ -2,7 +2,7 @@
 //
 // Use of this source code is governed by an MIT-style
 // license that can be found in the LICENSE file.
-// +build vtable
+// +build sqlite_vtable vtable
 
 package sqlite3
 

From ef74e33f4a4fefab9bb192f48d82c90a5628c104 Mon Sep 17 00:00:00 2001
From: Gert-Jan Timmer <gjr.timmer@gmail.com>
Date: Thu, 24 May 2018 11:55:24 +0200
Subject: [PATCH 12/22] Update: README

Fix: New build tag(s) names
---
 README.md | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index 42cc66e..e3616f1 100644
--- a/README.md
+++ b/README.md
@@ -42,18 +42,18 @@ This package allows additional configuration of features available within SQLite
 
 | Extension | Build Tag | Description |
 |-----------|-----------|-------------|
-| Additional Statistics | stat4 | This option adds additional logic to the ANALYZE command and to the query planner that can help SQLite to chose a better query plan under certain situations. The ANALYZE command is enhanced to collect histogram data from all columns of every index and store that data in the sqlite_stat4 table.<br><br>The query planner will then use the histogram data to help it make better index choices. The downside of this compile-time option is that it violates the query planner stability guarantee making it more difficult to ensure consistent performance in mass-produced applications.<br><br>SQLITE_ENABLE_STAT4 is an enhancement of SQLITE_ENABLE_STAT3. STAT3 only recorded histogram data for the left-most column of each index whereas the STAT4 enhancement records histogram data from all columns of each index.<br><br>The SQLITE_ENABLE_STAT3 compile-time option is a no-op and is ignored if the SQLITE_ENABLE_STAT4 compile-time option is used |
-| Allow URI Authority | 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 | 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`. |
+| Additional Statistics | sqlite_stat4 | This option adds additional logic to the ANALYZE command and to the query planner that can help SQLite to chose a better query plan under certain situations. The ANALYZE command is enhanced to collect histogram data from all columns of every index and store that data in the sqlite_stat4 table.<br><br>The query planner will then use the histogram data to help it make better index choices. The downside of this compile-time option is that it violates the query planner stability guarantee making it more difficult to ensure consistent performance in mass-produced applications.<br><br>SQLITE_ENABLE_STAT4 is an enhancement of SQLITE_ENABLE_STAT3. STAT3 only recorded histogram data for the left-most column of each index whereas the STAT4 enhancement records histogram data from all columns of each index.<br><br>The SQLITE_ENABLE_STAT3 compile-time option is a no-op and is ignored if the SQLITE_ENABLE_STAT4 compile-time option is used |
+| 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`. |
-| Foreign Keys | 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 | vacuum_full | Set the default auto vacuum to full |
-| Incremental Auto Vacuum | vacuum_incr | Set the default auto vacuum to incremental |
-| Full Text Search Engine | fts5 | When this option is defined in the amalgamation, versions 5 of the full-text search engine (fts5) is added to the build automatically |
-|  International Components for Unicode | icu | This option causes the International Components for Unicode or "ICU" extension to SQLite to be added to the build |
-| Introspect PRAGMAS | 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 | json1 | When this option is defined in the amalgamation, the JSON SQL functions are added to the build automatically |
-| Secure Delete | 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 |
+| 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 |
+| Full Text Search Engine | sqlite_fts5 | When this option is defined in the amalgamation, versions 5 of the full-text search engine (fts5) is added to the build automatically |
+|  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 |
+| 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 |
 
 # FAQ
 

From 23bb9ee3cb8bfcade3a43509bd17e057dffb64bb Mon Sep 17 00:00:00 2001
From: Gert-Jan Timmer <gjr.timmer@gmail.com>
Date: Thu, 24 May 2018 11:59:17 +0200
Subject: [PATCH 13/22] Update: Travis CI

---
 .travis.yml | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index ac1d7e3..2fb8d34 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,7 +13,18 @@ env:
     - GOTAGS=
     - GOTAGS=libsqlite3
     - GOTAGS=trace
-    - GOTAGS=vtable
+    - GOTAGS=sqlite_allow_uri_authority
+    - GOTAGS=sqlite_app_armor
+    - GOTAGS=sqlite_foreign_keys
+    - GOTAGS=sqlite_fts5
+    - GOTAGS=sqlite_icu
+    - GOTAGS=sqlite_introspect
+    - GOTAGS=sqlite_json
+    - GOTAGS=sqlite_secure_delete
+    - GOTAGS=sqlite_stat4
+    - GOTAGS=sqlite_vacuum_full
+    - GOTAGS=sqlite_vacuum_incr
+    - GOTAGS=sqlite_vtable
 
 go:
   - 1.7.x

From 5a602a653e4829fcd70281a93b565dc3624c3a89 Mon Sep 17 00:00:00 2001
From: Gert-Jan Timmer <gjr.timmer@gmail.com>
Date: Thu, 24 May 2018 12:00:17 +0200
Subject: [PATCH 14/22] Update: README

Add documentation to feature table for tag `trace`
---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index e3616f1..7b52c26 100644
--- a/README.md
+++ b/README.md
@@ -54,6 +54,7 @@ This package allows additional configuration of features available within SQLite
 | 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 |
 | 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 |
+| Tracing / Debug | trace | Activate trace functions |
 
 # FAQ
 

From 7319fcc0d8baa5a3604491549031a844747e37ab Mon Sep 17 00:00:00 2001
From: Gert-Jan Timmer <gjr.timmer@gmail.com>
Date: Thu, 24 May 2018 12:06:54 +0200
Subject: [PATCH 15/22] Renamed build option `trace`

---
 README.md        | 2 +-
 sqlite3_trace.go | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 7b52c26..6a71218 100644
--- a/README.md
+++ b/README.md
@@ -54,7 +54,7 @@ This package allows additional configuration of features available within SQLite
 | 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 |
 | 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 |
-| Tracing / Debug | trace | Activate trace functions |
+| Tracing / Debug | sqlite_trace | Activate trace functions |
 
 # FAQ
 
diff --git a/sqlite3_trace.go b/sqlite3_trace.go
index 8f90a56..999ba78 100644
--- a/sqlite3_trace.go
+++ b/sqlite3_trace.go
@@ -2,7 +2,7 @@
 //
 // Use of this source code is governed by an MIT-style
 // license that can be found in the LICENSE file.
-// +build trace
+// +build sqlite_trace trace
 
 package sqlite3
 

From 4d6bb508927735cd2b74b7eed6571a144c57be33 Mon Sep 17 00:00:00 2001
From: Gert-Jan Timmer <gjr.timmer@gmail.com>
Date: Thu, 24 May 2018 12:07:11 +0200
Subject: [PATCH 16/22] Update: Travis CI

Usage of new build tag names
---
 .travis.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 2fb8d34..f1182d4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,7 +12,6 @@ env:
   matrix:
     - GOTAGS=
     - GOTAGS=libsqlite3
-    - GOTAGS=trace
     - GOTAGS=sqlite_allow_uri_authority
     - GOTAGS=sqlite_app_armor
     - GOTAGS=sqlite_foreign_keys
@@ -21,7 +20,10 @@ env:
     - GOTAGS=sqlite_introspect
     - GOTAGS=sqlite_json
     - GOTAGS=sqlite_secure_delete
+    - GOTAGS=sqlite_see
     - GOTAGS=sqlite_stat4
+    - GOTAGS=sqlite_trace
+    - GOTAGS=sqlite_userauth
     - GOTAGS=sqlite_vacuum_full
     - GOTAGS=sqlite_vacuum_incr
     - GOTAGS=sqlite_vtable

From 7fe42b0c27f7b16ee1d55627e50501bb5a99adae Mon Sep 17 00:00:00 2001
From: Gert-Jan Timmer <gjr.timmer@gmail.com>
Date: Thu, 24 May 2018 12:35:44 +0200
Subject: [PATCH 17/22] Update: Travis CI

Added Cross-Compile jobs for additional feature(s)
---
 .travis.yml | 344 +++++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 328 insertions(+), 16 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f1182d4..0a33b13 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -56,16 +56,94 @@ matrix:
       env: GOTAGS=libsqlite3 GOOS=windows GOARCH=amd64
     - os: linux
       go: 1.7.x
-      env: GOTAGS=trace GOOS=windows GOARCH=386
+      env: GOTAGS=sqlite_allow_uri_authority GOOS=windows GOARCH=386
     - os: linux
       go: 1.7.x
-      env: GOTAGS=trace GOOS=windows GOARCH=amd64
+      env: GOTAGS=sqlite_allow_uri_authority GOOS=windows GOARCH=amd64
     - os: linux
       go: 1.7.x
-      env: GOTAGS=vtable GOOS=windows GOARCH=386
+      env: GOTAGS=sqlite_app_armor GOOS=windows GOARCH=386
     - os: linux
       go: 1.7.x
-      env: GOTAGS=vtable GOOS=windows GOARCH=amd64
+      env: GOTAGS=sqlite_app_armor GOOS=windows GOARCH=amd64
+    - os: linux
+      go: 1.7.x
+      env: GOTAGS=sqlite_foreign_keys GOOS=windows GOARCH=386
+    - os: linux
+      go: 1.7.x
+      env: GOTAGS=sqlite_foreign_keys GOOS=windows GOARCH=amd64
+    - os: linux
+      go: 1.7.x
+      env: GOTAGS=sqlite_fts5 GOOS=windows GOARCH=386
+    - os: linux
+      go: 1.7.x
+      env: GOTAGS=sqlite_fts5 GOOS=windows GOARCH=amd64
+    - os: linux
+      go: 1.7.x
+      env: GOTAGS=sqlite_icu GOOS=windows GOARCH=386
+    - os: linux
+      go: 1.7.x
+      env: GOTAGS=sqlite_icu GOOS=windows GOARCH=amd64
+    - os: linux
+      go: 1.7.x
+      env: GOTAGS=sqlite_introspect GOOS=windows GOARCH=386
+    - os: linux
+      go: 1.7.x
+      env: GOTAGS=sqlite_introspect GOOS=windows GOARCH=amd64
+    - os: linux
+      go: 1.7.x
+      env: GOTAGS=sqlite_json GOOS=windows GOARCH=386
+    - os: linux
+      go: 1.7.x
+      env: GOTAGS=sqlite_json GOOS=windows GOARCH=amd64
+    - os: linux
+      go: 1.7.x
+      env: GOTAGS=sqlite_secure_delete GOOS=windows GOARCH=386
+    - os: linux
+      go: 1.7.x
+      env: GOTAGS=sqlite_secure_delete GOOS=windows GOARCH=amd64
+    - os: linux
+      go: 1.7.x
+      env: GOTAGS=sqlite_see GOOS=windows GOARCH=386
+    - os: linux
+      go: 1.7.x
+      env: GOTAGS=sqlite_see GOOS=windows GOARCH=amd64
+    - os: linux
+      go: 1.7.x
+      env: GOTAGS=sqlite_stat4 GOOS=windows GOARCH=386
+    - os: linux
+      go: 1.7.x
+      env: GOTAGS=sqlite_stat4 GOOS=windows GOARCH=amd64
+    - os: linux
+      go: 1.7.x
+      env: GOTAGS=sqlite_trace GOOS=windows GOARCH=386
+    - os: linux
+      go: 1.7.x
+      env: GOTAGS=sqlite_trace GOOS=windows GOARCH=amd64
+    - os: linux
+      go: 1.7.x
+      env: GOTAGS=sqlite_userauth GOOS=windows GOARCH=386
+    - os: linux
+      go: 1.7.x
+      env: GOTAGS=sqlite_userauth GOOS=windows GOARCH=amd64
+    - os: linux
+      go: 1.7.x
+      env: GOTAGS=sqlite_vacuum_full GOOS=windows GOARCH=386
+    - os: linux
+      go: 1.7.x
+      env: GOTAGS=sqlite_vacuum_full GOOS=windows GOARCH=amd64
+    - os: linux
+      go: 1.7.x
+      env: GOTAGS=sqlite_vacuum_incr GOOS=windows GOARCH=386
+    - os: linux
+      go: 1.7.x
+      env: GOTAGS=sqlite_vacuum_incr GOOS=windows GOARCH=amd64
+    - os: linux
+      go: 1.7.x
+      env: GOTAGS=sqlite_vtable GOOS=windows GOARCH=386
+    - os: linux
+      go: 1.7.x
+      env: GOTAGS=sqlite_vtable GOOS=windows GOARCH=amd64
     - os: linux
       go: 1.8.x
       env: GOTAGS= GOOS=windows GOARCH=386
@@ -80,16 +158,94 @@ matrix:
       env: GOTAGS=libsqlite3 GOOS=windows GOARCH=amd64
     - os: linux
       go: 1.8.x
-      env: GOTAGS=trace GOOS=windows GOARCH=386
+      env: GOTAGS=sqlite_allow_uri_authority GOOS=windows GOARCH=386
     - os: linux
       go: 1.8.x
-      env: GOTAGS=trace GOOS=windows GOARCH=amd64
+      env: GOTAGS=sqlite_allow_uri_authority GOOS=windows GOARCH=amd64
     - os: linux
       go: 1.8.x
-      env: GOTAGS=vtable GOOS=windows GOARCH=386
+      env: GOTAGS=sqlite_app_armor GOOS=windows GOARCH=386
     - os: linux
       go: 1.8.x
-      env: GOTAGS=vtable GOOS=windows GOARCH=amd64
+      env: GOTAGS=sqlite_app_armor GOOS=windows GOARCH=amd64
+    - os: linux
+      go: 1.8.x
+      env: GOTAGS=sqlite_foreign_keys GOOS=windows GOARCH=386
+    - os: linux
+      go: 1.8.x
+      env: GOTAGS=sqlite_foreign_keys GOOS=windows GOARCH=amd64
+    - os: linux
+      go: 1.8.x
+      env: GOTAGS=sqlite_fts5 GOOS=windows GOARCH=386
+    - os: linux
+      go: 1.8.x
+      env: GOTAGS=sqlite_fts5 GOOS=windows GOARCH=amd64
+    - os: linux
+      go: 1.8.x
+      env: GOTAGS=sqlite_icu GOOS=windows GOARCH=386
+    - os: linux
+      go: 1.8.x
+      env: GOTAGS=sqlite_icu GOOS=windows GOARCH=amd64
+    - os: linux
+      go: 1.8.x
+      env: GOTAGS=sqlite_introspect GOOS=windows GOARCH=386
+    - os: linux
+      go: 1.8.x
+      env: GOTAGS=sqlite_introspect GOOS=windows GOARCH=amd64
+    - os: linux
+      go: 1.8.x
+      env: GOTAGS=sqlite_json GOOS=windows GOARCH=386
+    - os: linux
+      go: 1.8.x
+      env: GOTAGS=sqlite_json GOOS=windows GOARCH=amd64
+    - os: linux
+      go: 1.8.x
+      env: GOTAGS=sqlite_secure_delete GOOS=windows GOARCH=386
+    - os: linux
+      go: 1.8.x
+      env: GOTAGS=sqlite_secure_delete GOOS=windows GOARCH=amd64
+    - os: linux
+      go: 1.8.x
+      env: GOTAGS=sqlite_see GOOS=windows GOARCH=386
+    - os: linux
+      go: 1.8.x
+      env: GOTAGS=sqlite_see GOOS=windows GOARCH=amd64
+    - os: linux
+      go: 1.8.x
+      env: GOTAGS=sqlite_stat4 GOOS=windows GOARCH=386
+    - os: linux
+      go: 1.8.x
+      env: GOTAGS=sqlite_stat4 GOOS=windows GOARCH=amd64
+    - os: linux
+      go: 1.8.x
+      env: GOTAGS=sqlite_trace GOOS=windows GOARCH=386
+    - os: linux
+      go: 1.8.x
+      env: GOTAGS=sqlite_trace GOOS=windows GOARCH=amd64
+    - os: linux
+      go: 1.8.x
+      env: GOTAGS=sqlite_userauth GOOS=windows GOARCH=386
+    - os: linux
+      go: 1.8.x
+      env: GOTAGS=sqlite_userauth GOOS=windows GOARCH=amd64
+    - os: linux
+      go: 1.8.x
+      env: GOTAGS=sqlite_vacuum_full GOOS=windows GOARCH=386
+    - os: linux
+      go: 1.8.x
+      env: GOTAGS=sqlite_vacuum_full GOOS=windows GOARCH=amd64
+    - os: linux
+      go: 1.8.x
+      env: GOTAGS=sqlite_vacuum_incr GOOS=windows GOARCH=386
+    - os: linux
+      go: 1.8.x
+      env: GOTAGS=sqlite_vacuum_incr GOOS=windows GOARCH=amd64
+    - os: linux
+      go: 1.8.x
+      env: GOTAGS=sqlite_vtable GOOS=windows GOARCH=386
+    - os: linux
+      go: 1.8.x
+      env: GOTAGS=sqlite_vtable GOOS=windows GOARCH=amd64
     - os: linux
       go: 1.9.x
       env: GOTAGS= GOOS=windows GOARCH=386
@@ -104,16 +260,94 @@ matrix:
       env: GOTAGS=libsqlite3 GOOS=windows GOARCH=amd64
     - os: linux
       go: 1.9.x
-      env: GOTAGS=trace GOOS=windows GOARCH=386
+      env: GOTAGS=sqlite_allow_uri_authority GOOS=windows GOARCH=386
     - os: linux
       go: 1.9.x
-      env: GOTAGS=trace GOOS=windows GOARCH=amd64
+      env: GOTAGS=sqlite_allow_uri_authority GOOS=windows GOARCH=amd64
     - os: linux
       go: 1.9.x
-      env: GOTAGS=vtable GOOS=windows GOARCH=386
+      env: GOTAGS=sqlite_app_armor GOOS=windows GOARCH=386
     - os: linux
       go: 1.9.x
-      env: GOTAGS=vtable GOOS=windows GOARCH=amd64
+      env: GOTAGS=sqlite_app_armor GOOS=windows GOARCH=amd64
+    - os: linux
+      go: 1.9.x
+      env: GOTAGS=sqlite_foreign_keys GOOS=windows GOARCH=386
+    - os: linux
+      go: 1.9.x
+      env: GOTAGS=sqlite_foreign_keys GOOS=windows GOARCH=amd64
+    - os: linux
+      go: 1.9.x
+      env: GOTAGS=sqlite_fts5 GOOS=windows GOARCH=386
+    - os: linux
+      go: 1.9.x
+      env: GOTAGS=sqlite_fts5 GOOS=windows GOARCH=amd64
+    - os: linux
+      go: 1.9.x
+      env: GOTAGS=sqlite_icu GOOS=windows GOARCH=386
+    - os: linux
+      go: 1.9.x
+      env: GOTAGS=sqlite_icu GOOS=windows GOARCH=amd64
+    - os: linux
+      go: 1.9.x
+      env: GOTAGS=sqlite_introspect GOOS=windows GOARCH=386
+    - os: linux
+      go: 1.9.x
+      env: GOTAGS=sqlite_introspect GOOS=windows GOARCH=amd64
+    - os: linux
+      go: 1.9.x
+      env: GOTAGS=sqlite_json GOOS=windows GOARCH=386
+    - os: linux
+      go: 1.9.x
+      env: GOTAGS=sqlite_json GOOS=windows GOARCH=amd64
+    - os: linux
+      go: 1.9.x
+      env: GOTAGS=sqlite_secure_delete GOOS=windows GOARCH=386
+    - os: linux
+      go: 1.9.x
+      env: GOTAGS=sqlite_secure_delete GOOS=windows GOARCH=amd64
+    - os: linux
+      go: 1.9.x
+      env: GOTAGS=sqlite_see GOOS=windows GOARCH=386
+    - os: linux
+      go: 1.9.x
+      env: GOTAGS=sqlite_see GOOS=windows GOARCH=amd64
+    - os: linux
+      go: 1.9.x
+      env: GOTAGS=sqlite_stat4 GOOS=windows GOARCH=386
+    - os: linux
+      go: 1.9.x
+      env: GOTAGS=sqlite_stat4 GOOS=windows GOARCH=amd64
+    - os: linux
+      go: 1.9.x
+      env: GOTAGS=sqlite_trace GOOS=windows GOARCH=386
+    - os: linux
+      go: 1.9.x
+      env: GOTAGS=sqlite_trace GOOS=windows GOARCH=amd64
+    - os: linux
+      go: 1.9.x
+      env: GOTAGS=sqlite_userauth GOOS=windows GOARCH=386
+    - os: linux
+      go: 1.9.x
+      env: GOTAGS=sqlite_userauth GOOS=windows GOARCH=amd64
+    - os: linux
+      go: 1.9.x
+      env: GOTAGS=sqlite_vacuum_full GOOS=windows GOARCH=386
+    - os: linux
+      go: 1.9.x
+      env: GOTAGS=sqlite_vacuum_full GOOS=windows GOARCH=amd64
+    - os: linux
+      go: 1.9.x
+      env: GOTAGS=sqlite_vacuum_incr GOOS=windows GOARCH=386
+    - os: linux
+      go: 1.9.x
+      env: GOTAGS=sqlite_vacuum_incr GOOS=windows GOARCH=amd64
+    - os: linux
+      go: 1.9.x
+      env: GOTAGS=sqlite_vtable GOOS=windows GOARCH=386
+    - os: linux
+      go: 1.9.x
+      env: GOTAGS=sqlite_vtable GOOS=windows GOARCH=amd64
     - os: linux
       go: 1.10.x
       env: GOTAGS= GOOS=windows GOARCH=386
@@ -128,16 +362,94 @@ matrix:
       env: GOTAGS=libsqlite3 GOOS=windows GOARCH=amd64
     - os: linux
       go: 1.10.x
-      env: GOTAGS=trace GOOS=windows GOARCH=386
+      env: GOTAGS=sqlite_allow_uri_authority GOOS=windows GOARCH=386
     - os: linux
       go: 1.10.x
-      env: GOTAGS=trace GOOS=windows GOARCH=amd64
+      env: GOTAGS=sqlite_allow_uri_authority GOOS=windows GOARCH=amd64
     - os: linux
       go: 1.10.x
-      env: GOTAGS=vtable GOOS=windows GOARCH=386
+      env: GOTAGS=sqlite_app_armor GOOS=windows GOARCH=386
     - os: linux
       go: 1.10.x
-      env: GOTAGS=vtable GOOS=windows GOARCH=amd64
+      env: GOTAGS=sqlite_app_armor GOOS=windows GOARCH=amd64
+    - os: linux
+      go: 1.10.x
+      env: GOTAGS=sqlite_foreign_keys GOOS=windows GOARCH=386
+    - os: linux
+      go: 1.10.x
+      env: GOTAGS=sqlite_foreign_keys GOOS=windows GOARCH=amd64
+    - os: linux
+      go: 1.10.x
+      env: GOTAGS=sqlite_fts5 GOOS=windows GOARCH=386
+    - os: linux
+      go: 1.10.x
+      env: GOTAGS=sqlite_fts5 GOOS=windows GOARCH=amd64
+    - os: linux
+      go: 1.10.x
+      env: GOTAGS=sqlite_icu GOOS=windows GOARCH=386
+    - os: linux
+      go: 1.10.x
+      env: GOTAGS=sqlite_icu GOOS=windows GOARCH=amd64
+    - os: linux
+      go: 1.10.x
+      env: GOTAGS=sqlite_introspect GOOS=windows GOARCH=386
+    - os: linux
+      go: 1.10.x
+      env: GOTAGS=sqlite_introspect GOOS=windows GOARCH=amd64
+    - os: linux
+      go: 1.10.x
+      env: GOTAGS=sqlite_json GOOS=windows GOARCH=386
+    - os: linux
+      go: 1.10.x
+      env: GOTAGS=sqlite_json GOOS=windows GOARCH=amd64
+    - os: linux
+      go: 1.10.x
+      env: GOTAGS=sqlite_secure_delete GOOS=windows GOARCH=386
+    - os: linux
+      go: 1.10.x
+      env: GOTAGS=sqlite_secure_delete GOOS=windows GOARCH=amd64
+    - os: linux
+      go: 1.10.x
+      env: GOTAGS=sqlite_see GOOS=windows GOARCH=386
+    - os: linux
+      go: 1.10.x
+      env: GOTAGS=sqlite_see GOOS=windows GOARCH=amd64
+    - os: linux
+      go: 1.10.x
+      env: GOTAGS=sqlite_stat4 GOOS=windows GOARCH=386
+    - os: linux
+      go: 1.10.x
+      env: GOTAGS=sqlite_stat4 GOOS=windows GOARCH=amd64
+    - os: linux
+      go: 1.10.x
+      env: GOTAGS=sqlite_trace GOOS=windows GOARCH=386
+    - os: linux
+      go: 1.10.x
+      env: GOTAGS=sqlite_trace GOOS=windows GOARCH=amd64
+    - os: linux
+      go: 1.10.x
+      env: GOTAGS=sqlite_userauth GOOS=windows GOARCH=386
+    - os: linux
+      go: 1.10.x
+      env: GOTAGS=sqlite_userauth GOOS=windows GOARCH=amd64
+    - os: linux
+      go: 1.10.x
+      env: GOTAGS=sqlite_vacuum_full GOOS=windows GOARCH=386
+    - os: linux
+      go: 1.10.x
+      env: GOTAGS=sqlite_vacuum_full GOOS=windows GOARCH=amd64
+    - os: linux
+      go: 1.10.x
+      env: GOTAGS=sqlite_vacuum_incr GOOS=windows GOARCH=386
+    - os: linux
+      go: 1.10.x
+      env: GOTAGS=sqlite_vacuum_incr GOOS=windows GOARCH=amd64
+    - os: linux
+      go: 1.10.x
+      env: GOTAGS=sqlite_vtable GOOS=windows GOARCH=386
+    - os: linux
+      go: 1.10.x
+      env: GOTAGS=sqlite_vtable GOOS=windows GOARCH=amd64
 
 
 before_install:

From 4525f3a65f5a1257ed421bdac068a35fe76fb7d1 Mon Sep 17 00:00:00 2001
From: Gert-Jan Timmer <gjr.timmer@gmail.com>
Date: Thu, 24 May 2018 15:06:10 +0200
Subject: [PATCH 18/22] Add: icu4c to OSX

Required for building SQLite module `icu`
---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 0a33b13..8a5b62f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -456,6 +456,7 @@ before_install:
   - |
     if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then 
       brew update
+      brew install icu4c
     fi
   - |
     if [[ "${GOOS}" != "windows" ]]; then

From b21e83238e13ffa93d9e777dd1bd3c90e70192b6 Mon Sep 17 00:00:00 2001
From: Gert-Jan Timmer <gjr.timmer@gmail.com>
Date: Fri, 25 May 2018 10:18:56 +0200
Subject: [PATCH 19/22] Update: Travis CI

---
 .travis.yml | 268 ++--------------------------------------------------
 1 file changed, 9 insertions(+), 259 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8a5b62f..d2dcf47 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,18 +12,8 @@ env:
   matrix:
     - GOTAGS=
     - GOTAGS=libsqlite3
-    - GOTAGS=sqlite_allow_uri_authority
-    - GOTAGS=sqlite_app_armor
-    - GOTAGS=sqlite_foreign_keys
-    - GOTAGS=sqlite_fts5
-    - GOTAGS=sqlite_icu
-    - GOTAGS=sqlite_introspect
-    - GOTAGS=sqlite_json
-    - GOTAGS=sqlite_secure_delete
-    - GOTAGS=sqlite_see
-    - GOTAGS=sqlite_stat4
+    - GOTAGS="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_userauth"
     - GOTAGS=sqlite_trace
-    - GOTAGS=sqlite_userauth
     - GOTAGS=sqlite_vacuum_full
     - GOTAGS=sqlite_vacuum_incr
     - GOTAGS=sqlite_vtable
@@ -56,76 +46,16 @@ matrix:
       env: GOTAGS=libsqlite3 GOOS=windows GOARCH=amd64
     - os: linux
       go: 1.7.x
-      env: GOTAGS=sqlite_allow_uri_authority GOOS=windows GOARCH=386
+      env: GOTAGS="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_userauth" GOOS=windows GOARCH=386
     - os: linux
       go: 1.7.x
-      env: GOTAGS=sqlite_allow_uri_authority GOOS=windows GOARCH=amd64
-    - os: linux
-      go: 1.7.x
-      env: GOTAGS=sqlite_app_armor GOOS=windows GOARCH=386
-    - os: linux
-      go: 1.7.x
-      env: GOTAGS=sqlite_app_armor GOOS=windows GOARCH=amd64
-    - os: linux
-      go: 1.7.x
-      env: GOTAGS=sqlite_foreign_keys GOOS=windows GOARCH=386
-    - os: linux
-      go: 1.7.x
-      env: GOTAGS=sqlite_foreign_keys GOOS=windows GOARCH=amd64
-    - os: linux
-      go: 1.7.x
-      env: GOTAGS=sqlite_fts5 GOOS=windows GOARCH=386
-    - os: linux
-      go: 1.7.x
-      env: GOTAGS=sqlite_fts5 GOOS=windows GOARCH=amd64
-    - os: linux
-      go: 1.7.x
-      env: GOTAGS=sqlite_icu GOOS=windows GOARCH=386
-    - os: linux
-      go: 1.7.x
-      env: GOTAGS=sqlite_icu GOOS=windows GOARCH=amd64
-    - os: linux
-      go: 1.7.x
-      env: GOTAGS=sqlite_introspect GOOS=windows GOARCH=386
-    - os: linux
-      go: 1.7.x
-      env: GOTAGS=sqlite_introspect GOOS=windows GOARCH=amd64
-    - os: linux
-      go: 1.7.x
-      env: GOTAGS=sqlite_json GOOS=windows GOARCH=386
-    - os: linux
-      go: 1.7.x
-      env: GOTAGS=sqlite_json GOOS=windows GOARCH=amd64
-    - os: linux
-      go: 1.7.x
-      env: GOTAGS=sqlite_secure_delete GOOS=windows GOARCH=386
-    - os: linux
-      go: 1.7.x
-      env: GOTAGS=sqlite_secure_delete GOOS=windows GOARCH=amd64
-    - os: linux
-      go: 1.7.x
-      env: GOTAGS=sqlite_see GOOS=windows GOARCH=386
-    - os: linux
-      go: 1.7.x
-      env: GOTAGS=sqlite_see GOOS=windows GOARCH=amd64
-    - os: linux
-      go: 1.7.x
-      env: GOTAGS=sqlite_stat4 GOOS=windows GOARCH=386
-    - os: linux
-      go: 1.7.x
-      env: GOTAGS=sqlite_stat4 GOOS=windows GOARCH=amd64
+      env: GOTAGS="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_userauth" GOOS=windows GOARCH=amd64
     - os: linux
       go: 1.7.x
       env: GOTAGS=sqlite_trace GOOS=windows GOARCH=386
     - os: linux
       go: 1.7.x
       env: GOTAGS=sqlite_trace GOOS=windows GOARCH=amd64
-    - os: linux
-      go: 1.7.x
-      env: GOTAGS=sqlite_userauth GOOS=windows GOARCH=386
-    - os: linux
-      go: 1.7.x
-      env: GOTAGS=sqlite_userauth GOOS=windows GOARCH=amd64
     - os: linux
       go: 1.7.x
       env: GOTAGS=sqlite_vacuum_full GOOS=windows GOARCH=386
@@ -158,76 +88,16 @@ matrix:
       env: GOTAGS=libsqlite3 GOOS=windows GOARCH=amd64
     - os: linux
       go: 1.8.x
-      env: GOTAGS=sqlite_allow_uri_authority GOOS=windows GOARCH=386
+      env: GOTAGS="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_userauth" GOOS=windows GOARCH=386
     - os: linux
       go: 1.8.x
-      env: GOTAGS=sqlite_allow_uri_authority GOOS=windows GOARCH=amd64
-    - os: linux
-      go: 1.8.x
-      env: GOTAGS=sqlite_app_armor GOOS=windows GOARCH=386
-    - os: linux
-      go: 1.8.x
-      env: GOTAGS=sqlite_app_armor GOOS=windows GOARCH=amd64
-    - os: linux
-      go: 1.8.x
-      env: GOTAGS=sqlite_foreign_keys GOOS=windows GOARCH=386
-    - os: linux
-      go: 1.8.x
-      env: GOTAGS=sqlite_foreign_keys GOOS=windows GOARCH=amd64
-    - os: linux
-      go: 1.8.x
-      env: GOTAGS=sqlite_fts5 GOOS=windows GOARCH=386
-    - os: linux
-      go: 1.8.x
-      env: GOTAGS=sqlite_fts5 GOOS=windows GOARCH=amd64
-    - os: linux
-      go: 1.8.x
-      env: GOTAGS=sqlite_icu GOOS=windows GOARCH=386
-    - os: linux
-      go: 1.8.x
-      env: GOTAGS=sqlite_icu GOOS=windows GOARCH=amd64
-    - os: linux
-      go: 1.8.x
-      env: GOTAGS=sqlite_introspect GOOS=windows GOARCH=386
-    - os: linux
-      go: 1.8.x
-      env: GOTAGS=sqlite_introspect GOOS=windows GOARCH=amd64
-    - os: linux
-      go: 1.8.x
-      env: GOTAGS=sqlite_json GOOS=windows GOARCH=386
-    - os: linux
-      go: 1.8.x
-      env: GOTAGS=sqlite_json GOOS=windows GOARCH=amd64
-    - os: linux
-      go: 1.8.x
-      env: GOTAGS=sqlite_secure_delete GOOS=windows GOARCH=386
-    - os: linux
-      go: 1.8.x
-      env: GOTAGS=sqlite_secure_delete GOOS=windows GOARCH=amd64
-    - os: linux
-      go: 1.8.x
-      env: GOTAGS=sqlite_see GOOS=windows GOARCH=386
-    - os: linux
-      go: 1.8.x
-      env: GOTAGS=sqlite_see GOOS=windows GOARCH=amd64
-    - os: linux
-      go: 1.8.x
-      env: GOTAGS=sqlite_stat4 GOOS=windows GOARCH=386
-    - os: linux
-      go: 1.8.x
-      env: GOTAGS=sqlite_stat4 GOOS=windows GOARCH=amd64
+      env: GOTAGS="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_userauth" GOOS=windows GOARCH=amd64
     - os: linux
       go: 1.8.x
       env: GOTAGS=sqlite_trace GOOS=windows GOARCH=386
     - os: linux
       go: 1.8.x
       env: GOTAGS=sqlite_trace GOOS=windows GOARCH=amd64
-    - os: linux
-      go: 1.8.x
-      env: GOTAGS=sqlite_userauth GOOS=windows GOARCH=386
-    - os: linux
-      go: 1.8.x
-      env: GOTAGS=sqlite_userauth GOOS=windows GOARCH=amd64
     - os: linux
       go: 1.8.x
       env: GOTAGS=sqlite_vacuum_full GOOS=windows GOARCH=386
@@ -260,76 +130,16 @@ matrix:
       env: GOTAGS=libsqlite3 GOOS=windows GOARCH=amd64
     - os: linux
       go: 1.9.x
-      env: GOTAGS=sqlite_allow_uri_authority GOOS=windows GOARCH=386
+      env: GOTAGS="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_userauth" GOOS=windows GOARCH=386
     - os: linux
       go: 1.9.x
-      env: GOTAGS=sqlite_allow_uri_authority GOOS=windows GOARCH=amd64
-    - os: linux
-      go: 1.9.x
-      env: GOTAGS=sqlite_app_armor GOOS=windows GOARCH=386
-    - os: linux
-      go: 1.9.x
-      env: GOTAGS=sqlite_app_armor GOOS=windows GOARCH=amd64
-    - os: linux
-      go: 1.9.x
-      env: GOTAGS=sqlite_foreign_keys GOOS=windows GOARCH=386
-    - os: linux
-      go: 1.9.x
-      env: GOTAGS=sqlite_foreign_keys GOOS=windows GOARCH=amd64
-    - os: linux
-      go: 1.9.x
-      env: GOTAGS=sqlite_fts5 GOOS=windows GOARCH=386
-    - os: linux
-      go: 1.9.x
-      env: GOTAGS=sqlite_fts5 GOOS=windows GOARCH=amd64
-    - os: linux
-      go: 1.9.x
-      env: GOTAGS=sqlite_icu GOOS=windows GOARCH=386
-    - os: linux
-      go: 1.9.x
-      env: GOTAGS=sqlite_icu GOOS=windows GOARCH=amd64
-    - os: linux
-      go: 1.9.x
-      env: GOTAGS=sqlite_introspect GOOS=windows GOARCH=386
-    - os: linux
-      go: 1.9.x
-      env: GOTAGS=sqlite_introspect GOOS=windows GOARCH=amd64
-    - os: linux
-      go: 1.9.x
-      env: GOTAGS=sqlite_json GOOS=windows GOARCH=386
-    - os: linux
-      go: 1.9.x
-      env: GOTAGS=sqlite_json GOOS=windows GOARCH=amd64
-    - os: linux
-      go: 1.9.x
-      env: GOTAGS=sqlite_secure_delete GOOS=windows GOARCH=386
-    - os: linux
-      go: 1.9.x
-      env: GOTAGS=sqlite_secure_delete GOOS=windows GOARCH=amd64
-    - os: linux
-      go: 1.9.x
-      env: GOTAGS=sqlite_see GOOS=windows GOARCH=386
-    - os: linux
-      go: 1.9.x
-      env: GOTAGS=sqlite_see GOOS=windows GOARCH=amd64
-    - os: linux
-      go: 1.9.x
-      env: GOTAGS=sqlite_stat4 GOOS=windows GOARCH=386
-    - os: linux
-      go: 1.9.x
-      env: GOTAGS=sqlite_stat4 GOOS=windows GOARCH=amd64
+      env: GOTAGS="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_userauth" GOOS=windows GOARCH=amd64
     - os: linux
       go: 1.9.x
       env: GOTAGS=sqlite_trace GOOS=windows GOARCH=386
     - os: linux
       go: 1.9.x
       env: GOTAGS=sqlite_trace GOOS=windows GOARCH=amd64
-    - os: linux
-      go: 1.9.x
-      env: GOTAGS=sqlite_userauth GOOS=windows GOARCH=386
-    - os: linux
-      go: 1.9.x
-      env: GOTAGS=sqlite_userauth GOOS=windows GOARCH=amd64
     - os: linux
       go: 1.9.x
       env: GOTAGS=sqlite_vacuum_full GOOS=windows GOARCH=386
@@ -362,76 +172,16 @@ matrix:
       env: GOTAGS=libsqlite3 GOOS=windows GOARCH=amd64
     - os: linux
       go: 1.10.x
-      env: GOTAGS=sqlite_allow_uri_authority GOOS=windows GOARCH=386
+      env: GOTAGS="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_userauth" GOOS=windows GOARCH=386
     - os: linux
       go: 1.10.x
-      env: GOTAGS=sqlite_allow_uri_authority GOOS=windows GOARCH=amd64
-    - os: linux
-      go: 1.10.x
-      env: GOTAGS=sqlite_app_armor GOOS=windows GOARCH=386
-    - os: linux
-      go: 1.10.x
-      env: GOTAGS=sqlite_app_armor GOOS=windows GOARCH=amd64
-    - os: linux
-      go: 1.10.x
-      env: GOTAGS=sqlite_foreign_keys GOOS=windows GOARCH=386
-    - os: linux
-      go: 1.10.x
-      env: GOTAGS=sqlite_foreign_keys GOOS=windows GOARCH=amd64
-    - os: linux
-      go: 1.10.x
-      env: GOTAGS=sqlite_fts5 GOOS=windows GOARCH=386
-    - os: linux
-      go: 1.10.x
-      env: GOTAGS=sqlite_fts5 GOOS=windows GOARCH=amd64
-    - os: linux
-      go: 1.10.x
-      env: GOTAGS=sqlite_icu GOOS=windows GOARCH=386
-    - os: linux
-      go: 1.10.x
-      env: GOTAGS=sqlite_icu GOOS=windows GOARCH=amd64
-    - os: linux
-      go: 1.10.x
-      env: GOTAGS=sqlite_introspect GOOS=windows GOARCH=386
-    - os: linux
-      go: 1.10.x
-      env: GOTAGS=sqlite_introspect GOOS=windows GOARCH=amd64
-    - os: linux
-      go: 1.10.x
-      env: GOTAGS=sqlite_json GOOS=windows GOARCH=386
-    - os: linux
-      go: 1.10.x
-      env: GOTAGS=sqlite_json GOOS=windows GOARCH=amd64
-    - os: linux
-      go: 1.10.x
-      env: GOTAGS=sqlite_secure_delete GOOS=windows GOARCH=386
-    - os: linux
-      go: 1.10.x
-      env: GOTAGS=sqlite_secure_delete GOOS=windows GOARCH=amd64
-    - os: linux
-      go: 1.10.x
-      env: GOTAGS=sqlite_see GOOS=windows GOARCH=386
-    - os: linux
-      go: 1.10.x
-      env: GOTAGS=sqlite_see GOOS=windows GOARCH=amd64
-    - os: linux
-      go: 1.10.x
-      env: GOTAGS=sqlite_stat4 GOOS=windows GOARCH=386
-    - os: linux
-      go: 1.10.x
-      env: GOTAGS=sqlite_stat4 GOOS=windows GOARCH=amd64
+      env: GOTAGS="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_userauth" GOOS=windows GOARCH=amd64
     - os: linux
       go: 1.10.x
       env: GOTAGS=sqlite_trace GOOS=windows GOARCH=386
     - os: linux
       go: 1.10.x
       env: GOTAGS=sqlite_trace GOOS=windows GOARCH=amd64
-    - os: linux
-      go: 1.10.x
-      env: GOTAGS=sqlite_userauth GOOS=windows GOARCH=386
-    - os: linux
-      go: 1.10.x
-      env: GOTAGS=sqlite_userauth GOOS=windows GOARCH=amd64
     - os: linux
       go: 1.10.x
       env: GOTAGS=sqlite_vacuum_full GOOS=windows GOARCH=386

From 59885cf9d4f8ce9235236558d5ac81c52fd58619 Mon Sep 17 00:00:00 2001
From: Gert-Jan Timmer <gjr.timmer@gmail.com>
Date: Fri, 25 May 2018 10:40:18 +0200
Subject: [PATCH 20/22] Reduced build time

Closes #567
---
 .travis.yml | 49 -------------------------------------------------
 1 file changed, 49 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d2dcf47..4071647 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,61 +19,12 @@ env:
     - GOTAGS=sqlite_vtable
 
 go:
-  - 1.7.x
   - 1.8.x
   - 1.9.x
   - 1.10.x
-  - master
 
 matrix:
-  allow_failures:
-    - go: master
-  exclude:
-    - os: osx
-      go: 1.7.x
   include:
-    - os: linux
-      go: 1.7.x
-      env: GOTAGS= GOOS=windows GOARCH=386
-    - os: linux
-      go: 1.7.x
-      env: GOTAGS= GOOS=windows GOARCH=amd64
-    - os: linux
-      go: 1.7.x
-      env: GOTAGS=libsqlite3 GOOS=windows GOARCH=386
-    - os: linux
-      go: 1.7.x
-      env: GOTAGS=libsqlite3 GOOS=windows GOARCH=amd64
-    - os: linux
-      go: 1.7.x
-      env: GOTAGS="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_userauth" GOOS=windows GOARCH=386
-    - os: linux
-      go: 1.7.x
-      env: GOTAGS="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_userauth" GOOS=windows GOARCH=amd64
-    - os: linux
-      go: 1.7.x
-      env: GOTAGS=sqlite_trace GOOS=windows GOARCH=386
-    - os: linux
-      go: 1.7.x
-      env: GOTAGS=sqlite_trace GOOS=windows GOARCH=amd64
-    - os: linux
-      go: 1.7.x
-      env: GOTAGS=sqlite_vacuum_full GOOS=windows GOARCH=386
-    - os: linux
-      go: 1.7.x
-      env: GOTAGS=sqlite_vacuum_full GOOS=windows GOARCH=amd64
-    - os: linux
-      go: 1.7.x
-      env: GOTAGS=sqlite_vacuum_incr GOOS=windows GOARCH=386
-    - os: linux
-      go: 1.7.x
-      env: GOTAGS=sqlite_vacuum_incr GOOS=windows GOARCH=amd64
-    - os: linux
-      go: 1.7.x
-      env: GOTAGS=sqlite_vtable GOOS=windows GOARCH=386
-    - os: linux
-      go: 1.7.x
-      env: GOTAGS=sqlite_vtable GOOS=windows GOARCH=amd64
     - os: linux
       go: 1.8.x
       env: GOTAGS= GOOS=windows GOARCH=386

From 5abd024785fc4b5916fa6296a7c4542d2ec07fbe Mon Sep 17 00:00:00 2001
From: Gert-Jan Timmer <gjr.timmer@gmail.com>
Date: Fri, 25 May 2018 11:41:14 +0200
Subject: [PATCH 21/22] Fix: OSX icu module

---
 .travis.yml        | 2 +-
 sqlite3_opt_icu.go | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 4071647..914e92e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -157,7 +157,7 @@ before_install:
   - |
     if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then 
       brew update
-      brew install icu4c
+      brew upgrade icu4c
     fi
   - |
     if [[ "${GOOS}" != "windows" ]]; then
diff --git a/sqlite3_opt_icu.go b/sqlite3_opt_icu.go
index 8807aef..9bc0c61 100644
--- a/sqlite3_opt_icu.go
+++ b/sqlite3_opt_icu.go
@@ -9,5 +9,7 @@ package sqlite3
 /*
 #cgo LDFLAGS: -licuuc -licui18n
 #cgo CFLAGS: -DSQLITE_ENABLE_ICU
+#cgo darwin CFLAGS: -I/usr/local/opt/icu4c/include
+#cgo darwin LDFLAGS: -L/usr/local/opt/icu4c/lib
 */
 import "C"

From 2cee2f9651f3967dfb7a54d954983335d2e1cc71 Mon Sep 17 00:00:00 2001
From: Gert-Jan Timmer <gjr.timmer@gmail.com>
Date: Fri, 25 May 2018 12:24:41 +0200
Subject: [PATCH 22/22] Update Travis CI

Removed: 32Bit Windows Cross-Compile
Aggregated: sqlite_trace into main module build
---
 .travis.yml | 81 +++--------------------------------------------------
 1 file changed, 4 insertions(+), 77 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 914e92e..ba8c891 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,8 +12,7 @@ env:
   matrix:
     - GOTAGS=
     - GOTAGS=libsqlite3
-    - GOTAGS="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_userauth"
-    - GOTAGS=sqlite_trace
+    - GOTAGS="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"
     - GOTAGS=sqlite_vacuum_full
     - GOTAGS=sqlite_vacuum_incr
     - GOTAGS=sqlite_vtable
@@ -25,129 +24,57 @@ go:
 
 matrix:
   include:
-    - os: linux
-      go: 1.8.x
-      env: GOTAGS= GOOS=windows GOARCH=386
     - os: linux
       go: 1.8.x
       env: GOTAGS= GOOS=windows GOARCH=amd64
-    - os: linux
-      go: 1.8.x
-      env: GOTAGS=libsqlite3 GOOS=windows GOARCH=386
     - os: linux
       go: 1.8.x
       env: GOTAGS=libsqlite3 GOOS=windows GOARCH=amd64
     - os: linux
       go: 1.8.x
-      env: GOTAGS="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_userauth" GOOS=windows GOARCH=386
-    - os: linux
-      go: 1.8.x
-      env: GOTAGS="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_userauth" GOOS=windows GOARCH=amd64
-    - os: linux
-      go: 1.8.x
-      env: GOTAGS=sqlite_trace GOOS=windows GOARCH=386
-    - os: linux
-      go: 1.8.x
-      env: GOTAGS=sqlite_trace GOOS=windows GOARCH=amd64
-    - os: linux
-      go: 1.8.x
-      env: GOTAGS=sqlite_vacuum_full GOOS=windows GOARCH=386
+      env: GOTAGS="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" GOOS=windows GOARCH=amd64
     - os: linux
       go: 1.8.x
       env: GOTAGS=sqlite_vacuum_full GOOS=windows GOARCH=amd64
-    - os: linux
-      go: 1.8.x
-      env: GOTAGS=sqlite_vacuum_incr GOOS=windows GOARCH=386
     - os: linux
       go: 1.8.x
       env: GOTAGS=sqlite_vacuum_incr GOOS=windows GOARCH=amd64
-    - os: linux
-      go: 1.8.x
-      env: GOTAGS=sqlite_vtable GOOS=windows GOARCH=386
     - os: linux
       go: 1.8.x
       env: GOTAGS=sqlite_vtable GOOS=windows GOARCH=amd64
-    - os: linux
-      go: 1.9.x
-      env: GOTAGS= GOOS=windows GOARCH=386
     - os: linux
       go: 1.9.x
       env: GOTAGS= GOOS=windows GOARCH=amd64
-    - os: linux
-      go: 1.9.x
-      env: GOTAGS=libsqlite3 GOOS=windows GOARCH=386
     - os: linux
       go: 1.9.x
       env: GOTAGS=libsqlite3 GOOS=windows GOARCH=amd64
     - os: linux
       go: 1.9.x
-      env: GOTAGS="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_userauth" GOOS=windows GOARCH=386
-    - os: linux
-      go: 1.9.x
-      env: GOTAGS="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_userauth" GOOS=windows GOARCH=amd64
-    - os: linux
-      go: 1.9.x
-      env: GOTAGS=sqlite_trace GOOS=windows GOARCH=386
-    - os: linux
-      go: 1.9.x
-      env: GOTAGS=sqlite_trace GOOS=windows GOARCH=amd64
-    - os: linux
-      go: 1.9.x
-      env: GOTAGS=sqlite_vacuum_full GOOS=windows GOARCH=386
+      env: GOTAGS="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" GOOS=windows GOARCH=amd64
     - os: linux
       go: 1.9.x
       env: GOTAGS=sqlite_vacuum_full GOOS=windows GOARCH=amd64
-    - os: linux
-      go: 1.9.x
-      env: GOTAGS=sqlite_vacuum_incr GOOS=windows GOARCH=386
     - os: linux
       go: 1.9.x
       env: GOTAGS=sqlite_vacuum_incr GOOS=windows GOARCH=amd64
-    - os: linux
-      go: 1.9.x
-      env: GOTAGS=sqlite_vtable GOOS=windows GOARCH=386
     - os: linux
       go: 1.9.x
       env: GOTAGS=sqlite_vtable GOOS=windows GOARCH=amd64
-    - os: linux
-      go: 1.10.x
-      env: GOTAGS= GOOS=windows GOARCH=386
     - os: linux
       go: 1.10.x
       env: GOTAGS= GOOS=windows GOARCH=amd64
-    - os: linux
-      go: 1.10.x
-      env: GOTAGS=libsqlite3 GOOS=windows GOARCH=386
     - os: linux
       go: 1.10.x
       env: GOTAGS=libsqlite3 GOOS=windows GOARCH=amd64
     - os: linux
       go: 1.10.x
-      env: GOTAGS="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_userauth" GOOS=windows GOARCH=386
-    - os: linux
-      go: 1.10.x
-      env: GOTAGS="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_userauth" GOOS=windows GOARCH=amd64
-    - os: linux
-      go: 1.10.x
-      env: GOTAGS=sqlite_trace GOOS=windows GOARCH=386
-    - os: linux
-      go: 1.10.x
-      env: GOTAGS=sqlite_trace GOOS=windows GOARCH=amd64
-    - os: linux
-      go: 1.10.x
-      env: GOTAGS=sqlite_vacuum_full GOOS=windows GOARCH=386
+      env: GOTAGS="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" GOOS=windows GOARCH=amd64
     - os: linux
       go: 1.10.x
       env: GOTAGS=sqlite_vacuum_full GOOS=windows GOARCH=amd64
-    - os: linux
-      go: 1.10.x
-      env: GOTAGS=sqlite_vacuum_incr GOOS=windows GOARCH=386
     - os: linux
       go: 1.10.x
       env: GOTAGS=sqlite_vacuum_incr GOOS=windows GOARCH=amd64
-    - os: linux
-      go: 1.10.x
-      env: GOTAGS=sqlite_vtable GOOS=windows GOARCH=386
     - os: linux
       go: 1.10.x
       env: GOTAGS=sqlite_vtable GOOS=windows GOARCH=amd64