Add an implementation of the REGEXP operator and function. Only defined

if compiled with SQLITE_ENABLE_REGEXP.

FossilOrigin-Name: 8398f77c5a689c795c5b1e8eea41a3b128dba2fd

Makefile.in

@@ -933,9 +933,7 @@ clean:
 	rm -f lemon$(BEXE) lempar.c parse.* sqlite*.tar.gz
 	rm -f mkkeywordhash$(BEXE) keywordhash.h
 	rm -f $(PUBLISH)
-	rm -f A BAR file http testdb
 	rm -f *.da *.bb *.bbg gmon.out
-	rm -f *.bu *.csv *.db *.db2 *.db-shm *.db-wal *.tcl *.txt *.x
 	rm -rf quota2a quota2b quota2c
 	rm -rf tsrc .target_source
 	rm -f tclsqlite3$(TEXE)

Makefile.msc

@@ -1186,8 +1186,6 @@ sqlite3_analyzer.exe:	sqlite3_analyzer.c sqlite3res.lo
 clean:
 	del /Q *.lo *.ilk *.lib *.obj *.pdb sqlite3.exe libsqlite3.lib
 	del /Q *.da *.bb *.bbg gmon.out
-	del /Q *.bu *.csv *.db *.db2 *.db-shm *.db-wal *.tcl *.txt *.x
-	del /Q A BAR file http testdb
 	del /Q sqlite3.h opcodes.c opcodes.h
 	del /Q lemon.exe lempar.c parse.*
 	del /Q mkkeywordhash.exe keywordhash.h

Makefile.vxworks

@@ -654,9 +654,7 @@ clean:
 	rm -f *.o sqlite3$(EXE) libsqlite3.a sqlite3.h opcodes.*
 	rm -f lemon lempar.c parse.* sqlite*.tar.gz mkkeywordhash keywordhash.h
 	rm -f $(PUBLISH)
-	rm -f A BAR file http testdb
 	rm -f *.da *.bb *.bbg gmon.out
-	rm -f *.bu *.csv *.db *.db2 *.db-shm *.db-wal *.tcl *.txt *.x
 	rm -rf quota2a quota2b quota2c
 	rm -rf tsrc target_source
 	rm -f testloadext.dll libtestloadext.so

VERSION

@@ -1 +1 @@
-3.7.14
+3.7.15

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.62 for sqlite 3.7.14.
+# Generated by GNU Autoconf 2.62 for sqlite 3.7.15.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 # 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
@@ -743,8 +743,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='sqlite'
 PACKAGE_TARNAME='sqlite'
-PACKAGE_VERSION='3.7.14'
-PACKAGE_STRING='sqlite 3.7.14'
+PACKAGE_VERSION='3.7.15'
+PACKAGE_STRING='sqlite 3.7.15'
 PACKAGE_BUGREPORT=''
 
 # Factoring default headers for most tests.
@@ -1485,7 +1485,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures sqlite 3.7.14 to adapt to many kinds of systems.
+\`configure' configures sqlite 3.7.15 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1550,7 +1550,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of sqlite 3.7.14:";;
+     short | recursive ) echo "Configuration of sqlite 3.7.15:";;
    esac
   cat <<\_ACEOF
 
@@ -1666,7 +1666,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-sqlite configure 3.7.14
+sqlite configure 3.7.15
 generated by GNU Autoconf 2.62
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1680,7 +1680,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by sqlite $as_me 3.7.14, which was
+It was created by sqlite $as_me 3.7.15, which was
 generated by GNU Autoconf 2.62.  Invocation command line was
 
   $ $0 $@
@@ -14034,7 +14034,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by sqlite $as_me 3.7.14, which was
+This file was extended by sqlite $as_me 3.7.15, which was
 generated by GNU Autoconf 2.62.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -14087,7 +14087,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
-sqlite config.status 3.7.14
+sqlite config.status 3.7.15
 configured by $0, generated by GNU Autoconf 2.62,
   with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 

main.mk

@@ -606,9 +606,7 @@ clean:
 	rm -f lemon lemon.exe lempar.c parse.* sqlite*.tar.gz
 	rm -f mkkeywordhash mkkeywordhash.exe keywordhash.h
 	rm -f $(PUBLISH)
-	rm -f A BAR file http testdb
 	rm -f *.da *.bb *.bbg gmon.out
-	rm -f *.bu *.csv *.db *.db2 *.db-shm *.db-wal *.tcl *.txt *.x
 	rm -rf quota2a quota2b quota2c
 	rm -rf tsrc target_source
 	rm -f testloadext.dll libtestloadext.so

manifest

@@ -1,12 +1,12 @@
-C More\stest\scleanup.
-D 2012-09-10T07:56:40.252
+C Add\san\simplementation\sof\sthe\sREGEXP\soperator\sand\sfunction.\s\sOnly\sdefined\nif\scompiled\swith\sSQLITE_ENABLE_REGEXP.
+D 2012-09-12T18:45:31.050
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
-F Makefile.in b67da1d811b508b85f0822291e20ca4190d0c1b0
+F Makefile.in abd5c10d21d1395f140d9e50ea999df8fa4d6376
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
-F Makefile.msc 4929f86ceb76f8093e9af3a9dfd4d372b6471b25
-F Makefile.vxworks 0f4fc75a6787e4130e597ec141af76077876ebef
+F Makefile.msc 2d696f01c228995e98b3b953a08b7bba1d48c130
+F Makefile.vxworks 879f034a64062a364b21000266bbd5bc6e0c19b9
 F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
-F VERSION a71848df48082f1d6585d4b0819d530fc455485d
+F VERSION edab4af5a4623f8198833ea481ce98ab53750a8d
 F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
 F addopcodes.awk 17dc593f791f874d2c23a0f9360850ded0286531
 F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
@@ -15,7 +15,7 @@ F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2
 F config.guess 226d9a188c6196f3033ffc651cbc9dcee1a42977
 F config.h.in 0921066a13130082764ab4ab6456f7b5bebe56de
 F config.sub 9ebe4c3b3dab6431ece34f16828b594fb420da55
-F configure e2d0e3b67d2b1b1049d389fd671275d79bb80457 x
+F configure 4907207e1627a394e8892cce8dcc8068fbe5f7cd x
 F configure.ac 6e909664785b8184db2179013cd9d574f96ca3a3
 F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad
 F doc/lemon.html 334dbf6621b8fb8790297ec1abf3cfa4621709d1
@@ -103,15 +103,13 @@ F ext/rtree/tkt3363.test 142ab96eded44a3615ec79fba98c7bde7d0f96de
 F ext/rtree/viewrtree.tcl eea6224b3553599ae665b239bd827e182b466024
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
-F main.mk db1d6b13684677899b99cbca957ff23456e9e28e
+F main.mk 72026405046ed5b1f0368943b89c0aa29ad558b6
 F mkdll.sh 7d09b23c05d56532e9d44a50868eb4b12ff4f74a
 F mkextu.sh 416f9b7089d80e5590a29692c9d9280a10dbad9f
 F mkextw.sh 4123480947681d9b434a5e7b1ee08135abe409ac
 F mkopcodec.awk f6fccee29e68493bfd90a2e0466ede5fa94dd2fc
 F mkopcodeh.awk 29b84656502eee5f444c3147f331ee686956ab0e
 F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
-F publish.sh 313c5b2425f2cf5e547db7549a9796acc4508f22
-F publish_osx.sh 2ad2ee7d50632dff99949edc9c162dbb052f7534
 F spec.template 86a4a43b99ebb3e75e6b9a735d5fd293a24e90ca
 F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b
 F sqlite3.1 6be1ad09113570e1fc8dcaff84c9b0b337db5ffc
@@ -129,13 +127,13 @@ F src/btreeInt.h 4e5c2bd0f9b36b2a815a6d84f771a61a65830621
 F src/build.c a3b700afd475e6387da59be6f2e86161e80d6d87
 F src/callback.c 0cb4228cdcd827dcc5def98fb099edcc9142dbcd
 F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
-F src/ctime.c 500d019da966631ad957c37705642be87524463b
+F src/ctime.c a67101c1a1175167b5f40d4a626bf2eae7a1a2c4
 F src/date.c 067a81c9942c497aafd2c260e13add8a7d0c7dd4
 F src/delete.c 335f36750dc6ac88d580aa36a6487459be9889de
 F src/expr.c 217840a107dcc1e5dbb57cea311daad04bedbb9a
 F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
 F src/fkey.c 9c77d842dc9961d92a06a65abb80c64ef1750296
-F src/func.c 18dfedfb857e100b05755a1b12e88b389f957879
+F src/func.c 2290b491113e37df29c721c4b69a8aaf641b7664
 F src/global.c 4cfdca5cb0edd33c4d021baec4ede958cb2c793b
 F src/hash.c a4031441741932da9e7a65bee2b36b5d0e81c073
 F src/hash.h 2894c932d84d9f892d4b4023a75e501f83050970
@@ -145,7 +143,7 @@ F src/journal.c 552839e54d1bf76fb8f7abe51868b66acacf6a0e
 F src/legacy.c a199d7683d60cef73089e892409113e69c23a99f
 F src/lempar.c 0ee69fca0be54cd93939df98d2aca4ca46f44416
 F src/loadext.c f20382fbaeec832438a1ba7797bee3d3c8a6d51d
-F src/main.c 02255cf1da50956c5427c469abddb15bccc4ba09
+F src/main.c 259472ec0c694fe6a4fb6e8781be7fd8feacb09c
 F src/malloc.c fe085aa851b666b7c375c1ff957643dc20a04bf6
 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
 F src/mem1.c 437c7c4af964895d4650f29881df63535caaa1fa
@@ -178,14 +176,14 @@ F src/resolve.c 9e28280ec98035f31900fdd1db01f86f68ca6c32
 F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0
 F src/select.c f843c872a97baa1594c2cc3d4c003409a7bd03af
 F src/shell.c 87953c5d9c73d9494db97d1607e2e2280418f261
-F src/sqlite.h.in 39ddd714b62c651bfb5646440c594ca7ff6c7453
+F src/sqlite.h.in 193c0496be6046604d1b8aa518012d3cf411f57f
 F src/sqlite3.rc fea433eb0a59f4c9393c8e6d76a6e2596b1fe0c0
 F src/sqlite3ext.h 6904f4aadf976f95241311fbffb00823075d9477
 F src/sqliteInt.h 053e03a532beb909ead2df0721db67cdb4c48ae8
 F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
 F src/status.c 35939e7e03abf1b7577ce311f48f682c40de3208
 F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
-F src/tclsqlite.c 192dd01625381fb0614bc35f686de5b9d5fbe2bf
+F src/tclsqlite.c e4de2458b3ef38fdd0498bc4e5ea5367a241b0f3
 F src/test1.c 3d70f7c5987f186884cfebbfa7151a7d3d67d86e
 F src/test2.c 4178056dd1e7d70f954ad8a1e3edb71a2a784daf
 F src/test3.c 3c3c2407fa6ec7a19e24ae23f7cb439d0275a60d
@@ -210,7 +208,7 @@ F src/test_intarray.c d879bbf8e4ce085ab966d1f3c896a7c8b4f5fc99
 F src/test_intarray.h 489edb9068bb926583445cb02589344961054207
 F src/test_journal.c f5c0a05b7b3d5930db769b5ee6c3766dc2221a64
 F src/test_loadext.c df586c27176e3c2cb2e099c78da67bf14379a56e
-F src/test_malloc.c 3f5903a1528fd32fe4c472a3bd0259128d8faaef
+F src/test_malloc.c 7c8e2511d9d9661c2fcf91960ce0fb801bae8d0a
 F src/test_multiplex.c ac0fbc1748e5b86a41a1d7a84654fae0d53a881d
 F src/test_multiplex.h e99c571bc4968b7a9363b661481f3934bfead61d
 F src/test_mutex.c a6bd7b9cf6e19d989e31392b06ac8d189f0d573e
@@ -381,7 +379,7 @@ F test/e_createtable.test 48598b15e8fe6554d301e7b65a10c9851f177e84
 F test/e_delete.test 89aa84d3d1bd284a0689ede04bce10226a5aeaa5
 F test/e_droptrigger.test afd5c4d27dec607f5997a66bf7e2498a082cb235
 F test/e_dropview.test 583411e470458c5d76148542cfb5a5fa84c8f93e
-F test/e_expr.test 5489424d3d9a452ac3701cdf4b680ae31a157894
+F test/e_expr.test 5bc5c9a9eca98ae9a2be449869be7dea5105ed9b
 F test/e_fkey.test 057eed81a41a2b21b1790032f4e8aaba0b2b0e17
 F test/e_fts3.test 5c02288842e4f941896fd44afdef564dd5fc1459
 F test/e_insert.test c6ac239a97cb16dfbd0c16496f8cd871b4068c0c
@@ -566,7 +564,7 @@ F test/jrnlmode3.test 556b447a05be0e0963f4311e95ab1632b11c9eaa
 F test/keyword1.test a2400977a2e4fde43bf33754c2929fda34dbca05
 F test/lastinsert.test 474d519c68cb79d07ecae56a763aa7f322c72f51
 F test/laststmtchanges.test ae613f53819206b3222771828d024154d51db200
-F test/like.test 7b4aaa4a8192fdec90e0a905984c92a688c51e48
+F test/like.test 25bca9aab5ea225d98516deefcfe63f7980753bc
 F test/like2.test 3b2ee13149ba4a8a60b59756f4e5d345573852da
 F test/limit.test 2db7b3b34fb925b8e847d583d2eb67531d0ce67e
 F test/loadext.test 2b5e249c51c986a5aff1f0950cf7ba30976c8f22
@@ -734,7 +732,7 @@ F test/syscall.test bea9bf329bff733c791310244617c2a76974e64a
 F test/sysfault.test c79441d88d23696fbec7b147dba98d42a04f523f
 F test/table.test a59d985ca366e39b17b175f387f9d5db5a18d4e2
 F test/tableapi.test 2674633fa95d80da917571ebdd759a14d9819126
-F test/tclsqlite.test 1597d353308531527583481d14d9da52ea8ed0af
+F test/tclsqlite.test a3d2df21ee98957f5de4f9dc1db0eab68047ab5d
 F test/tempdb.test 19d0f66e2e3eeffd68661a11c83ba5e6ace9128c
 F test/temptable.test 51edd31c65ed1560dd600b1796e8325df96318e2
 F test/temptrigger.test 26670ed7a39cf2296a7f0a9e0a1d7bdb7abe936d
@@ -1014,10 +1012,10 @@ F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/win/sqlite.vsix 67d8a99aceb56384a81b3f30d6c71743146d2cc9
-P f260d7d567a1239c483c437d0b18a95bd0c96724
-R fcdf0eae4bfdcb06fae02ebef2eaea5c
-T *branch * testClean
-T *sym-testClean *
+P 9402f81fade5fcae0a3a6efdc7a5cdf71fc2e79f
+R b672680dc581b045b45a052a3b299996
+T *branch * regexp
+T *sym-regexp *
 T -sym-trunk *
-U mistachkin
-Z 27d85d2d177181498586eb7b98a0820b
+U drh
+Z 41a8b832e7bd7f20e716b240445415a6

manifest.uuid

@@ -1 +1 @@
-b8d5359bb7be9cf725049ee0ae783521bf11b2c9
+8398f77c5a689c795c5b1e8eea41a3b128dba2fd

publish.sh

@@ -1,138 +0,0 @@
-#!/bin/sh
-#
-# This script is used to compile SQLite and package everything up
-# so that it is ready to move to the SQLite website.
-#
-
-# Set srcdir to the name of the directory that contains the publish.sh
-# script.
-#
-srcdir=`echo "$0" | sed 's%\(^.*\)/[^/][^/]*$%\1%'`
-
-# Get the makefile.
-#
-cp $srcdir/Makefile.linux-gcc ./Makefile
-chmod +x $srcdir/install-sh
-
-# Get the current version number - needed to help build filenames
-#
-VERS=`cat $srcdir/VERSION`
-VERSW=`sed 's/\./_/g' $srcdir/VERSION`
-echo "VERSIONS: $VERS $VERSW"
-
-# Start by building an sqlite shell for linux.
-#
-make clean
-make sqlite3.c
-CFLAGS="-Os -DSQLITE_ENABLE_FTS3=0 -DSQLITE_ENABLE_RTREE=0"
-CFLAGS="$CFLAGS -DSQLITE_THREADSAFE=0"
-echo '***** '"COMPILING sqlite3-$VERS.bin..."
-gcc $CFLAGS -Itsrc sqlite3.c tsrc/shell.c -o sqlite3 -ldl
-strip sqlite3
-mv sqlite3 sqlite3-$VERS.bin
-gzip sqlite3-$VERS.bin
-chmod 644 sqlite3-$VERS.bin.gz
-mv sqlite3-$VERS.bin.gz doc
-
-# Build the sqlite.so and tclsqlite.so shared libraries
-# under Linux
-#
-TCLDIR=/home/drh/tcltk/846/linux/846linux
-TCLSTUBLIB=$TCLDIR/libtclstub8.4g.a
-CFLAGS="-Os -DSQLITE_ENABLE_FTS3=3 -DSQLITE_ENABLE_RTREE=1"
-CFLAGS="$CFLAGS -DHAVE_LOCALTIME_R=1 -DHAVE_GMTIME_R=1"
-CFLAGS="$CFLAGS -DSQLITE_ENABLE_COLUMN_METADATA=1"
-echo '***** BUILDING shared libraries for linux'
-gcc $CFLAGS -shared tclsqlite3.c $TCLSTUBLIB -o tclsqlite3.so -lpthread
-strip tclsqlite3.so
-chmod 644 tclsqlite3.so
-mv tclsqlite3.so tclsqlite-$VERS.so
-gzip tclsqlite-$VERS.so
-mv tclsqlite-$VERS.so.gz doc
-gcc $CFLAGS -shared sqlite3.c -o sqlite3.so -lpthread
-strip sqlite3.so
-chmod 644 sqlite3.so
-mv sqlite3.so sqlite-$VERS.so
-gzip sqlite-$VERS.so
-mv sqlite-$VERS.so.gz doc
-
-
-# Build the tclsqlite3.dll and sqlite3.dll shared libraries.
-#
-. $srcdir/mkdll.sh
-echo '***** PACKAGING shared libraries for windows'
-echo zip doc/tclsqlite-$VERSW.zip tclsqlite3.dll
-zip doc/tclsqlite-$VERSW.zip tclsqlite3.dll
-echo zip doc/sqlitedll-$VERSW.zip sqlite3.dll sqlite3.def
-zip doc/sqlitedll-$VERSW.zip sqlite3.dll sqlite3.def
-
-# Build the sqlite.exe executable for windows.
-#
-OPTS='-DSTATIC_BUILD=1 -DNDEBUG=1 -DSQLITE_THREADSAFE=0'
-OPTS="$OPTS -DSQLITE_ENABLE_FTS3=1 -DSQLITE_ENABLE_RTREE=1"
-i386-mingw32msvc-gcc -Os $OPTS -Itsrc -I$TCLDIR sqlite3.c tsrc/shell.c \
-      -o sqlite3.exe
-zip doc/sqlite-$VERSW.zip sqlite3.exe
-
-# Build a source archive useful for windows.
-#
-make target_source
-cd tsrc
-echo '***** BUILDING preprocessed source archives'
-rm fts[12]* icu*
-rm -f ../doc/sqlite-source-$VERSW.zip
-zip ../doc/sqlite-source-$VERSW.zip *
-cd ..
-cp tsrc/sqlite3.h tsrc/sqlite3ext.h .
-cp tsrc/shell.c .
-pwd
-zip doc/sqlite-amalgamation-$VERSW.zip sqlite3.c sqlite3.h sqlite3ext.h shell.c sqlite3.def
-
-# Construct a tarball of the source tree
-#
-echo '***** BUILDING source archive'
-ORIGIN=`pwd`
-cd $srcdir
-chmod +x configure
-cd ..
-mv sqlite sqlite-$VERS
-EXCLUDE=`find sqlite-$VERS -print | egrep '(www/|art/|doc/|contrib/|_FOSSIL_)' | sed 's,^, --exclude ,'`
-echo "tar czf $ORIGIN/doc/sqlite-$VERS.tar.gz $EXCLUDE sqlite-$VERS"
-tar czf $ORIGIN/doc/sqlite-$VERS.tar.gz $EXCLUDE sqlite-$VERS
-mv sqlite-$VERS sqlite
-cd $ORIGIN
-
-#
-# Build RPMS (binary) and Source RPM
-#
-
-# Make sure we are properly setup to build RPMs
-#
-echo "%HOME %{expand:%%(cd; pwd)}" > $HOME/.rpmmacros
-echo "%_topdir %{HOME}/rpm" >> $HOME/.rpmmacros
-mkdir $HOME/rpm
-mkdir $HOME/rpm/BUILD
-mkdir $HOME/rpm/SOURCES
-mkdir $HOME/rpm/RPMS
-mkdir $HOME/rpm/SRPMS
-mkdir $HOME/rpm/SPECS
-
-# create the spec file from the template
-sed s/SQLITE_VERSION/$VERS/g $srcdir/spec.template > $HOME/rpm/SPECS/sqlite.spec
-
-# copy the source tarball to the rpm directory
-cp doc/sqlite-$VERS.tar.gz $HOME/rpm/SOURCES/.
-
-# build all the rpms
-rpm -ba $HOME/rpm/SPECS/sqlite.spec >& rpm-$vers.log
-
-# copy the RPMs into the build directory.
-mv $HOME/rpm/RPMS/i386/sqlite*-$vers*.rpm doc
-mv $HOME/rpm/SRPMS/sqlite-$vers*.rpm doc
-
-# Build the website
-#
-#cp $srcdir/../historical/* doc
-#make doc
-#cd doc
-#chmod 644 *.gz

publish_osx.sh

@@ -1,35 +0,0 @@
-#!/bin/sh
-#
-# This script is used to compile SQLite and package everything up
-# so that it is ready to move to the SQLite website.
-#
-
-# Set srcdir to the name of the directory that contains the publish.sh
-# script.
-#
-srcdir=`echo "$0" | sed 's%\(^.*\)/[^/][^/]*$%\1%'`
-
-# Get the makefile.
-#
-cp $srcdir/Makefile.linux-gcc ./Makefile
-chmod +x $srcdir/install-sh
-
-# Get the current version number - needed to help build filenames
-#
-VERS=`cat $srcdir/VERSION`
-VERSW=`sed 's/\./_/g' $srcdir/VERSION`
-echo "VERSIONS: $VERS $VERSW"
-
-# Start by building an sqlite shell for linux.
-#
-make clean
-make sqlite3.c
-CFLAGS="-Os -DSQLITE_ENABLE_FTS3=1 -DSQLITE_THREADSAFE=0"
-NAME=sqlite3-$VERS-osx-x86.bin
-echo '***** '"COMPILING $NAME..."
-gcc $CFLAGS -Itsrc sqlite3.c tsrc/shell.c -o $NAME -ldl
-strip $NAME
-chmod 644 $NAME
-gzip $NAME
-mkdir -p doc
-mv $NAME.gz doc

src/ctime.c

@@ -114,6 +114,9 @@ static const char * const azCompileOpt[] = {
 #ifdef SQLITE_ENABLE_OVERSIZE_CELL_CHECK
   "ENABLE_OVERSIZE_CELL_CHECK",
 #endif
+#ifdef SQLITE_ENABLE_REGEXP
+  "ENABLE_REGEXP",
+#endif
 #ifdef SQLITE_ENABLE_RTREE
   "ENABLE_RTREE",
 #endif

src/func.c

@@ -367,33 +367,14 @@ static void lowerFunc(sqlite3_context *context, int argc, sqlite3_value **argv){
   }
 }
 
-
-#if 0  /* This function is never used. */
 /*
-** The COALESCE() and IFNULL() functions used to be implemented as shown
-** here.  But now they are implemented as VDBE code so that unused arguments
-** do not have to be computed.  This legacy implementation is retained as
-** comment.
+** The COALESCE() and IFNULL() functions are implemented as VDBE code so
+** that unused argument values do not have to be computed.  However, we
+** still need some kind of function implementation for this routines in
+** the function table.  That function implementation will never be called
+** so it doesn't matter what the implementation is.  We might as well use
+** the "version()" function as a substitute.
 */
-/*
-** Implementation of the IFNULL(), NVL(), and COALESCE() functions.  
-** All three do the same thing.  They return the first non-NULL
-** argument.
-*/
-static void ifnullFunc(
-  sqlite3_context *context,
-  int argc,
-  sqlite3_value **argv
-){
-  int i;
-  for(i=0; i<argc; i++){
-    if( SQLITE_NULL!=sqlite3_value_type(argv[i]) ){
-      sqlite3_result_value(context, argv[i]);
-      break;
-    }
-  }
-}
-#endif /* NOT USED */
 #define ifnullFunc versionFunc   /* Substitute function - never called */
 
 /*
@@ -732,6 +713,64 @@ static void likeFunc(
   }
 }
 
+#if defined(SQLITE_ENABLE_REGEXP)
+#include <sys/types.h>
+#include <regex.h>
+
+/*
+** Free a regex_t object obtained from sqlite_malloc().
+*/
+static void regexpFree(void *pToFree){
+  regex_t *pRe = (regex_t*)pToFree;
+  regfree(pRe);
+  sqlite3_free(pRe);
+}
+
+/*
+** Implementation of the regexp() SQL function.  This function implements
+** the build-in REGEXP operator.  The first argument to the function is the
+** pattern and the second argument is the string.  So, the SQL statements:
+**
+**       A REGEXP B
+**
+** is implemented as regexp(B,A).
+*/
+static void regexpFunc(
+  sqlite3_context *context, 
+  int argc, 
+  sqlite3_value **argv
+){
+  regex_t *pRe;
+  int rc;
+  char zErr[100];
+
+  pRe = sqlite3_get_auxdata(context, 0);
+  if( pRe==0 ){
+    pRe = sqlite3_malloc( sizeof(*pRe) );
+    if( pRe==0 ){
+      sqlite3_result_error_nomem(context);
+      return;
+    }
+    memset(pRe, 0, sizeof(*pRe));
+    rc = regcomp(pRe, (const char*)sqlite3_value_text(argv[0]),
+                 REG_NOSUB|REG_EXTENDED);
+    if( rc ){
+      regerror(rc, pRe, zErr, sizeof(zErr));
+      sqlite3_result_error(context, zErr, -1);
+      regfree(pRe);
+    }else{
+      sqlite3_set_auxdata(context, 0, pRe, regexpFree);
+    }
+  }
+  rc = regexec(pRe, (const char*)sqlite3_value_text(argv[1]), 0, 0, 0);
+  if( rc==0 ){
+    sqlite3_result_int(context, 1);
+  }else{
+    sqlite3_result_int(context, 0);
+  }
+}
+#endif /* defined(SQLITE_ENABLE_REGEXP) */
+
 /*
 ** Implementation of the NULLIF(x,y) function.  The result is the first
 ** argument if the arguments are different.  The result is NULL if the
@@ -1609,6 +1648,10 @@ void sqlite3RegisterGlobalFunctions(void){
     LIKEFUNC(like, 2, &likeInfoNorm, SQLITE_FUNC_LIKE),
     LIKEFUNC(like, 3, &likeInfoNorm, SQLITE_FUNC_LIKE),
   #endif
+
+#if defined(SQLITE_ENABLE_REGEXP)
+    FUNCTION(regexp,             2, 0, 0, regexpFunc       ),
+#endif
   };
 
   int i;

src/main.c

@@ -1767,6 +1767,15 @@ int sqlite3_extended_errcode(sqlite3 *db){
   return db->errCode;
 }
 
+/*
+** Return a string that describes the kind of error specified in the
+** argument.  For now, this simply calls the internal sqlite3ErrStr()
+** function.
+*/
+const char *sqlite3_errstr(int rc){
+  return sqlite3ErrStr(rc);
+}
+
 /*
 ** Create a new collating function for database "db".  The name is zName
 ** and the encoding is enc.

src/sqlite.h.in

@@ -2747,6 +2747,11 @@ sqlite3_int64 sqlite3_uri_int64(const char*, const char*, sqlite3_int64);
 ** However, the error string might be overwritten or deallocated by
 ** subsequent calls to other SQLite interface functions.)^
 **
+** ^The sqlite3_errstr() interface returns the English-language text
+** that describes the [result code], as UTF-8.
+** ^(Memory to hold the error message string is managed internally
+** and must not be freed by the application)^.
+**
 ** When the serialized [threading mode] is in use, it might be the
 ** case that a second error occurs on a separate thread in between
 ** the time of the first error and the call to these interfaces.
@@ -2765,6 +2770,7 @@ int sqlite3_errcode(sqlite3 *db);
 int sqlite3_extended_errcode(sqlite3 *db);
 const char *sqlite3_errmsg(sqlite3*);
 const void *sqlite3_errmsg16(sqlite3*);
+const char *sqlite3_errstr(int);
 
 /*
 ** CAPI3REF: SQL Statement Object

src/tclsqlite.c

@@ -41,12 +41,6 @@
 #endif
 #include <ctype.h>
 
-/*
-** This function is used to translate a return code into an error
-** message.
-*/
-const char *sqlite3ErrStr(int rc);
-
 /*
  * Windows needs to know which symbols to export.  Unix does not.
  * BUILD_sqlite should be undefined for Unix.
@@ -2564,7 +2558,7 @@ static int DbObjCmd(void *cd, Tcl_Interp *interp, int objc,Tcl_Obj *const*objv){
     pKey = Tcl_GetByteArrayFromObj(objv[2], &nKey);
     rc = sqlite3_rekey(pDb->db, pKey, nKey);
     if( rc ){
-      Tcl_AppendResult(interp, sqlite3ErrStr(rc), 0);
+      Tcl_AppendResult(interp, sqlite3_errstr(rc), 0);
       rc = TCL_ERROR;
     }
 #endif
@@ -3049,7 +3043,7 @@ static int DbMain(void *cd, Tcl_Interp *interp, int objc,Tcl_Obj *const*objv){
       p->db = 0;
     }
   }else{
-    zErrMsg = sqlite3_mprintf("%s", sqlite3ErrStr(rc));
+    zErrMsg = sqlite3_mprintf("%s", sqlite3_errstr(rc));
   }
 #ifdef SQLITE_HAS_CODEC
   if( p->db ){

src/test_malloc.c

@@ -1094,9 +1094,7 @@ static int test_db_config_lookaside(
 }
 
 /*
-** Usage:
-**
-**   sqlite3_config_heap NBYTE NMINALLOC
+** Usage:    sqlite3_config_heap NBYTE NMINALLOC
 */
 static int test_config_heap(
   void * clientData, 
@@ -1133,7 +1131,7 @@ static int test_config_heap(
 }
 
 /*
-** tclcmd:     sqlite3_config_error  [DB]
+** Usage:    sqlite3_config_error  [DB]
 **
 ** Invoke sqlite3_config() or sqlite3_db_config() with invalid
 ** opcodes and verify that they return errors.
@@ -1171,10 +1169,10 @@ static int test_config_error(
 }
 
 /*
-** tclcmd:     sqlite3_config_uri  BOOLEAN
+** Usage:    sqlite3_config_uri  BOOLEAN
 **
-** Invoke sqlite3_config() or sqlite3_db_config() with invalid
-** opcodes and verify that they return errors.
+** Enables or disables interpretation of URI parameters by default using
+** SQLITE_CONFIG_URI.
 */
 static int test_config_uri(
   void * clientData, 
@@ -1200,10 +1198,8 @@ static int test_config_uri(
 }
 
 /*
-** Usage:    
-**
-**   sqlite3_dump_memsys3  FILENAME
-**   sqlite3_dump_memsys5  FILENAME
+** Usage:    sqlite3_dump_memsys3  FILENAME
+**           sqlite3_dump_memsys5  FILENAME
 **
 ** Write a summary of unfreed memsys3 allocations to FILENAME.
 */

test/e_expr.test

@@ -1063,7 +1063,8 @@ do_execsql_test e_expr-17.3.3 { SELECT 'X' NOT GLOB 'Y' } 0
 do_test         e_expr-17.3.4 { set globargs } {Y X}
 sqlite3 db test.db
 
-# EVIDENCE-OF: R-41650-20872 No regexp() user function is defined by
+if 0 {
+# xxxxEVIDENCE-OF: R-41650-20872 No regexp() user function is defined by
 # default and so use of the REGEXP operator will normally result in an
 # error message.
 #
@@ -1077,6 +1078,7 @@ ifcapable !icu {
     SELECT 'abc' REGEXP 'def'
   } {1 {no such function: REGEXP}}
 }
+}
 
 # EVIDENCE-OF: R-33693-50180 The REGEXP operator is a special syntax for
 # the regexp() user function.

test/like.test

@@ -114,11 +114,15 @@ do_test like-1.10 {
 
 # Tests of the REGEXP operator
 #
-do_test like-2.1 {
+db eval {SELECT sqlite_compileoption_used('ENABLE_REGEXP') AS has_regexp} break;
+if {$has_regexp==0} {
   proc test_regexp {a b} {
     return [regexp $a $b]
   }
   db function regexp -argcount 2 test_regexp
+  puts "# installing substitute REGEXP function"
+}
+do_test like-2.1 {
   execsql {
     SELECT x FROM t1 WHERE x REGEXP 'abc' ORDER BY 1;
   }

test/tclsqlite.test

@@ -143,11 +143,11 @@ do_test tcl-1.21 {
   set v [catch {db total_changes xyz} msg]
   lappend v $msg
 } {1 {wrong # args: should be "db total_changes "}}
-do_test tcl-1.20 {
+do_test tcl-1.22 {
   set v [catch {db copy} msg]
   lappend v $msg
 } {1 {wrong # args: should be "db copy CONFLICT-ALGORITHM TABLE FILENAME ?SEPARATOR? ?NULLINDICATOR?"}}
-do_test tcl-1.21 {
+do_test tcl-1.23 {
   set v [catch {sqlite3 db2 test.db -vfs nosuchvfs} msg]
   lappend v $msg
 } {1 {no such vfs: nosuchvfs}}