SQLite 3.44.0.

blob.go

@@ -118,8 +118,8 @@ func (b *Blob) WriteTo(w io.Writer) (n int64, err error) {
 		return 0, nil
 	}
 
+	want := int64(1024 * 1024)
 	avail := b.bytes - b.offset
-	want := int64(65536)
 	if want > avail {
 		want = avail
 	}
@@ -175,8 +175,11 @@ func (b *Blob) Write(p []byte) (n int, err error) {
 //
 // https://www.sqlite.org/c3ref/blob_write.html
 func (b *Blob) ReadFrom(r io.Reader) (n int64, err error) {
+	want := int64(1024 * 1024)
 	avail := b.bytes - b.offset
-	want := int64(65536)
+	if l, ok := r.(*io.LimitedReader); ok && want > l.N {
+		want = l.N
+	}
 	if want > avail {
 		want = avail
 	}

driver/driver.go

@@ -479,11 +479,7 @@ func (r *rows) Next(dest []driver.Value) error {
 		case sqlite3.TEXT:
 			dest[i] = stringOrTime(r.Stmt.ColumnRawText(i))
 		case sqlite3.NULL:
-			if buf, ok := dest[i].([]byte); ok {
-				dest[i] = buf[0:0]
-			} else {
-				dest[i] = nil
-			}
+			dest[i] = nil
 		default:
 			panic(util.AssertErr())
 		}

embed/README.md

@@ -1,6 +1,6 @@
 # Embeddable WASM build of SQLite
 
-This folder includes an embeddable WASM build of SQLite 3.43.2 for use with
+This folder includes an embeddable WASM build of SQLite 3.44.0 for use with
 [`github.com/ncruces/go-sqlite3`](https://pkg.go.dev/github.com/ncruces/go-sqlite3).
 
 The following optional features are compiled in:

sqlite3/download.sh

@@ -3,7 +3,7 @@ set -euo pipefail
 
 cd -P -- "$(dirname -- "$0")"
 
-curl -#OL "https://sqlite.org/2023/sqlite-amalgamation-3430200.zip"
+curl -#OL "https://sqlite.org/2023/sqlite-amalgamation-3440000.zip"
 unzip -d . sqlite-amalgamation-*.zip
 mv sqlite-amalgamation-*/sqlite3* .
 rm -rf sqlite-amalgamation-*
@@ -12,24 +12,24 @@ cat *.patch | patch --posix
 
 mkdir -p ext/
 cd ext/
-curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.43.2/ext/misc/decimal.c"
-curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.43.2/ext/misc/uint.c"
-curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.43.2/ext/misc/uuid.c"
-curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.43.2/ext/misc/base64.c"
-curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.43.2/ext/misc/regexp.c"
-curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.43.2/ext/misc/series.c"
-curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.43.2/ext/misc/anycollseq.c"
+curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.44.0/ext/misc/decimal.c"
+curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.44.0/ext/misc/uint.c"
+curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.44.0/ext/misc/uuid.c"
+curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.44.0/ext/misc/base64.c"
+curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.44.0/ext/misc/regexp.c"
+curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.44.0/ext/misc/series.c"
+curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.44.0/ext/misc/anycollseq.c"
 cd ~-
 
 cd ../vfs/tests/mptest/testdata/
-curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.43.2/mptest/mptest.c"
-curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.43.2/mptest/config01.test"
-curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.43.2/mptest/config02.test"
-curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.43.2/mptest/crash01.test"
-curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.43.2/mptest/crash02.subtest"
-curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.43.2/mptest/multiwrite01.test"
+curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.44.0/mptest/mptest.c"
+curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.44.0/mptest/config01.test"
+curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.44.0/mptest/config02.test"
+curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.44.0/mptest/crash01.test"
+curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.44.0/mptest/crash02.subtest"
+curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.44.0/mptest/multiwrite01.test"
 cd ~-
 
 cd ../vfs/tests/speedtest1/testdata/
-curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.43.2/test/speedtest1.c"
+curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.44.0/test/speedtest1.c"
 cd ~-

sqlite3/isoweek.patch

@@ -0,0 +1,34 @@
+# ISO week date specifiers.
+# https://sqlite.org/forum/forumpost/73d99e4497e8e6a7
+--- sqlite3.c.orig
++++ sqlite3.c
+@@ -1373,6 +1373,29 @@ static void strftimeFunc(
+         sqlite3_str_appendchar(&sRes, 1, c);
+         break;
+       }
++      case 'V':  /* Fall thru */
++      case 'G': {
++        DateTime y = x;
++        computeJD(&y);
++        y.validYMD = 0;
++        /* Adjust date to Thursday this week:
++           The number in parentheses is 0 for Monday, 3 for Thursday */
++        y.iJD += (3 - (((y.iJD+43200000)/86400000) % 7))*86400000;
++        computeYMD(&y);
++        if( cf=='G' ){
++          sqlite3_str_appendf(&sRes,"%04d",y.Y);
++        }else{
++          int nDay;             /* Number of days since 1st day of year */
++          i64 tJD = y.iJD;
++          y.validJD = 0;
++          y.M = 1;
++          y.D = 1;
++          computeJD(&y);
++          nDay = (int)((tJD-y.iJD+43200000)/86400000);
++          sqlite3_str_appendf(&sRes,"%02d",nDay/7+1);
++        }
++        break;
++      }
+       case 'Y': {
+         sqlite3_str_appendf(&sRes,"%04d",x.Y);
+         break;

sqlite3/time.c

@@ -27,8 +27,8 @@ static int time_collation(void *pArg, int nKey1, const void *pKey1, int nKey2,
   return rc;
 }
 
-static void jsontime_func(sqlite3_context *context, int argc,
-                          sqlite3_value **argv) {
+static void json_time_func(sqlite3_context *context, int argc,
+                           sqlite3_value **argv) {
   DateTime x;
   if (isDate(context, argc, argv, &x)) return;
   if (x.tzSet && x.tz) {
@@ -81,7 +81,8 @@ int sqlite3_time_init(sqlite3 *db, char **pzErrMsg,
   sqlite3_create_collation_v2(db, "time", SQLITE_UTF8, NULL, time_collation,
                               NULL);
   sqlite3_create_function_v2(
-      db, "jsontime", -1, SQLITE_UTF8 | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS,
-      NULL, jsontime_func, NULL, NULL, NULL);
+      db, "json_time", -1,
+      SQLITE_UTF8 | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS, NULL,
+      json_time_func, NULL, NULL, NULL);
   return SQLITE_OK;
 }

sqlite3/timezone.patch

@@ -0,0 +1,45 @@
+# Set UTC timezone, compute local offset.
+--- sqlite3.c.orig
++++ sqlite3.c
+@@ -340,6 +340,7 @@ static int setDateTimeToCurrent(sqlite3_context *context, DateTime *p){
+   p->iJD = sqlite3StmtCurrentTime(context);
+   if( p->iJD>0 ){
+     p->validJD = 1;
++    p->tzSet = 1;
+     return 0;
+   }else{
+     return 1;
+@@ -355,6 +356,7 @@ static int setDateTimeToCurrent(sqlite3_context *context, DateTime *p){
+ static void setRawDateNumber(DateTime *p, double r){
+   p->s = r;
+   p->rawS = 1;
++  p->tzSet = 1;
+   if( r>=0.0 && r<5373484.5 ){
+     p->iJD = (sqlite3_int64)(r*86400000.0 + 0.5);
+     p->validJD = 1;
+@@ -731,7 +733,16 @@ static int parseModifier(
+       ** show local time.
+       */
+       if( sqlite3_stricmp(z, "localtime")==0 && sqlite3NotPureFunc(pCtx) ){
+-        rc = toLocaltime(p, pCtx);
++        if( p->tzSet!=0 || p->tz==0 ) {
++          rc = toLocaltime(p, pCtx);
++          i64 iOrigJD = p->iJD;
++          p->tzSet = 0;
++          computeJD(p);
++          p->tz = (p->iJD-iOrigJD)/60000;
++          if( abs(p->tz)>= 900 ) p->tz = 0;
++        } else {
++          rc = 0;
++        }
+       }
+       break;
+     }
+@@ -781,6 +792,7 @@ static int parseModifier(
+           p->validJD = 1;
+           p->tzSet = 1;
+         }
++        p->tz = 0;
+         rc = SQLITE_OK;
+       }
+ #endif

tests/time_test.go

@@ -1,6 +1,7 @@
 package tests
 
 import (
+	"fmt"
 	"reflect"
 	"testing"
 	"time"
@@ -205,3 +206,57 @@ func TestDB_timeCollation(t *testing.T) {
 		t.Fatal(err)
 	}
 }
+
+func TestDB_isoWeek(t *testing.T) {
+	t.Parallel()
+
+	tests := []time.Time{
+		time.Date(1977, 1, 1, 0, 0, 0, 0, time.UTC),
+		time.Date(1977, 1, 2, 0, 0, 0, 0, time.UTC),
+		time.Date(1977, 12, 31, 0, 0, 0, 0, time.UTC),
+		time.Date(1978, 1, 1, 0, 0, 0, 0, time.UTC),
+		time.Date(1978, 1, 2, 0, 0, 0, 0, time.UTC),
+		time.Date(1978, 12, 31, 0, 0, 0, 0, time.UTC),
+		time.Date(1979, 1, 1, 0, 0, 0, 0, time.UTC),
+		time.Date(1979, 1, 2, 0, 0, 0, 0, time.UTC),
+		time.Date(1979, 12, 31, 0, 0, 0, 0, time.UTC),
+		time.Date(1980, 1, 1, 0, 0, 0, 0, time.UTC),
+		time.Date(1980, 12, 28, 0, 0, 0, 0, time.UTC),
+		time.Date(1980, 12, 29, 0, 0, 0, 0, time.UTC),
+		time.Date(1980, 12, 30, 0, 0, 0, 0, time.UTC),
+		time.Date(1980, 12, 31, 0, 0, 0, 0, time.UTC),
+		time.Date(1981, 1, 1, 0, 0, 0, 0, time.UTC),
+		time.Date(1981, 12, 31, 0, 0, 0, 0, time.UTC),
+		time.Date(1982, 1, 1, 0, 0, 0, 0, time.UTC),
+		time.Date(1982, 1, 2, 0, 0, 0, 0, time.UTC),
+		time.Date(1982, 1, 3, 0, 0, 0, 0, time.UTC),
+	}
+
+	db, err := sqlite3.Open(":memory:")
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer db.Close()
+
+	stmt, _, err := db.Prepare(`SELECT strftime('%G-W%V-%u', ?)`)
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer stmt.Close()
+
+	for _, tm := range tests {
+		stmt.BindTime(1, tm, sqlite3.TimeFormatDefault)
+		if stmt.Step() {
+			y, w := tm.ISOWeek()
+			d := tm.Weekday()
+			if d == 0 {
+				d = 7
+			}
+			want := fmt.Sprintf("%04d-W%02d-%d", y, w, d)
+			if got := stmt.ColumnText(0); got != want {
+				t.Errorf("got %q, want %q (%v)", got, want, tm)
+			}
+		}
+		stmt.Reset()
+	}
+}