From: drh <drh@noemail.net>
Date: Thu, 4 Jan 2018 19:20:37 +0000 (+0000)
Subject: Remove the snarky "_supported_" qualifier from the name of the
X-Git-Tag: version-3.22.0~111
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=35100fb194cfbaf75b31b504e7bf7d4480900c26;p=thirdparty%2Fsqlite.git

Remove the snarky "_supported_" qualifier from the name of the
sqlite_offset() SQL function.

FossilOrigin-Name: a6eee0fcd89d3958f8720ebdb5f0a8558b4795d747128091dae283eb81c4f74f
---

diff --git a/manifest b/manifest
index d48a41447d..3552e5e8ce 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sbroken\sdocumentation\shyperlink.\s\sNo\scode\schanges.
-D 2018-01-04T16:40:44.063
+C Remove\sthe\ssnarky\s"_supported_"\squalifier\sfrom\sthe\sname\sof\sthe\nsqlite_offset()\sSQL\sfunction.
+D 2018-01-04T19:20:37.203
 F Makefile.in 1b11037c5ed3399a79433cc82c59b5e36a7b3a3e4e195bb27640d0d2145e03e1
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc f68b4f9b83cfeb057b6265e0288ad653f319e2ceacca731e0f22e19617829a89
@@ -434,7 +434,7 @@ F src/delete.c 74667ad914ac143731a444a1bacf29ceb18f6eded8a0dd17aafae80baa07f8bb
 F src/expr.c ad6e7a9c34a4bab9d10cc857d647ae7ce370a633b5c0bfa71f1c29b81ae364b8
 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 F src/fkey.c d617daf66b5515e2b42c1405b2b4984c30ca50fb705ab164271a9bf66c69e331
-F src/func.c 697a3ee3b8c8481db497226e9e71935727d6a9fb3d3cc049e82a1c717a0a8342
+F src/func.c bd528d5ed68ce5cbf78a762e3b735fa75009f7197ff07fab07fd771f35ebaa1b
 F src/global.c ac3094f1dc59fbeb919aef7cc0cc827a8459d1fb1adb7972ef75bd9e0c10b75b
 F src/hash.c a12580e143f10301ed5166ea4964ae2853d3905a511d4e0c44497245c7ce1f7a
 F src/hash.h ab34c5c54a9e9de2e790b24349ba5aab3dbb4fd4
@@ -917,7 +917,7 @@ F test/func2.test 772d66227e4e6684b86053302e2d74a2500e1e0f
 F test/func3.test d202a7606d23f90988a664e88e268aed1087c11c
 F test/func4.test 6beacdfcb0e18c358e6c2dcacf1b65d1fa80955f
 F test/func5.test cdd224400bc3e48d891827cc913a57051a426fa4
-F test/func6.test 1a2bc511fedb779e2bd3154361385216c6d35080f36bfe896b8cdd1b1954294a
+F test/func6.test a4281c8fcd42b56f7a60f28e8e4d444e8b2256f9e82658b7ab87699f8318f564
 F test/fuzz-oss1.test e58330d01cbbd8215ee636b17a03fe220b37dbfa
 F test/fuzz.test 96083052bf5765e4518c1ba686ce2bab785670d1
 F test/fuzz2.test 76dc35b32b6d6f965259508508abce75a6c4d7e1
@@ -1688,7 +1688,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 4165fae920a1176c68bfaa1f2cfe17df7f8dd8793519d458b71e3e63670b5495
-R d66f50893f4ffe9e2cfb6738dd929b34
+P d91e3f3d343d281af374dd23eea333e61228539023ad5c5aea622085e5863bc7
+R 314fe8cfc8ec7f02f3acb6e4d50707fb
 U drh
-Z 6dbec8e8e1444dbd0ed402b28d5f012a
+Z 7ea7a34ef1d7c0cfd34c8e9e5f226383
diff --git a/manifest.uuid b/manifest.uuid
index 66b07243fd..561f8b3f92 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d91e3f3d343d281af374dd23eea333e61228539023ad5c5aea622085e5863bc7
\ No newline at end of file
+a6eee0fcd89d3958f8720ebdb5f0a8558b4795d747128091dae283eb81c4f74f
\ No newline at end of file
diff --git a/src/func.c b/src/func.c
index 4758b0191d..1076b97161 100644
--- a/src/func.c
+++ b/src/func.c
@@ -1800,8 +1800,7 @@ void sqlite3RegisterBuiltinFunctions(void){
     FUNCTION2(affinity,          1, 0, 0, noopFunc,  SQLITE_FUNC_AFFINITY),
 #endif
 #ifdef SQLITE_ENABLE_OFFSET_SQL_FUNC
-    FUNCTION2(sqlite_unsupported_offset,
-                                 1, 0, 0, noopFunc,  SQLITE_FUNC_OFFSET|
+    FUNCTION2(sqlite_offset,     1, 0, 0, noopFunc,  SQLITE_FUNC_OFFSET|
                                                      SQLITE_FUNC_TYPEOF),
 #endif
     FUNCTION(ltrim,              1, 1, 0, trimFunc         ),
diff --git a/test/func6.test b/test/func6.test
index 0d3de8ef49..02e1998cd0 100644
--- a/test/func6.test
+++ b/test/func6.test
@@ -9,7 +9,7 @@
 #
 #*************************************************************************
 #
-# Test cases for the sqlite_unsupported_offset() function.
+# Test cases for the sqlite_offset() function.
 #
 # Some of the tests in this file depend on the exact placement of content
 # within b-tree pages.  Such placement is at the implementations discretion,
@@ -34,51 +34,51 @@ do_execsql_test func6-100 {
   INSERT INTO t2(x,y) SELECT a, b FROM t1;
 }
 do_execsql_test func6-110 {
-  SELECT a, sqlite_unsupported_offset(d)/4096 + 1,
-            sqlite_unsupported_offset(d)%4096 FROM t1
+  SELECT a, sqlite_offset(d)/4096 + 1,
+            sqlite_offset(d)%4096 FROM t1
    ORDER BY rowid LIMIT 2;
 } {abc001 2 4084 abc002 2 4069}
 do_execsql_test func6-120 {
-  SELECT a, typeof(sqlite_unsupported_offset(+a)) FROM t1
+  SELECT a, typeof(sqlite_offset(+a)) FROM t1
    ORDER BY rowid LIMIT 2;
 } {abc001 null abc002 null}
 do_execsql_test func6-130 {
-  SELECT a, sqlite_unsupported_offset(a)/4096+1, 
-         sqlite_unsupported_offset(a)%4096
+  SELECT a, sqlite_offset(a)/4096+1, 
+         sqlite_offset(a)%4096
    FROM t1
    ORDER BY a LIMIT 2;
 } {abc001 3 4087 abc002 3 4076}
 do_execsql_test func6-140 {
-  SELECT a, sqlite_unsupported_offset(d)/4096+1, 
-         sqlite_unsupported_offset(d)%4096
+  SELECT a, sqlite_offset(d)/4096+1, 
+         sqlite_offset(d)%4096
    FROM t1
    ORDER BY a LIMIT 2;
 } {abc001 2 4084 abc002 2 4069}
 do_execsql_test func6-150 {
   SELECT a,
-         sqlite_unsupported_offset(a)/4096+1, 
-         sqlite_unsupported_offset(a)%4096,
-         sqlite_unsupported_offset(d)/4096+1, 
-         sqlite_unsupported_offset(d)%4096
+         sqlite_offset(a)/4096+1, 
+         sqlite_offset(a)%4096,
+         sqlite_offset(d)/4096+1, 
+         sqlite_offset(d)%4096
    FROM t1
    ORDER BY a LIMIT 2;
 } {abc001 3 4087 2 4084 abc002 3 4076 2 4069}
 do_execsql_test func6-160 {
   SELECT b,
-         sqlite_unsupported_offset(b)/4096+1, 
-         sqlite_unsupported_offset(b)%4096,
-         sqlite_unsupported_offset(c)/4096+1, 
-         sqlite_unsupported_offset(c)%4096,
-         sqlite_unsupported_offset(d)/4096+1, 
-         sqlite_unsupported_offset(d)%4096
+         sqlite_offset(b)/4096+1, 
+         sqlite_offset(b)%4096,
+         sqlite_offset(c)/4096+1, 
+         sqlite_offset(c)%4096,
+         sqlite_offset(d)/4096+1, 
+         sqlite_offset(d)%4096
    FROM t1
    ORDER BY b LIMIT 2;
 } {1 4 4090 4 4090 2 4084 2 4 4081 4 4081 2 4069}
 
 
 do_execsql_test func6-200 {
-  SELECT y, sqlite_unsupported_offset(y)/4096+1,
-         sqlite_unsupported_offset(y)%4096
+  SELECT y, sqlite_offset(y)/4096+1,
+         sqlite_offset(y)%4096
    FROM t2
    ORDER BY x LIMIT 2;
 } {1 5 4087 2 5 4076}