Attachment #240362 for bug #269798

View | Details | Raw Unified | Return to bug 269798
Collapse All | Expand All

Lines 1-5 Link Here

(-)databases/sqlite3/Makefile (-3 / +3 lines)
1	PORTNAME= sqlite3	1	PORTNAME= sqlite3
2	DISTVERSION= 3.40.1	2	DISTVERSION= 3.41.0
3	PORTEPOCH= 1	3	PORTEPOCH= 1
4	CATEGORIES= databases	4	CATEGORIES= databases
5	MASTER_SITES= https://www.sqlite.org/${_YEAR}/ https://www2.sqlite.org/${_YEAR}/ https://www3.sqlite.org/${_YEAR}/	5	MASTER_SITES= https://www.sqlite.org/${_YEAR}/ https://www2.sqlite.org/${_YEAR}/ https://www3.sqlite.org/${_YEAR}/
Lines 74-80 Link Here
74	SORT_REF STATIC STMT TRUSTED_SCHEMA UNKNOWN_SQL UNLOCK_NOTIFY \	74	SORT_REF STATIC STMT TRUSTED_SCHEMA UNKNOWN_SQL UNLOCK_NOTIFY \
75	UPDATE_LIMIT URI URI_AUTHORITY	75	UPDATE_LIMIT URI URI_AUTHORITY
76	.endif	76	.endif
77	OPTIONS_DEFAULT= DBPAGE DBSTAT DQS EXTENSION FTS3_TOKEN FTS4 FTS5 LIBEDIT METADATA \	77	OPTIONS_DEFAULT= DBPAGE DBSTAT EXTENSION FTS3_TOKEN FTS4 FTS5 LIBEDIT METADATA \
78	RTREE SECURE_DELETE STRIP THREADS TS1 UNICODE61 UNLOCK_NOTIFY URI	78	RTREE SECURE_DELETE STRIP THREADS TS1 UNICODE61 UNLOCK_NOTIFY URI
79	# SECURE_DELETE, UNLOCK_NOTIFY, DBSTAT (since 41.0) used by www/firefox et al.	79	# SECURE_DELETE, UNLOCK_NOTIFY, DBSTAT (since 41.0) used by www/firefox et al.
80	# RTREE used by graphics/mapnik, databases/spatialite	80	# RTREE used by graphics/mapnik, databases/spatialite
Lines 215-221 Link Here
215	.include <bsd.port.options.mk>	215	.include <bsd.port.options.mk>
216		216
217	# _YEAR= ${%Y:L:gmtime} - do not work with the version from the previous year	217	# _YEAR= ${%Y:L:gmtime} - do not work with the version from the previous year
218	_YEAR= 2022	218	_YEAR= 2023
219		219
220	# Platform Configuration	220	# Platform Configuration
221	# -DHAVE_POSIX_FALLOCATE=1 not yet, chunksize.test ZFS failure chunksize-1.2 expected: [32768] got: [2048]	221	# -DHAVE_POSIX_FALLOCATE=1 not yet, chunksize.test ZFS failure chunksize-1.2 expected: [32768] got: [2048]

Lines 1-3 Link Here

(-)databases/sqlite3/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1672831817	1	TIMESTAMP = 1677135234
2	SHA256 (sqlite-src-3400100.zip) = 5064126aa50db20c35578b612b56c3129425c0506ed4d1610efa4a0f01bdf8d0	2	SHA256 (sqlite-src-3410000.zip) = 64a7638a35e86b991f0c15ae8e2830063b694b28068b8f7595358e3205a9eb66
3	SIZE (sqlite-src-3400100.zip) = 13725560	3	SIZE (sqlite-src-3410000.zip) = 13831104




--- test/e_uri.test.orig	2022-11-27 09:06:46 UTC
+++ test/e_uri.test
@@ -139,8 +139,8 @@ if {$tcl_platform(platform) == "unix"} {
   foreach {tn uri error} "
     1  {file://localhost[test_pwd /]test.db}   {not an error}
     2  {file://[test_pwd /]test.db}            {not an error}
-    3  {file://x[test_pwd /]test.db}           {invalid uri authority: x}
-    4  {file://invalid[test_pwd /]test.db}     {invalid uri authority: invalid}
+    3  {file://x[test_pwd /]test.db}           {unable to open database file}
+    4  {file://invalid[test_pwd /]test.db}     {unable to open database file}
   " {
     do_test 2.$tn {
       set DB [sqlite3_open_v2 $uri $flags ""]

Lines 1-11 Link Here

(-)databases/sqlite3/files/patch-test_fts3expr4.test (-11 lines)
1	--- test/fts3expr4.test.orig 2022-11-27 11:47:17 UTC
2	+++ test/fts3expr4.test
3	@@ -50,7 +50,7 @@ do_icu_expr_test 1.7 {a:word} {PHRASE 0 0 word}
4	# is passed to the tokenizer.
5	#
6	do_icu_expr_test 1.7 {a:word} {PHRASE 0 0 word}
7	-do_icu_expr_test 1.8 {d:word} {PHRASE 3 0 d:word}
8	+do_icu_expr_test 1.8 {d:word} {AND {AND {PHRASE 3 0 d} {PHRASE 3 0 :}} {PHRASE 3 0 word}}
9
10	set sqlite_fts3_enable_parentheses 0
11




--- test/scanstatus.test.orig	2022-11-27 11:40:24 UTC
+++ test/scanstatus.test
@@ -312,8 +312,8 @@ do_scanstatus_test 5.1.2 { 
   SELECT count(*) FROM t1 WHERE a IN (SELECT b FROM t1 AS ii)
 } {2}
 do_scanstatus_test 5.1.2 { 
-  nLoop 1 nVisit 10 nEst 10.0 zName t1bc 
-  zExplain {SCAN ii USING COVERING INDEX t1bc}
+  nLoop 1 nVisit 10 nEst 10.0 zName t1
+  zExplain {SCAN ii}
   nLoop 1 nVisit 2 nEst 8.0 zName sqlite_autoindex_t1_1
   zExplain {SEARCH t1 USING COVERING INDEX sqlite_autoindex_t1_1 (a=?)}
 }
@@ -341,16 +341,16 @@ do_eqp_test 5.4.1 {
   SELECT count(*) FROM t1, t2 WHERE y = c;
 } {
   QUERY PLAN
-  |--SCAN t1 USING COVERING INDEX t1bc
+  |--SCAN t1
   `--SEARCH t2 USING COVERING INDEX t2xy (ANY(x) AND y=?)
 }
 do_execsql_test 5.4.2 {
   SELECT count(*) FROM t1, t2 WHERE y = c;
 } {200}
 do_scanstatus_test 5.4.3 { 
-  nLoop 1 nVisit 10 nEst 10.0 zName t1bc 
-  zExplain {SCAN t1 USING COVERING INDEX t1bc}
-  nLoop 10 nVisit 200 nEst 56.0 zName t2xy 
+  nLoop 1 nVisit 10 nEst 10.0 zName t1
+  zExplain {SCAN t1}
+  nLoop 10 nVisit 200 nEst 56.0 zName t2xy
   zExplain {SEARCH t2 USING COVERING INDEX t2xy (ANY(x) AND y=?)}
 }
 

Lines 1-11 Link Here

(-)databases/sqlite3/files/patch-test_stat.test (-11 lines)
1	--- test/stat.test.orig 2022-11-27 11:50:01 UTC
2	+++ test/stat.test
3	@@ -140,7 +140,7 @@ do_execsql_test stat-2.1agg {
4	SELECT * FROM dbstat WHERE aggregate=TRUE ORDER BY name;
5	} [list \
6	sqlite_autoindex_t3_1 {} 5 {} 32 3898 1065 132 {} 5120 \
7	- sqlite_schema {} 1 {} 2 84 824 49 {} 1024 \
8	+ sqlite_schema {} 1 {} 2 83 825 49 {} 1024 \
9	t3 {} 17 {} 47 11188 5815 370 {} 17408 \
10	]
11




--- test/uri.test.orig	2022-11-27 09:14:11 UTC
+++ test/uri.test
@@ -301,9 +301,9 @@ foreach {tn uri res} {
   1     "file://localhost/PWD/test.db"   {not an error}
   2     "file:///PWD/test.db"            {not an error}
   3     "file:/PWD/test.db"              {not an error}
-  4     "file://l%6Fcalhost/PWD/test.db" {invalid uri authority: l%6Fcalhost}
-  5     "file://lbcalhost/PWD/test.db"   {invalid uri authority: lbcalhost}
-  6     "file://x/PWD/test.db"           {invalid uri authority: x}
+  4     "file://l%6Fcalhost/PWD/test.db" {unable to open database file}
+  5     "file://lbcalhost/PWD/test.db"   {unable to open database file}
+  6     "file://x/PWD/test.db"           {unable to open database file}
 } {
 
   if {$tcl_platform(platform)=="windows"} {

Return to bug 269798

Lines 1-13 Link Here

(-)databases/sqlite3/files/patch-test_e__uri.test (-13 lines)
1	--- test/e_uri.test.orig 2022-11-27 09:06:46 UTC
2	+++ test/e_uri.test
3	@@ -139,8 +139,8 @@ if {$tcl_platform(platform) == "unix"} {
4	foreach {tn uri error} "
5	1 {file://localhost[test_pwd /]test.db} {not an error}
6	2 {file://[test_pwd /]test.db} {not an error}
7	- 3 {file://x[test_pwd /]test.db} {invalid uri authority: x}
8	- 4 {file://invalid[test_pwd /]test.db} {invalid uri authority: invalid}
9	+ 3 {file://x[test_pwd /]test.db} {unable to open database file}
10	+ 4 {file://invalid[test_pwd /]test.db} {unable to open database file}
11	" {
12	do_test 2.$tn {
13	set DB [sqlite3_open_v2 $uri $flags ""]

Lines 1-34 Link Here

(-)databases/sqlite3/files/patch-test_scanstatus.test (-34 lines)
1	--- test/scanstatus.test.orig 2022-11-27 11:40:24 UTC
2	+++ test/scanstatus.test
3	@@ -312,8 +312,8 @@ do_scanstatus_test 5.1.2 {
4	SELECT count(*) FROM t1 WHERE a IN (SELECT b FROM t1 AS ii)
5	} {2}
6	do_scanstatus_test 5.1.2 {
7	- nLoop 1 nVisit 10 nEst 10.0 zName t1bc
8	- zExplain {SCAN ii USING COVERING INDEX t1bc}
9	+ nLoop 1 nVisit 10 nEst 10.0 zName t1
10	+ zExplain {SCAN ii}
11	nLoop 1 nVisit 2 nEst 8.0 zName sqlite_autoindex_t1_1
12	zExplain {SEARCH t1 USING COVERING INDEX sqlite_autoindex_t1_1 (a=?)}
13	}
14	@@ -341,16 +341,16 @@ do_eqp_test 5.4.1 {
15	SELECT count(*) FROM t1, t2 WHERE y = c;
16	} {
17	QUERY PLAN
18	- \|--SCAN t1 USING COVERING INDEX t1bc
19	+ \|--SCAN t1
20	`--SEARCH t2 USING COVERING INDEX t2xy (ANY(x) AND y=?)
21	}
22	do_execsql_test 5.4.2 {
23	SELECT count(*) FROM t1, t2 WHERE y = c;
24	} {200}
25	do_scanstatus_test 5.4.3 {
26	- nLoop 1 nVisit 10 nEst 10.0 zName t1bc
27	- zExplain {SCAN t1 USING COVERING INDEX t1bc}
28	- nLoop 10 nVisit 200 nEst 56.0 zName t2xy
29	+ nLoop 1 nVisit 10 nEst 10.0 zName t1
30	+ zExplain {SCAN t1}
31	+ nLoop 10 nVisit 200 nEst 56.0 zName t2xy
32	zExplain {SEARCH t2 USING COVERING INDEX t2xy (ANY(x) AND y=?)}
33	}
34

Lines 1-15 Link Here

(-)databases/sqlite3/files/patch-test_uri.test (-15 lines)
1	--- test/uri.test.orig 2022-11-27 09:14:11 UTC
2	+++ test/uri.test
3	@@ -301,9 +301,9 @@ foreach {tn uri res} {
4	1 "file://localhost/PWD/test.db" {not an error}
5	2 "file:///PWD/test.db" {not an error}
6	3 "file:/PWD/test.db" {not an error}
7	- 4 "file://l%6Fcalhost/PWD/test.db" {invalid uri authority: l%6Fcalhost}
8	- 5 "file://lbcalhost/PWD/test.db" {invalid uri authority: lbcalhost}
9	- 6 "file://x/PWD/test.db" {invalid uri authority: x}
10	+ 4 "file://l%6Fcalhost/PWD/test.db" {unable to open database file}
11	+ 5 "file://lbcalhost/PWD/test.db" {unable to open database file}
12	+ 6 "file://x/PWD/test.db" {unable to open database file}
13	} {
14
15	if {$tcl_platform(platform)=="windows"} {