From: drh <>
Date: Wed, 14 Dec 2022 23:53:29 +0000 (+0000)
Subject: Fix minor problems in the new sqlite3ExprDataType() function.
X-Git-Tag: version-3.41.0~243
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=da69802e92cd4385727faae18fd5ebf1c166a319;p=thirdparty%2Fsqlite.git

Fix minor problems in the new sqlite3ExprDataType() function.

FossilOrigin-Name: c1d5261b222bbf94c20e558089f3d2eae6a88b6d739225ee4f7d0338e0e59994
---

diff --git a/manifest b/manifest
index 20ec5a5c61..3cfa4d2e3d 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Adjust\sthe\squery\splanner\sto\sbe\smore\saggressive\sabout\susing\sco-routines\srather\nthan\smaterializing\ssubqueries\sand\sviews.\s\sImplementation\sof\senhancement\nrequest\s[73ebbb3a3d1a7bd3].
-D 2022-12-14T18:34:05.073
+C Fix\sminor\sproblems\sin\sthe\snew\ssqlite3ExprDataType()\sfunction.
+D 2022-12-14T23:53:29.854
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -595,7 +595,7 @@ F src/date.c 94ce83b4cd848a387680a5f920c9018c16655db778c4d36525af0a0f34679ac5
 F src/dbpage.c f1a87f4ebcf22284e0aaf0697862f4ccfc120dcd6db3d8dfa3b049b2580c01d8
 F src/dbstat.c a56a7ad1163a9888d46cd5820be2e65354fb1aa04ed6909f7c3e5831e0ee2c29
 F src/delete.c 86573edae75e3d3e9a8b590d87db8e47222103029df4f3e11fa56044459b514e
-F src/expr.c c788575fc6a101b6360bc44eb6f973b8aa25f9af984a43a43e376fbceb19cb6c
+F src/expr.c 63e0b77a5444c75908fb1d2db9b15248c3b31b4fd5ea38f1a45a2b4ac2f14cf8
 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 F src/fkey.c 722f20779f5342a787922deded3628d8c74b5249cab04098cf17ee2f2aaff002
 F src/func.c 7e86074afc4dc702691a29b7801f6dcc191db092b52e8bbe69dcd2f7be52194d
@@ -645,7 +645,7 @@ F src/printf.c e99ee9741e79ae3873458146f59644276657340385ade4e76a5f5d1c25793764
 F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 F src/resolve.c efea4e5fbecfd6d0a9071b0be0d952620991673391b6ffaaf4c277b0bb674633
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
-F src/select.c 505b265ec68da42e40498b35d57c9937481c94065e91b151a27501cd3ab4d65e
+F src/select.c 6bfa72ad9b8ebbd6acb77750d65b4a242480750dc861057fd3129e8d098c909e
 F src/shell.c.in 8d9dc02dd03f8fc93f3e3cdb17d8d16e8ddb985dddad213985c08186900a3ebb
 F src/sqlite.h.in e752f82b9d71f1d42b259b1900e4b1caf0965e844d756cd5cc91cc2cf45ed925
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
@@ -2067,9 +2067,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P cc86f03ed698a071cd02ef3dfaba69092226bff20c917d662f808061627ad285 ea278438b72e85d217e72c836cbefd68bd8b336baf33507b2d8d12ef436424cd
-R f0518c03c003c2b05726a7b1f40c0f28
-T +closed ea278438b72e85d217e72c836cbefd68bd8b336baf33507b2d8d12ef436424cd
+P 0b58d1b354a0f91bafeafee102acedd4654dc420afdf4eb4aaac9bf5bcb63c1f
+R 7cbfdf44a5f1881085f07267777096c9
 U drh
-Z cc759078265143195883414f41af1748
+Z 9418ec076c73edb8fe693b27dc219a65
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index e063ae74fa..3f8d9ae3fb 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-0b58d1b354a0f91bafeafee102acedd4654dc420afdf4eb4aaac9bf5bcb63c1f
\ No newline at end of file
+c1d5261b222bbf94c20e558089f3d2eae6a88b6d739225ee4f7d0338e0e59994
\ No newline at end of file
diff --git a/src/expr.c b/src/expr.c
index 5608128ad2..fe316550a7 100644
--- a/src/expr.c
+++ b/src/expr.c
@@ -109,7 +109,8 @@ int sqlite3ExprDataType(const Expr *pExpr){
         break;
       }
       case TK_NULL: {
-        return 0x00;
+        pExpr = 0;
+        break;
       }
       case TK_STRING: {
         return 0x02;
@@ -145,6 +146,9 @@ int sqlite3ExprDataType(const Expr *pExpr){
         for(ii=1; ii<pList->nExpr; ii+=2){
           res |= sqlite3ExprDataType(pList->a[ii].pExpr);
         }
+        if( pList->nExpr % 2 ){
+          res |= sqlite3ExprDataType(pList->a[pList->nExpr-1].pExpr);
+        }
         return res;
       }
       default: {
@@ -152,7 +156,7 @@ int sqlite3ExprDataType(const Expr *pExpr){
       }
     } /* End of switch(op) */
   } /* End of while(pExpr) */
-  return 0;
+  return 0x00;
 }
 
 /*
diff --git a/src/select.c b/src/select.c
index b4d57f489d..336d1503ab 100644
--- a/src/select.c
+++ b/src/select.c
@@ -2358,11 +2358,15 @@ void sqlite3SubqueryColumnTypes(
         pCol->affinity = SQLITE_AFF_BLOB;
       }
     }
-    zType = 0;
-    for(j=0; j<SQLITE_N_STDTYPE; j++){
-      if( sqlite3StdTypeAffinity[j]==pCol->affinity ){
-        zType = sqlite3StdType[j];
-        break;
+    if( pCol->affinity==SQLITE_AFF_NUMERIC ){
+      zType = "NUM";
+    }else{
+      zType = 0;
+      for(j=1; j<SQLITE_N_STDTYPE; j++){
+        if( sqlite3StdTypeAffinity[j]==pCol->affinity ){
+          zType = sqlite3StdType[j];
+          break;
+        }
       }
     }
     if( zType ){