Skip to content

Commit 9a69e40

Browse files
committed
Fix #235.
1 parent e9db0d8 commit 9a69e40

File tree

5 files changed

+27
-4
lines changed

5 files changed

+27
-4
lines changed

.github/workflows/repro.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@ jobs:
1212
build:
1313
strategy:
1414
matrix:
15-
# os: [macos-latest, ubuntu-latest, windows-latest]
16-
os: [ubuntu-latest, windows-latest]
15+
os: [macos-latest, ubuntu-latest, windows-latest]
1716
runs-on: ${{ matrix.os }}
1817

1918
steps:

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,12 +98,12 @@ Also, post there if you used this driver for something interesting
9898
([_"Show and tell"_](https://github.com/ncruces/go-sqlite3/discussions/categories/show-and-tell)),
9999
have an [idea](https://github.com/ncruces/go-sqlite3/discussions/categories/ideas)
100100

101-
The [Issue](https://github.com/ncruces/go-sqlite3/issues) tracker is for bugs we want fixed,
101+
The [Issue](https://github.com/ncruces/go-sqlite3/issues) tracker is for bugs,
102102
and features we're working on, planning to work on, or asking for help with.
103103

104104
### Alternatives
105105

106106
- [`modernc.org/sqlite`](https://pkg.go.dev/modernc.org/sqlite)
107107
- [`crawshaw.io/sqlite`](https://pkg.go.dev/crawshaw.io/sqlite)
108108
- [`github.com/mattn/go-sqlite3`](https://pkg.go.dev/github.com/mattn/go-sqlite3)
109-
- [`github.com/zombiezen/go-sqlite`](https://pkg.go.dev/github.com/zombiezen/go-sqlite)
109+
- [`github.com/zombiezen/go-sqlite`](https://pkg.go.dev/github.com/zombiezen/go-sqlite)

embed/bcw2/bcw2.wasm

80 Bytes
Binary file not shown.

embed/bcw2/build.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ cp "$ROOT"/sqlite3/*.patch build/
1717
curl -# https://sqlite.org/src/tarball/sqlite.tar.gz?r=c09656c6 | tar xz
1818

1919
cd sqlite
20+
cat ../repro.patch | patch -p0 --no-backup-if-mismatch
2021
if [[ "$OSTYPE" == "msys" || "$OSTYPE" == "cygwin" ]]; then
2122
MSYS_NO_PATHCONV=1 nmake /f makefile.msc sqlite3.c "OPTS=-DSQLITE_ENABLE_UPDATE_DELETE_LIMIT -DSQLITE_ENABLE_ORDERED_SET_AGGREGATES"
2223
else

embed/bcw2/repro.patch

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# https://sqlite.org/src/vpatch?from=67809715977a5bad&to=3f57584710d61174
2+
--- tool/mkpragmatab.tcl
3+
+++ tool/mkpragmatab.tcl
4+
@@ -526,14 +526,17 @@
5+
puts $fd [format {#define PragFlg_%-10s 0x%02x /* %s */} \
6+
$f $fv $flagMeaning($f)]
7+
set fv [expr {$fv*2}]
8+
}
9+
10+
-# Sort the column lists so that longer column lists occur first
11+
+# Sort the column lists so that longer column lists occur first.
12+
+# In the event of a tie, sort column lists lexicographically.
13+
#
14+
proc colscmp {a b} {
15+
- return [expr {[llength $b] - [llength $a]}]
16+
+ set rc [expr {[llength $b] - [llength $a]}]
17+
+ if {$rc} {return $rc}
18+
+ return [string compare $a $b]
19+
}
20+
set cols_list [lsort -command colscmp $cols_list]
21+
22+
# Generate the array of column names used by pragmas that act like
23+
# queries.

0 commit comments

Comments
 (0)