This commit is contained in:
parent
be728dc6eb
commit
a767358ab4
@ -1,8 +1,5 @@
|
|||||||
Index: sqlite/src/tclsqlite.c
|
--- src/tclsqlite.c 2008/03/25 16:16:29 1.212
|
||||||
RCS File: /sqlite/sqlite/src/tclsqlite.c,v
|
+++ src/tclsqlite.c 2008/04/04 12:21:09 1.213
|
||||||
rcsdiff -q -kk '-r1.212' '-r1.213' -u '/sqlite/sqlite/src/tclsqlite.c,v' 2>/dev/null
|
|
||||||
--- tclsqlite.c 2008/03/25 16:16:29 1.212
|
|
||||||
+++ tclsqlite.c 2008/04/04 12:21:09 1.213
|
|
||||||
@@ -1340,11 +1340,11 @@
|
@@ -1340,11 +1340,11 @@
|
||||||
Tcl_AppendResult(interp,"Error: non-null separator required for copy",0);
|
Tcl_AppendResult(interp,"Error: non-null separator required for copy",0);
|
||||||
return TCL_ERROR;
|
return TCL_ERROR;
|
||||||
|
@ -1,49 +1,19 @@
|
|||||||
Index: sqlite/test/tclsqlite.test
|
Index: sqlite/test/tclsqlite.test
|
||||||
RCS File: /sqlite/sqlite/test/tclsqlite.test,v
|
RCS File: /sqlite/sqlite/test/tclsqlite.test,v
|
||||||
rcsdiff -q -kk '-r1.63' '-r1.64' -u '/sqlite/sqlite/test/tclsqlite.test,v' 2>/dev/null
|
================================================================================
|
||||||
--- test/tclsqlite.test 2007/10/23 08:17:48 1.63
|
--- Makefile.in
|
||||||
+++ test/tclsqlite.test 2008/04/28 13:02:58 1.64
|
+++ Makefile.in
|
||||||
@@ -69,15 +69,15 @@
|
@@ -392,7 +392,7 @@
|
||||||
} msg]
|
|
||||||
lappend v $msg
|
libtclsqlite3.la: tclsqlite.lo libsqlite3.la
|
||||||
} {0 {}}
|
$(LTLINK) -o $@ tclsqlite.lo \
|
||||||
+catch {expr x*} msg
|
- $(LIBOBJ) @TCL_STUB_LIB_SPEC@ $(TLIBS) \
|
||||||
do_test tcl-1.6 {
|
+ libsqlite3.la @TCL_STUB_LIB_SPEC@ $(TLIBS) \
|
||||||
set v [catch {
|
-rpath "$(libdir)/sqlite" \
|
||||||
db eval {SELECT * FROM t1} data {
|
-version-info "8:6:8"
|
||||||
expr x*
|
|
||||||
}
|
--- src/test1.c
|
||||||
} msg]
|
+++ src/test1.c
|
||||||
- regsub {:.*$} $msg {} msg
|
|
||||||
lappend v $msg
|
|
||||||
-} {1 {syntax error in expression "x*"}}
|
|
||||||
+} [list 1 $msg]
|
|
||||||
do_test tcl-1.7 {
|
|
||||||
set v [catch {db} msg]
|
|
||||||
lappend v $msg
|
|
||||||
Index: sqlite/test/types3.test
|
|
||||||
RCS File: /sqlite/sqlite/test/types3.test,v
|
|
||||||
rcsdiff -q -kk '-r1.7' '-r1.8' -u '/sqlite/sqlite/test/types3.test,v' 2>/dev/null
|
|
||||||
--- test/types3.test 2007/06/26 22:42:56 1.7
|
|
||||||
+++ test/types3.test 2008/04/28 13:02:58 1.8
|
|
||||||
@@ -74,10 +74,11 @@
|
|
||||||
set V [db one {SELECT 123}]
|
|
||||||
tcl_variable_type V
|
|
||||||
} int
|
|
||||||
+set Vx [expr {1+wide(123456789123456)}]
|
|
||||||
do_test types3-2.3 {
|
|
||||||
set V [db one {SELECT 1234567890123456}]
|
|
||||||
tcl_variable_type V
|
|
||||||
-} wideInt
|
|
||||||
+} [tcl_variable_type Vx]
|
|
||||||
do_test types3-2.4.1 {
|
|
||||||
set V [db one {SELECT 1234567890123456.1}]
|
|
||||||
tcl_variable_type V
|
|
||||||
Index: sqlite/src/test1.c
|
|
||||||
RCS File: /sqlite/sqlite/src/test1.c,v
|
|
||||||
rcsdiff -q -kk '-r1.299' '-r1.300' -u '/sqlite/sqlite/src/test1.c,v' 2>/dev/null
|
|
||||||
--- src/test1.c 2008/04/16 12:58:54 1.299
|
|
||||||
+++ src/test1.c 2008/04/28 15:23:03 1.300
|
|
||||||
@@ -2621,8 +2621,20 @@
|
@@ -2621,8 +2621,20 @@
|
||||||
|
|
||||||
if( getStmtPointer(interp, Tcl_GetString(objv[1]), &pStmt) ) return TCL_ERROR;
|
if( getStmtPointer(interp, Tcl_GetString(objv[1]), &pStmt) ) return TCL_ERROR;
|
||||||
@ -66,3 +36,38 @@ rcsdiff -q -kk '-r1.299' '-r1.300' -u '/sqlite/sqlite/src/test1.c,v' 2>/dev/null
|
|||||||
rc = sqlite3_bind_double(pStmt, idx, value);
|
rc = sqlite3_bind_double(pStmt, idx, value);
|
||||||
if( sqlite3TestErrCode(interp, StmtToDb(pStmt), rc) ) return TCL_ERROR;
|
if( sqlite3TestErrCode(interp, StmtToDb(pStmt), rc) ) return TCL_ERROR;
|
||||||
if( rc!=SQLITE_OK ){
|
if( rc!=SQLITE_OK ){
|
||||||
|
--- test/tclsqlite.test
|
||||||
|
+++ test/tclsqlite.test
|
||||||
|
@@ -69,15 +69,15 @@
|
||||||
|
} msg]
|
||||||
|
lappend v $msg
|
||||||
|
} {0 {}}
|
||||||
|
+catch {expr x*} msg
|
||||||
|
do_test tcl-1.6 {
|
||||||
|
set v [catch {
|
||||||
|
db eval {SELECT * FROM t1} data {
|
||||||
|
expr x*
|
||||||
|
}
|
||||||
|
} msg]
|
||||||
|
- regsub {:.*$} $msg {} msg
|
||||||
|
lappend v $msg
|
||||||
|
-} {1 {syntax error in expression "x*"}}
|
||||||
|
+} [list 1 $msg]
|
||||||
|
do_test tcl-1.7 {
|
||||||
|
set v [catch {db} msg]
|
||||||
|
lappend v $msg
|
||||||
|
--- test/types3.test
|
||||||
|
+++ test/types3.test
|
||||||
|
@@ -74,10 +74,11 @@
|
||||||
|
set V [db one {SELECT 123}]
|
||||||
|
tcl_variable_type V
|
||||||
|
} int
|
||||||
|
+set Vx [expr {1+wide(123456789123456)}]
|
||||||
|
do_test types3-2.3 {
|
||||||
|
set V [db one {SELECT 1234567890123456}]
|
||||||
|
tcl_variable_type V
|
||||||
|
-} wideInt
|
||||||
|
+} [tcl_variable_type Vx]
|
||||||
|
do_test types3-2.4.1 {
|
||||||
|
set V [db one {SELECT 1234567890123456.1}]
|
||||||
|
tcl_variable_type V
|
||||||
|
@ -1,3 +1,9 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu May 8 15:03:21 CEST 2008 - max@suse.de
|
||||||
|
|
||||||
|
- Actually apply sqlite-strcasecmp.patch to fix the Tcl extension.
|
||||||
|
- Link the Tcl extension dynamically.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed May 7 21:38:43 CEST 2008 - coolo@suse.de
|
Wed May 7 21:38:43 CEST 2008 - coolo@suse.de
|
||||||
|
|
||||||
|
@ -21,7 +21,7 @@ Group: Productivity/Databases/Servers
|
|||||||
Summary: Embeddable SQL Database Engine
|
Summary: Embeddable SQL Database Engine
|
||||||
Url: http://www.sqlite.org/
|
Url: http://www.sqlite.org/
|
||||||
Version: 3.5.7
|
Version: 3.5.7
|
||||||
Release: 10
|
Release: 12
|
||||||
Requires: libsqlite3-0 = %version
|
Requires: libsqlite3-0 = %version
|
||||||
Provides: sqlite = %version
|
Provides: sqlite = %version
|
||||||
Obsoletes: sqlite < %version
|
Obsoletes: sqlite < %version
|
||||||
@ -132,6 +132,7 @@ Authors:
|
|||||||
%patch2
|
%patch2
|
||||||
%patch8
|
%patch8
|
||||||
%patch9
|
%patch9
|
||||||
|
%patch10
|
||||||
# does not work due to our ulimits in our build system
|
# does not work due to our ulimits in our build system
|
||||||
rm test/bigfile.test
|
rm test/bigfile.test
|
||||||
|
|
||||||
@ -200,6 +201,9 @@ autoreconf -f -i
|
|||||||
%_libdir/pkgconfig/sqlite3.pc
|
%_libdir/pkgconfig/sqlite3.pc
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu May 08 2008 max@suse.de
|
||||||
|
- Actually apply sqlite-strcasecmp.patch to fix the Tcl extension.
|
||||||
|
- Link the Tcl extension dynamically.
|
||||||
* Wed May 07 2008 coolo@suse.de
|
* Wed May 07 2008 coolo@suse.de
|
||||||
- provide sqlite-<arch>
|
- provide sqlite-<arch>
|
||||||
* Tue Apr 29 2008 cthiel@suse.de
|
* Tue Apr 29 2008 cthiel@suse.de
|
||||||
|
Loading…
Reference in New Issue
Block a user