From: drh <>
Date: Mon, 12 Dec 2022 21:22:23 +0000 (+0000)
Subject: Further fix for ticket [57c47526c34f01e8].  If a subquery has a result set
X-Git-Tag: version-3.41.0~258
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7ca4312ff2dc94bed3897275eeb822aa286f96bb;p=thirdparty%2Fsqlite.git

Further fix for ticket [57c47526c34f01e8].  If a subquery has a result set
column of the form "CAST(expr AS NUMERIC)" do not give that column NUMERIC
affinity.  NUMERIC affinity always goes to an integer if able, but a CAST
to numeric is a no-op if the input is a number.  So the two are not equivalent.

FossilOrigin-Name: f0325359d5795237b79f90f21b42d7d942c7e918137cb0231d404365d3041e81
---

7ca4312ff2dc94bed3897275eeb822aa286f96bb
diff --cc manifest
index 3e29f49192,80005c1855..71b7ff6eeb
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Revert\spart\sof\s[9386d6f63468]\sbecause\sthe\snew\sautomatic\sfunction\spointer\sbinding\scannot\sproperly\strack\sper-context\sfunction\smappings\swhen\sthe\scontext\sis\smore\scomplex\sthan\sa\ssingle\scontext-type\spointer.\se.g.\sit\sis\sfine\sfor\ssqlite3_trace_v2()\sbut\sit\sbreaks\sdown\swith\ssqlite3_create_collation()\sbecause\sthat\sone\sneeds\sto\suse\sthe\scollation\sname\sas\spart\sof\sthe\scontext\skey\sand\swe\scannot\ssensibly\sdo\sso\swith\sthe\scurrent\scode.
- D 2022-12-12T18:42:39.215
 -C If\sa\ssubquery\shas\sa\sresult\scolumn\sof\sthe\sform\s"CAST(...\sAS\sNUMERIC)"\sthen\ngive\sthat\scolumn\sno\saffinity\srather\sthan\sNUMERIC\saffinity.\s\sThis\sis\sbecause\ncasting\sto\snumeric\spreserves\sreal\svalues\sthat\scould\sbe\sintegers\sbut\snumeric\naffinity\sdoes\snot.\s\sBy\susing\sno\saffinity\son\sthe\scolumn,\swe\smake\sthe\sbehavior\nconsistent\sif\sthe\ssubquery\sis\simplemented\sas\sa\sco-routine\sor\sis\smaterialized.
 -D 2022-12-12T18:58:53.208
++C Further\sfix\sfor\sticket\s[57c47526c34f01e8].\s\sIf\sa\ssubquery\shas\sa\sresult\sset\ncolumn\sof\sthe\sform\s"CAST(expr\sAS\sNUMERIC)"\sdo\snot\sgive\sthat\scolumn\sNUMERIC\naffinity.\s\sNUMERIC\saffinity\salways\sgoes\sto\san\sinteger\sif\sable,\sbut\sa\sCAST\nto\snumeric\sis\sa\sno-op\sif\sthe\sinput\sis\sa\snumber.\s\sSo\sthe\stwo\sare\snot\sequivalent.
++D 2022-12-12T21:22:23.884
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -645,9 -645,9 +645,9 @@@ F src/printf.c e99ee9741e79ae3873458146
  F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
  F src/resolve.c efea4e5fbecfd6d0a9071b0be0d952620991673391b6ffaaf4c277b0bb674633
  F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
- F src/select.c 9a687883032642054b8f400aa3bcb6019c2c30f890850480975e95568f290c52
+ F src/select.c 39c4b0e23f3f1334ca3ff9b68014de0ec2c4ae5954186765d669893a8c7fc5a9
  F src/shell.c.in 8d9dc02dd03f8fc93f3e3cdb17d8d16e8ddb985dddad213985c08186900a3ebb
 -F src/sqlite.h.in 97e8021f5db6bab8646d9c2d4231d3bab1204a2e88e5f187eca11dc7eab33ef8
 +F src/sqlite.h.in e752f82b9d71f1d42b259b1900e4b1caf0965e844d756cd5cc91cc2cf45ed925
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h c4b9fa7a7e2bcdf850cfeb4b8a91d5ec47b7a00033bc996fd2ee96cbf2741f5f
  F src/sqliteInt.h 0c9934acd88e0fa14f0d4743233b4cd7bd7bbc84099ba3cad50d8e69676ce2b9
@@@ -863,7 -863,7 +863,7 @@@ F test/capi3c.test 54e2dc0c8fd7c34ad159
  F test/capi3d.test 8b778794af891b0dca3d900bd345fbc8ebd2aa2aae425a9dccdd10d5233dfbde
  F test/capi3e.test 3d49c01ef2a1a55f41d73cba2b23b5059ec460fe
  F test/carray01.test d55d57bf66b1af1c7ac55fae66ff4910884a8f5d21a90a18797ce386212a2634
- F test/cast.test 6064022ba9af31a8a2ff7bb345e5bd0e74172ffad85bdab5898a42d8227c7585
 -F test/cast.test 4f14da6ed96af8b3124cd2cda2ff8cda0946a8a0d0d32ae76905795c6e3ac7bc
++F test/cast.test 8e5ad129d44643f102498d87c241fb221314c20b5e270e6826bae3bacb8bc575
  F test/cffault.test 9d6b20606afe712374952eec4f8fd74b1a8097ef
  F test/changes.test 9dd8e597d84072122fc8a4fcdea837f4a54a461e6e536053ea984303e8ca937b
  F test/changes2.test d222c0cbf5ab0ac4d7c180594e486c1bf20b2098d33e56ce33b8e12eba6823b9
@@@ -2067,8 -2067,11 +2067,9 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P cd881d35150be7f28cc1ca1eca0e950b5a039bef61190fcae4f944ef0e91f234
- R 27f9155fc78c491f877b292e106a06a7
- U stephan
- Z cb8c8da215323ce40b195861e9820bf0
 -P 9386d6f634680b4e0fa5487c34c63acb29f0b7a6ae738b8f6164ad084a229b62
 -R b147605f598862d0859edce8eb970ae1
 -T *branch * cast-to-numeric
 -T *sym-cast-to-numeric *
 -T -sym-trunk *
++P 6cd21b79075367227b57bccf829cc7d4ccc7d7fbcfaed226b4c8e942ddae4eb6 ece07d091c2ef3367a914187e0b6512c1f2390b8c34844536ad50e88c7e8c2f2
++R 8755cdaac46d5859a86e42b45318d91f
++T +closed ece07d091c2ef3367a914187e0b6512c1f2390b8c34844536ad50e88c7e8c2f2
+ U drh
 -Z 8d98f09634c2da9d51008460bd14d1a6
++Z 1f0ab14c8d40a872f59260c7ef73d610
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index f74c1059fe,e5d9e2b583..ac3b975236
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 6cd21b79075367227b57bccf829cc7d4ccc7d7fbcfaed226b4c8e942ddae4eb6
 -ece07d091c2ef3367a914187e0b6512c1f2390b8c34844536ad50e88c7e8c2f2
++f0325359d5795237b79f90f21b42d7d942c7e918137cb0231d404365d3041e81
diff --cc test/cast.test
index cbeec47c9d,cd3f1cad15..9eaacecc95
--- a/test/cast.test
+++ b/test/cast.test
@@@ -483,5 -483,36 +483,36 @@@ do_execsql_test cast-9.0 
    SELECT v1.c0 FROM v1, t0 WHERE v1.c0=0; 
  } {0}
  
+ # Set the 2022-12-10 "reopen" of ticket [https://sqlite.org/src/tktview/57c47526c3]
+ #
+ do_execsql_test cast-9.1 {
+   CREATE TABLE dual(dummy TEXT);
+   INSERT INTO dual VALUES('X');
+   SELECT CAST(4 AS NUMERIC);
+ } {4}
+ do_execsql_test cast-9.2 {
+   SELECT CAST(4.0 AS NUMERIC);
+ } {4.0}
+ do_execsql_test cast-9.3 {
+   SELECT CAST(4.5 AS NUMERIC);
+ } {4.5}
+ do_execsql_test cast-9.4 {
+   SELECT x, typeof(x) FROM (SELECT CAST(4 AS NUMERIC) AS x) JOIN dual;
+ } {4 integer}
+ do_execsql_test cast-9.5 {
 -  SELECT x, typeof(x) FROM (SELECT CAST(4 AS NUMERIC) AS x) CROSS JOIN dual;
++  SELECT x, typeof(x) FROM dual CROSS JOIN (SELECT CAST(4 AS NUMERIC) AS x);
+ } {4 integer}
+ do_execsql_test cast-9.10 {
+   SELECT x, typeof(x) FROM (SELECT CAST(4.0 AS NUMERIC) AS x) JOIN dual;
+ } {4.0 real}
+ do_execsql_test cast-9.11 {
 -  SELECT x, typeof(x) FROM (SELECT CAST(4.0 AS NUMERIC) AS x) CROSS JOIN dual;
++  SELECT x, typeof(x) FROM dual CROSS JOIN (SELECT CAST(4.0 AS NUMERIC) AS x);
+ } {4.0 real}
+ do_execsql_test cast-9.12 {
+   SELECT x, typeof(x) FROM (SELECT CAST(4.5 AS NUMERIC) AS x) JOIN dual;
+ } {4.5 real}
+ do_execsql_test cast-9.13 {
 -  SELECT x, typeof(x) FROM (SELECT CAST(4.5 AS NUMERIC) AS x) CROSS JOIN dual;
++  SELECT x, typeof(x) FROM dual CROSS JOIN (SELECT CAST(4.5 AS NUMERIC) AS x);
+ } {4.5 real}
  
  finish_test