Resolve all possible aliases and variations of the schema table names.

FossilOrigin-Name: e7a0112b235d97cb68c92b967bf2218b90258c243ec2b638aaac142392873126

diff --git a/manifest b/manifest
index 8e2f69fbbb85e71fd6c8d2dc20519f1a10d780d2..e8a0fed3e9c764eccace5b0a951988df402bfb03 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\sautomatic\sinstallation\sof\sJS-global\sS\sobject\sfor\sthe\ssake\sof\sclient\slibraries\swhich\sembed\sthis\slibrary,\sper\s[forum:9d4f722c6912799d|request\sin\sthe\sforum].
-D 2023-02-02T06:17:22.084
+C Resolve\sall\spossible\saliases\sand\svariations\sof\sthe\sschema\stable\snames.
+D 2023-02-02T15:28:40.634
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -618,7 +618,7 @@ F src/pragma.h e690a356c18e98414d2e870ea791c1be1545a714ba623719deb63f7f226d8bb7
 F src/prepare.c ce87a08cfddd45a147150db34190b1986f2d4a0e0828858cb6bd908c78fb02e3
 F src/printf.c ff4b05e38bf928ff1b80d3dda4f977b10fe39ecbfe69c018224c7e5594fb2455
 F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
-F src/resolve.c 5a98a7bf277aa60584b6bb4c5dd6a9ef2b19537910612c34f596e2901e88596d
+F src/resolve.c 35b0d894c4e6c622e227baf36505da0f4d97626a87edf96fa22085ba4c11fa73
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
 F src/select.c c3ce1b49cca2c66c8c88fe7d9e1f3db23590deb4dd631619ad90e1e5d21bcf1f
 F src/shell.c.in f7fd28e68269a58690c665e8a5e96ba242201267925fbd335f08695c79fc6db7
@@ -2046,8 +2046,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 55a26c67ed4a3a937e009f60da2cd951d6f090b0bea748037db5c1680e5ff3b4
-R 9c57120d89d797b8adf616b282c621a9
-U stephan
-Z aa2910517eac4f7b9e54b969ac05fd1d
+P 9504f68af8360ea6d61574fd4b9811af34b721c12d9653eb50adcf0f12b129fc
+R f65ca28a10f3f8cc614fd2f20d2fc273
+U drh
+Z b4936cfb3538c7eba890d9326f387684
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 41ebac68e7598ede240767d10c1211515228a4e0..dd8ff56c5742aa7720fe6485a0541e56aa5c7b05 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9504f68af8360ea6d61574fd4b9811af34b721c12d9653eb50adcf0f12b129fc
\ No newline at end of file
+e7a0112b235d97cb68c92b967bf2218b90258c243ec2b638aaac142392873126
\ No newline at end of file

diff --git a/src/resolve.c b/src/resolve.c
index 0d196ac37716d813732022f4564d6fa6a7cf614b..d5e639abc557e4f89cd9ec7f265dd5c80971999e 100644 (file)
--- a/src/resolve.c
+++ b/src/resolve.c
@@ -202,6 +202,33 @@ static void extendFJMatch(
   }
 }
 
+/*
+** Return TRUE (non-zero) if zTab is a valid name for the schema table pTab.
+*/
+static SQLITE_NOINLINE int isValidSchemaTableName(
+  const char *zTab,         /* Name as it appears in the SQL */
+  Table *pTab,              /* The schema table we are trying to match */
+  Schema *pSchema           /* non-NULL if a database qualifier is present */
+){
+  const char *zLegacy;
+  const char *zPreferred;
+  assert( pTab!=0 );
+  assert( pTab->tnum==1 );
+  if( sqlite3StrNICmp(zTab, "sqlite_", 7)!=0 ) return 0;
+  zLegacy = pTab->zName;
+  zPreferred = sqlite3PreferredTableName(zLegacy);
+  if( sqlite3StrICmp(zTab, zPreferred)==0 ) return 1;
+  if( pSchema && strcmp(zLegacy+7, &LEGACY_TEMP_SCHEMA_TABLE[7])==0){
+    if( sqlite3StrICmp(zTab+7, &PREFERRED_TEMP_SCHEMA_TABLE[7])==0
+     || sqlite3StrICmp(zTab+7, &PREFERRED_SCHEMA_TABLE[7])==0
+     || sqlite3StrICmp(zTab+7, &LEGACY_SCHEMA_TABLE[7])==0
+    ){
+      return 1;
+    }
+  }
+  return 0;
+}
+
 /*
 ** Given the name of a column of the form X.Y.Z or Y.Z or just Z, look up
 ** that name in the set of source tables in pSrcList and make the pExpr 
@@ -355,15 +382,17 @@ static int lookupName(
         }
         assert( zDb==0 || zTab!=0 );
         if( zTab ){
-          const char *zTabName;
           if( zDb ){
             if( pTab->pSchema!=pSchema ) continue;
             if( pSchema==0 && strcmp(zDb,"*")!=0 ) continue;
           }
-          zTabName = pItem->zAlias ? pItem->zAlias : pTab->zName;
-          assert( zTabName!=0 );
-          if( sqlite3StrICmp(zTabName, zTab)!=0 ){
-            continue;
+          if( pItem->zAlias!=0 ){
+            if( sqlite3StrICmp(zTab, pItem->zAlias)!=0 ){
+              continue;
+            }
+          }else if( sqlite3StrICmp(zTab, pTab->zName)!=0 ){
+            if( pTab->tnum!=1 ) continue;
+            if( !isValidSchemaTableName(zTab, pTab, pSchema) ) continue;
           }
           assert( ExprUseYTab(pExpr) );
           if( IN_RENAME_OBJECT && pItem->zAlias ){