Add the sqlite_version() SQL function as a built-in. (CVS 777)

FossilOrigin-Name: 7c8c0e7633dca00bde7bc7c22075f688c034c200

5 files changed, 37 insertions, 12 deletions

diff --git a/manifest b/manifest
index a41b294dc..3421d6d46 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Improvements\sin\sthreadtest.c\s(for\sUnix)\sand\ssome\sminor\sbug\sfixes\sthat\sresult\nfrom\sthe\sbetter\stesting.\s(CVS\s776)
-D 2002-11-01T01:55:37
+C Add\sthe\ssqlite_version()\sSQL\sfunction\sas\sa\sbuilt-in.\s(CVS\s777)
+D 2002-11-04T19:32:25
 F Makefile.in d6c9a85c2a5e696843201d090dcf8bf2f8716f2a
 F Makefile.linux-gcc b86a99c493a5bfb402d1d9178dcdc4bd4b32f906
 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
@@ -24,7 +24,7 @@ F src/build.c 1559232f6878fd7f2b1c79aede0f7a33ececab07
 F src/delete.c aad9d4051ab46e6f6391ea5f7b8994a7c05bdd15
 F src/encode.c 6c9c87d5b7b2c0101d011ebc283a80abf672a4d1
 F src/expr.c 9427b4d1d04ede1095994b8e042abe2e6fea7443
-F src/func.c e45cd908b9b723d9b91473d09e12c23f786b3fc2
+F src/func.c 90c583f0b91220f7cd411a2407deaf9327245d63
 F src/hash.c 6a6236b89c8c060c65dabd300a1c8ce7c10edb72
 F src/hash.h cd0433998bc1a3759d244e1637fe5a3c13b53bf8
 F src/insert.c 764300a0bd8074a2174946c0bf8a550bd833397a
@@ -43,7 +43,7 @@ F src/shell.tcl 27ecbd63dd88396ad16d81ab44f73e6c0ea9d20e
 F src/sqlite.h.in d3999a9c6374675779058d6cfe5431131618e92b
 F src/sqliteInt.h a001c52dfb10ec38f18d6b9ed7dd8b3f42ca8c72
 F src/table.c eed2098c9b577aa17f8abe89313a9c4413f57d63
-F src/tclsqlite.c fa646506f02509455c1e4a878d1303bd2d4c3ead
+F src/tclsqlite.c 9f2c00a92338c51171ded8943bd42d77f7e69e64
 F src/test1.c a46e9f61915b32787c5d5a05a4b92e4dacc437d9
 F src/test2.c 5fa694d130b3309e3f9c852f0a437750fcb5a006
 F src/test3.c 540fa7fc3cb3732517b779b5f90ad9cc4303d0ab
@@ -66,7 +66,7 @@ F test/delete.test 5821a95a66061ae09723a88938f23d10d8a881ad
 F test/expr.test dea1cd62684a8bf116426447c948f5e8fb2c84b6
 F test/fkey1.test 33c850201a6ec35f0b370daf4e57f44456f1b35d
 F test/format3.test cbb168d446152fcf1dd85be299ad2d6cd507da4e
-F test/func.test bed7ae7a3482df05db0f5eed2debdf25ac2d07fc
+F test/func.test 000515779001ac6899eec4b54e65c6e2501279d4
 F test/in.test 15428c85d141edda7543bfc3f9a32ce65193717b
 F test/index.test 2a5a1b654f50ca0768fb10ae44b72e6a776b1f18
 F test/insert.test a122afb86911e77c181d912348866a5b1a61eeab
@@ -149,7 +149,7 @@ F www/speed.tcl a20a792738475b68756ea7a19321600f23d1d803
 F www/sqlite.tcl ae3dcfb077e53833b59d4fcc94d8a12c50a44098
 F www/tclsqlite.tcl 1db15abeb446aad0caf0b95b8b9579720e4ea331
 F www/vdbe.tcl 2013852c27a02a091d39a766bc87cff329f21218
-P 4051dbdb0552620eaff2ccef02f64a2ff97a8dfb
-R c21e2859a962756f67fcca7d8aada8c6
+P 326e0983c34b584a3c4a2300399bff0a8281b9f8
+R 12c8410f7c6ea71ae42e48a4c6d31874
 U drh
-Z fd6af700160d9f9561f1698c6ec1c692
+Z f6c61d47bb938fe73872fd88f36201ed
diff --git a/manifest.uuid b/manifest.uuid
index f618cb814..4d607285c 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-326e0983c34b584a3c4a2300399bff0a8281b9f8
\ No newline at end of file
+7c8c0e7633dca00bde7bc7c22075f688c034c200
\ No newline at end of file
diff --git a/src/func.c b/src/func.c
index 3ca42ca4b..5892b1888 100644
--- a/src/func.c
+++ b/src/func.c
@@ -16,7 +16,7 @@
 ** sqliteRegisterBuildinFunctions() found at the bottom of the file.
 ** All other code has file scope.
 **
-** $Id: func.c,v 1.22 2002/07/07 16:52:47 drh Exp $
+** $Id: func.c,v 1.23 2002/11/04 19:32:25 drh Exp $
 */
 #include <ctype.h>
 #include <math.h>
@@ -247,6 +247,14 @@ static void nullifFunc(sqlite_func *context, int argc, const char **argv){
   }
 }
 
+/*
+** Implementation of the VERSION(*) function.  The result is the version
+** of the SQLite library that is running.
+*/
+static void versionFunc(sqlite_func *context, int argc, const char **argv){
+  sqlite_set_result_string(context, sqlite_version, -1);
+}
+
 #ifdef SQLITE_TEST
 /*
 ** This function generates a string of random characters.  Used for
@@ -481,6 +489,7 @@ void sqliteRegisterBuiltinFunctions(sqlite *db){
     { "like",       2, SQLITE_NUMERIC, likeFunc   },
     { "glob",       2, SQLITE_NUMERIC, globFunc   },
     { "nullif",     2, SQLITE_ARGS,    nullifFunc },
+    { "sqlite_version",0,SQLITE_TEXT,  versionFunc},
 #ifdef SQLITE_TEST
     { "randstr",    2, SQLITE_TEXT,    randStr    },
 #endif
diff --git a/src/tclsqlite.c b/src/tclsqlite.c
index 9037bdac6..2326f7533 100644
--- a/src/tclsqlite.c
+++ b/src/tclsqlite.c
@@ -11,7 +11,7 @@
 *************************************************************************
 ** A TCL Interface to SQLite
 **
-** $Id: tclsqlite.c,v 1.42 2002/09/14 13:47:32 drh Exp $
+** $Id: tclsqlite.c,v 1.43 2002/11/04 19:32:26 drh Exp $
 */
 #ifndef NO_TCL     /* Omit this whole file if TCL is unavailable */
 
@@ -623,6 +623,10 @@ static int DbObjCmd(void *cd, Tcl_Interp *interp, int objc,Tcl_Obj *const*objv){
 **       Return the encoding used by LIKE and GLOB operators.  Choices
 **       are UTF-8 and iso8859.
 **
+**  sqlite -version
+**
+**       Return the version number of the SQLite library.
+**
 **  sqlite -tcl-uses-utf
 **
 **       Return "1" if compiled with a Tcl uses UTF-8.  Return "0" if
@@ -639,6 +643,10 @@ static int DbMain(void *cd, Tcl_Interp *interp, int argc, char **argv){
       Tcl_AppendResult(interp,sqlite_encoding,0);
       return TCL_OK;
     }
+    if( strcmp(argv[1],"-version")==0 ){
+      Tcl_AppendResult(interp,sqlite_version,0);
+      return TCL_OK;
+    }
     if( strcmp(argv[1],"-tcl-uses-utf")==0 ){
 #ifdef TCL_UTF_MAX
       Tcl_AppendResult(interp,"1",0);
diff --git a/test/func.test b/test/func.test
index 5f37fe66a..fcb82f9b9 100644
--- a/test/func.test
+++ b/test/func.test
@@ -11,7 +11,7 @@
 # This file implements regression tests for SQLite library.  The
 # focus of this file is testing built-in functions.
 #
-# $Id: func.test,v 1.15 2002/08/13 23:02:58 drh Exp $
+# $Id: func.test,v 1.16 2002/11/04 19:32:26 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -329,4 +329,12 @@ do_test func-10.5 {
   }
 } {1.234}
 
+# Test the built-in sqlite_version(*) SQL function.
+#
+do_test func-11.1 {
+  execsql {
+    SELECT sqlite_version(*);
+  }
+} [sqlite -version]
+
 finish_test