SQLite: Check-in [e1b71029]

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

Overview

Comment:	When building an ephemeral table of integers, do not assume that the table does not already contain N if the insert cursor points to N-1. Fix for ticket [61fe9745]. Also increase the version number to 3.18.2. This is the release candidate.
Downloads:	Tarball \| ZIP archive \| SQL archive
Timelines:	family \| ancestors \| descendants \| both \| branch-3.18
Files:	files \| file ages \| folders
SHA3-256:	e1b71029087675749a5c64303a8756d16cb33ed3ac2e8d3b075051f575c072fb
User & Date:	drh 2017-06-17 00:39:47

Context

2017-06-17
09:59		Version 3.18.2 check-in: 036ebf72 user: drh tags: release, branch-3.18, version-3.18.2
00:39		When building an ephemeral table of integers, do not assume that the table does not already contain N if the insert cursor points to N-1. Fix for ticket [61fe9745]. Also increase the version number to 3.18.2. This is the release candidate. check-in: e1b71029 user: drh tags: branch-3.18
2017-06-16
13:41		Version 3.18.1 check-in: 77bb4623 user: drh tags: release, branch-3.18, version-3.18.1
2017-04-24
14:16		When building an ephemeral table of integers, do not assume that the table does not already contain N if the insert cursor points to N-1. Fix for ticket [61fe9745]. check-in: 1c1b0862 user: dan tags: trunk

Changes

Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to VERSION.

     1         -3.18.1
            1  +3.18.2

Changes to configure.

     1      1   #! /bin/sh
     2      2   # Guess values for system-dependent variables and create Makefiles.
     3         -# Generated by GNU Autoconf 2.69 for sqlite 3.18.1.
            3  +# Generated by GNU Autoconf 2.69 for sqlite 3.18.2.
     4      4   #
     5      5   #
     6      6   # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
     7      7   #
     8      8   #
     9      9   # This configure script is free software; the Free Software Foundation
    10     10   # gives unlimited permission to copy, distribute and modify it.
................................................................................
   722    722   subdirs=
   723    723   MFLAGS=
   724    724   MAKEFLAGS=
   725    725   
   726    726   # Identity of this package.
   727    727   PACKAGE_NAME='sqlite'
   728    728   PACKAGE_TARNAME='sqlite'
   729         -PACKAGE_VERSION='3.18.1'
   730         -PACKAGE_STRING='sqlite 3.18.1'
          729  +PACKAGE_VERSION='3.18.2'
          730  +PACKAGE_STRING='sqlite 3.18.2'
   731    731   PACKAGE_BUGREPORT=''
   732    732   PACKAGE_URL=''
   733    733   
   734    734   # Factoring default headers for most tests.
   735    735   ac_includes_default="\
   736    736   #include <stdio.h>
   737    737   #ifdef HAVE_SYS_TYPES_H
................................................................................
  1459   1459   #
  1460   1460   # Report the --help message.
  1461   1461   #
  1462   1462   if test "$ac_init_help" = "long"; then
  1463   1463     # Omit some internal or obsolete options to make the list less imposing.
  1464   1464     # This message is too long to be a string in the A/UX 3.1 sh.
  1465   1465     cat <<_ACEOF
  1466         -\`configure' configures sqlite 3.18.1 to adapt to many kinds of systems.
         1466  +\`configure' configures sqlite 3.18.2 to adapt to many kinds of systems.
  1467   1467   
  1468   1468   Usage: $0 [OPTION]... [VAR=VALUE]...
  1469   1469   
  1470   1470   To assign environment variables (e.g., CC, CFLAGS...), specify them as
  1471   1471   VAR=VALUE.  See below for descriptions of some of the useful variables.
  1472   1472   
  1473   1473   Defaults for the options are specified in brackets.
................................................................................
  1524   1524     --build=BUILD     configure for building on BUILD [guessed]
  1525   1525     --host=HOST       cross-compile to build programs to run on HOST [BUILD]
  1526   1526   _ACEOF
  1527   1527   fi
  1528   1528   
  1529   1529   if test -n "$ac_init_help"; then
  1530   1530     case $ac_init_help in
  1531         -     short | recursive ) echo "Configuration of sqlite 3.18.1:";;
         1531  +     short | recursive ) echo "Configuration of sqlite 3.18.2:";;
  1532   1532      esac
  1533   1533     cat <<\_ACEOF
  1534   1534   
  1535   1535   Optional Features:
  1536   1536     --disable-option-checking  ignore unrecognized --enable/--with options
  1537   1537     --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
  1538   1538     --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
................................................................................
  1648   1648       cd "$ac_pwd" || { ac_status=$?; break; }
  1649   1649     done
  1650   1650   fi
  1651   1651   
  1652   1652   test -n "$ac_init_help" && exit $ac_status
  1653   1653   if $ac_init_version; then
  1654   1654     cat <<\_ACEOF
  1655         -sqlite configure 3.18.1
         1655  +sqlite configure 3.18.2
  1656   1656   generated by GNU Autoconf 2.69
  1657   1657   
  1658   1658   Copyright (C) 2012 Free Software Foundation, Inc.
  1659   1659   This configure script is free software; the Free Software Foundation
  1660   1660   gives unlimited permission to copy, distribute and modify it.
  1661   1661   _ACEOF
  1662   1662     exit
................................................................................
  2067   2067     eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
  2068   2068   
  2069   2069   } # ac_fn_c_check_header_mongrel
  2070   2070   cat >config.log <<_ACEOF
  2071   2071   This file contains any messages produced by compilers while
  2072   2072   running configure, to aid debugging if configure makes a mistake.
  2073   2073   
  2074         -It was created by sqlite $as_me 3.18.1, which was
         2074  +It was created by sqlite $as_me 3.18.2, which was
  2075   2075   generated by GNU Autoconf 2.69.  Invocation command line was
  2076   2076   
  2077   2077     $ $0 $@
  2078   2078   
  2079   2079   _ACEOF
  2080   2080   exec 5>>config.log
  2081   2081   {
................................................................................
 12147  12147   test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
 12148  12148   
 12149  12149   cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 12150  12150   # Save the log message, to keep $0 and so on meaningful, and to
 12151  12151   # report actual input values of CONFIG_FILES etc. instead of their
 12152  12152   # values after options handling.
 12153  12153   ac_log="
 12154         -This file was extended by sqlite $as_me 3.18.1, which was
        12154  +This file was extended by sqlite $as_me 3.18.2, which was
 12155  12155   generated by GNU Autoconf 2.69.  Invocation command line was
 12156  12156   
 12157  12157     CONFIG_FILES    = $CONFIG_FILES
 12158  12158     CONFIG_HEADERS  = $CONFIG_HEADERS
 12159  12159     CONFIG_LINKS    = $CONFIG_LINKS
 12160  12160     CONFIG_COMMANDS = $CONFIG_COMMANDS
 12161  12161     $ $0 $@
................................................................................
 12213  12213   
 12214  12214   Report bugs to the package provider."
 12215  12215   
 12216  12216   _ACEOF
 12217  12217   cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 12218  12218   ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 12219  12219   ac_cs_version="\\
 12220         -sqlite config.status 3.18.1
        12220  +sqlite config.status 3.18.2
 12221  12221   configured by $0, generated by GNU Autoconf 2.69,
 12222  12222     with options \\"\$ac_cs_config\\"
 12223  12223   
 12224  12224   Copyright (C) 2012 Free Software Foundation, Inc.
 12225  12225   This config.status script is free software; the Free Software Foundation
 12226  12226   gives unlimited permission to copy, distribute and modify it."
 12227  12227   
................................................................................
 13825  13825     # would make configure fail if this is the last instruction.
 13826  13826     $ac_cs_success || as_fn_exit 1
 13827  13827   fi
 13828  13828   if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
 13829  13829     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
 13830  13830   $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 13831  13831   fi
        13832  +

Changes to src/btree.c.

  8118   8118               ((pCur->curFlags&BTCF_ValidNKey)!=0 && pX->nKey==pCur->info.nKey) );
  8119   8119   
  8120   8120       /* If the cursor is currently on the last row and we are appending a
  8121   8121       ** new row onto the end, set the "loc" to avoid an unnecessary
  8122   8122       ** btreeMoveto() call */
  8123   8123       if( (pCur->curFlags&BTCF_ValidNKey)!=0 && pX->nKey==pCur->info.nKey ){
  8124   8124         loc = 0;
  8125         -    }else if( (pCur->curFlags&BTCF_ValidNKey)!=0 && pX->nKey>0
  8126         -               && pCur->info.nKey==pX->nKey-1 ){
  8127         -      loc = -1;
  8128   8125       }else if( loc==0 ){
  8129   8126         rc = sqlite3BtreeMovetoUnpacked(pCur, 0, pX->nKey, flags!=0, &loc);
  8130   8127         if( rc ) return rc;
  8131   8128       }
  8132   8129     }else if( loc==0 && (flags & BTREE_SAVEPOSITION)==0 ){
  8133   8130       if( pX->nMem ){
  8134   8131         UnpackedRecord r;

Changes to test/in5.test.

    233    234    235    236    237    238                239    240

class="diffln"> 232 232 do_execsql_test 8.3 { 233 INSERT INTO n1 VALUES(1, NULL), (2, NULL), (3, NULL); 234 SELECT count(*) FROM n1 WHERE a IN (1, 2, 3) 235 } 3 236 do_execsql_test 8.4 { 237 SELECT count(*) FROM n1 WHERE a IN (SELECT +a FROM n1) 238 } 3 239 + 240 +#------------------------------------------------------------------------- 241 +# Test that ticket 61fe97454c is fixed. 242 +# 243 +do_execsql_test 9.0 { 244 + CREATE TABLE t9(a INTEGER PRIMARY KEY); 245 + INSERT INTO t9 VALUES (44), (45); 246 +} 247 +do_execsql_test 9.1 { 248 + SELECT * FROM t9 WHERE a IN (44, 45, 44, 45) 249 +} {44 45} 250 + 251 252 finish_test