SQLite: Check-in [a70fdaa3]

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview

Comment:	Fix an error message.
Downloads:	Tarball \| ZIP archive \| SQL archive
Timelines:	family \| ancestors \| descendants \| both \| reuse-schema
Files:	files \| file ages \| folders
SHA3-256:	a70fdaa3903835dca338d68e750716fd3ab9dedbdfb2be6d6e058fd5fcb415fa
User & Date:	dan 2019-03-20 19:17:45

Context

2019-03-20
20:02		Use the IsReuseSchema() macro more consistently. Also, rename it to IsSharedSchema(). (check-in: c1be211c user: dan tags: reuse-schema)
19:17		Fix an error message. (check-in: a70fdaa3 user: dan tags: reuse-schema)
16:03		Merge latest trunk changes into this branch. (check-in: 4cd20ca6 user: dan tags: reuse-schema)

Changes

Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/build.c.

   427    427   #endif
   428    428       if( flags & LOCATE_NOERR ) return 0;
   429    429       pParse->checkSchema = 1;
   430    430     }else if( IsVirtual(p) && pParse->disableVtab ){
   431    431       p = 0;
   432    432     }
   433    433   
   434         -  if( p==0 && pParse->nErr==0 ){
          434  +  if( p==0 && (!IsReuseSchema(db) || pParse->nErr==0) ){
   435    435       const char *zMsg = flags & LOCATE_VIEW ? "no such view" : "no such table";
   436    436       if( zDbase ){
   437    437         sqlite3ErrorMsg(pParse, "%s: %s.%s", zMsg, zDbase, zName);
   438    438       }else{
   439    439         sqlite3ErrorMsg(pParse, "%s: %s", zMsg, zName);
   440    440       }
   441    441     }

Changes to test/with3.test.

    26     26   #
    27     27   do_catchsql_test 1.0 {
    28     28     WITH i(x) AS (
    29     29       WITH j AS (SELECT 10)
    30     30       SELECT 5 FROM t0 UNION SELECT 8 FROM m
    31     31     )
    32     32     SELECT * FROM i;
    33         -} {1 {no such table: t0}}
           33  +} {1 {no such table: m}}
    34     34   
    35     35   # Additional test cases that came out of the work to
    36     36   # fix for Kostya's problem.
    37     37   #
    38     38   do_execsql_test 2.0 {
    39     39    WITH
    40     40     x1 AS (SELECT 10),