SHA256
1
0
forked from pool/sqlite3

Fix build with Tcl 8.6.9

OBS-URL: https://build.opensuse.org/package/show/server:database/sqlite3?expand=0&rev=221
This commit is contained in:
Reinhard Max 2019-01-17 17:17:18 +00:00 committed by Git OBS Bridge
parent 4ebb0b5414
commit 222abde85f
3 changed files with 65 additions and 2 deletions

55
sqlite3-btree02-100.patch Normal file
View File

@ -0,0 +1,55 @@
Index: test/btree02.test
==================================================================
--- test/btree02.test
+++ test/btree02.test
@@ -19,36 +19,44 @@
load_static_extension db eval
do_execsql_test btree02-100 {
CREATE TABLE t1(a TEXT, ax INTEGER, b INT, PRIMARY KEY(a,ax)) WITHOUT ROWID;
WITH RECURSIVE c(i) AS (VALUES(1) UNION ALL SELECT i+1 FROM c WHERE i<10)
- INSERT INTO t1(a,ax,b) SELECT printf('%02x',i), random(), i FROM c;
+ INSERT INTO t1(a,ax,b) SELECT printf('%02x',i+160), random(), i FROM c;
CREATE INDEX t1a ON t1(a);
CREATE TABLE t2(x,y);
CREATE TABLE t3(cnt);
WITH RECURSIVE c(i) AS (VALUES(1) UNION ALL SELECT i+1 FROM c WHERE i<4)
INSERT INTO t3(cnt) SELECT i FROM c;
SELECT count(*) FROM t1;
} {10}
+
+proc showt1 {} {
+ puts -nonewline "t1: "
+ puts [db eval {SELECT printf('(%s,%s)',quote(a),quote(b)) FROM t1}]
+}
+
do_test btree02-110 {
db eval BEGIN
set i 0
+ # showt1
db eval {SELECT a, ax, b, cnt FROM t1 CROSS JOIN t3 WHERE b IS NOT NULL} {
- if {$a==""} {set a 0}
- if {$b==""} {set b 0}
+ if {$a==""} continue
db eval {INSERT INTO t2(x,y) VALUES($b,$cnt)}
# puts "a,b,cnt = ($a,$b,$cnt)"
incr i
if {$i%2==1} {
set bx [expr {$b+1000}]
- # puts "INSERT ($a),$bx"
+ # puts "INSERT ($a),$bx"
db eval {INSERT INTO t1(a,ax,b) VALUES(printf('(%s)',$a),random(),$bx)}
+ # showt1
} else {
# puts "DELETE a=$a"
db eval {DELETE FROM t1 WHERE a=$a}
+ # showt1
}
db eval {COMMIT; BEGIN}
}
db one {COMMIT; SELECT count(*) FROM t1;}
-} {27}
+} {10}
finish_test

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Jan 17 16:58:54 UTC 2019 - Reinhard Max <max@suse.com>
- btree02.test depended on Tcl internals that changed in 8.6.9.
(fix-btree02-100.patch)
-------------------------------------------------------------------
Wed Dec 5 12:56:29 UTC 2018 - malte.kraus@suse.com

View File

@ -1,7 +1,7 @@
#
# spec file for package sqlite3
#
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@ -28,6 +28,7 @@ URL: http://www.sqlite.org/
Source0: http://www.sqlite.org/2018/sqlite-src-%{tarversion}.zip
Source1: baselibs.conf
Source2: http://www.sqlite.org/2018/sqlite-doc-%{tarversion}.zip
Patch0: sqlite3-btree02-100.patch
BuildRequires: automake
BuildRequires: libtool
BuildRequires: pkgconfig
@ -103,6 +104,7 @@ other documentation found on sqlite.org. The files can be found in
%prep
%setup -q -n sqlite-src-%{tarversion} -a2
%patch0
rm -v sqlite-doc-%{tarversion}/releaselog/current.html
ln -sv `echo %{version} | sed "s/\./_/g"`.html sqlite-doc-%{tarversion}/releaselog/current.html
find -type f -name sqlite.css~ -delete