/ Check-in [ead29f9c]
Login

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

Overview
Comment:Omit some of the fstree tests in vtabH if the PWD contains LIKE wildcards.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256:ead29f9cb757a5f9921086e3bb4998f60e0d6cfcf41ef0f9a230b365b6226947
User & Date: drh 2017-06-05 10:31:03
Context
2017-06-05
12:29
Fix the column width deduction logic in the command-line shell to account for multi-byte utf8 characters. check-in: ed0842c1 user: drh tags: trunk
10:31
Omit some of the fstree tests in vtabH if the PWD contains LIKE wildcards. check-in: ead29f9c user: drh tags: trunk
2017-06-03
20:09
Initialize a variable to zero to prevent an (incorrect) compiler warning of it potentially being uninitialized. check-in: 65182ce0 user: drh tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to test/vtabH.test.

   212    212         set fd [open $path w]
   213    213         puts -nonewline $fd [string repeat 1 $sz]
   214    214         close $fd
   215    215       }
   216    216     } {}
   217    217   
   218    218     set pwd [pwd]
   219         -  do_execsql_test 3.5 {
   220         -    SELECT path, size FROM fstree WHERE path GLOB $pwd || '/subdir/*' ORDER BY 1
   221         -  } [list \
   222         -    "$pwd/subdir/x1.txt" 143 \
   223         -    "$pwd/subdir/x2.txt" 153 \
   224         -  ]
   225         -  do_execsql_test 3.6 {
   226         -    SELECT path, size FROM fstree WHERE path LIKE $pwd || '/subdir/%' ORDER BY 1
   227         -  } [list \
   228         -    "$pwd/subdir/x1.txt" 143 \
   229         -    "$pwd/subdir/x2.txt" 153 \
   230         -  ]
   231         -  do_execsql_test 3.7 {
   232         -    SELECT sum(size) FROM fstree WHERE path LIKE $pwd || '/subdir/%'
   233         -  } 296
   234         -  do_execsql_test 3.8 {
   235         -    SELECT size FROM fstree WHERE path = $pwd || '/subdir/x1.txt'
   236         -  } 143
          219  +  if {![string match {*[_%]*} $pwd]} {
          220  +    do_execsql_test 3.5 {
          221  +      SELECT path, size FROM fstree 
          222  +       WHERE path GLOB $pwd || '/subdir/*' ORDER BY 1
          223  +    } [list \
          224  +      "$pwd/subdir/x1.txt" 143 \
          225  +      "$pwd/subdir/x2.txt" 153 \
          226  +    ]
          227  +    do_execsql_test 3.6 {
          228  +      SELECT path, size FROM fstree
          229  +       WHERE path LIKE $pwd || '/subdir/%' ORDER BY 1
          230  +    } [list \
          231  +      "$pwd/subdir/x1.txt" 143 \
          232  +      "$pwd/subdir/x2.txt" 153 \
          233  +    ]
          234  +    do_execsql_test 3.7 {
          235  +      SELECT sum(size) FROM fstree WHERE path LIKE $pwd || '/subdir/%'
          236  +    } 296
          237  +    do_execsql_test 3.8 {
          238  +      SELECT size FROM fstree WHERE path = $pwd || '/subdir/x1.txt'
          239  +    } 143
          240  +  }
   237    241   
   238    242   }
   239    243   
   240    244   
   241    245   finish_test