diff options
author | Chad Brubaker <cbrubaker@google.com> | 2017-06-21 12:24:10 -0700 |
---|---|---|
committer | Chad Brubaker <cbrubaker@google.com> | 2017-06-21 12:24:10 -0700 |
commit | 4436df80ecd8f0e6d1868ea43f7dde0772f04bd8 (patch) | |
tree | b5266517d1dded5a2f24a60a094b1ad93794f258 | |
parent | 47908a131569302641f824f67465d13243411b1b (diff) |
Revert "sqlite: Upgrade to SQLite 3.19.3"
This causes Yahoo Finance to fail on opening with:
java.lang.IllegalArgumentException: column '_id' does not exist
at
android.database.AbstractCursor.getColumnIndexOrThrow(AbstractCursor.java:333)
at
android.database.CursorWrapper.getColumnIndexOrThrow(CursorWrapper.java:87)
Bug: 62431773
Test: App stops crashing
This reverts commit 1ea291d14f0cf30fd85f00307dbcb9991912ed2c.
-rw-r--r-- | README.version | 4 | ||||
-rw-r--r-- | dist/Android.patch | 12 | ||||
-rw-r--r-- | dist/orig/sqlite3.c | 20 | ||||
-rw-r--r-- | dist/orig/sqlite3.h | 6 | ||||
-rw-r--r-- | dist/sqlite3.c | 20 | ||||
-rw-r--r-- | dist/sqlite3.h | 6 |
6 files changed, 28 insertions, 40 deletions
diff --git a/README.version b/README.version index 305983a..c26473d 100644 --- a/README.version +++ b/README.version @@ -1,3 +1,3 @@ -URL: https://sqlite.org/2017/sqlite-amalgamation-3190300.zip -Version: 3.19.3 +URL: https://sqlite.org/2017/sqlite-amalgamation-3190200.zip +Version: 3.19.2 BugComponent: 24950 diff --git a/dist/Android.patch b/dist/Android.patch index 095b973..98b9f1f 100644 --- a/dist/Android.patch +++ b/dist/Android.patch @@ -1,6 +1,6 @@ diff -r -u -d orig/shell.c ./shell.c ---- orig/shell.c 2017-06-08 17:09:50.000000000 +0200 -+++ ./shell.c 2017-06-08 18:08:52.586798733 +0200 +--- orig/shell.c 2017-05-24 17:13:50.000000000 +0200 ++++ ./shell.c 2017-05-24 19:24:05.290434785 +0200 @@ -52,6 +52,12 @@ #endif #include <ctype.h> @@ -38,8 +38,8 @@ diff -r -u -d orig/shell.c ./shell.c } diff -r -u -d orig/sqlite3.c ./sqlite3.c ---- orig/sqlite3.c 2017-06-08 17:09:50.000000000 +0200 -+++ ./sqlite3.c 2017-06-08 18:08:52.641797754 +0200 +--- orig/sqlite3.c 2017-05-24 17:13:50.000000000 +0200 ++++ ./sqlite3.c 2017-05-24 19:24:05.339433935 +0200 @@ -33542,7 +33542,7 @@ SimulateIOError( rc=1 ); if( rc!=0 ){ @@ -67,7 +67,7 @@ diff -r -u -d orig/sqlite3.c ./sqlite3.c goto shm_open_err; } -@@ -115934,7 +115934,7 @@ +@@ -115926,7 +115926,7 @@ } if( pDb->pSchema->file_format>SQLITE_MAX_FILE_FORMAT ){ sqlite3SetString(pzErrMsg, db, "unsupported file format"); @@ -76,7 +76,7 @@ diff -r -u -d orig/sqlite3.c ./sqlite3.c goto initone_error_out; } -@@ -149769,13 +149769,25 @@ +@@ -149753,13 +149753,25 @@ ** module with sqlite. */ if( SQLITE_OK==rc diff --git a/dist/orig/sqlite3.c b/dist/orig/sqlite3.c index 9c8fd62..657a54e 100644 --- a/dist/orig/sqlite3.c +++ b/dist/orig/sqlite3.c @@ -1,6 +1,6 @@ /****************************************************************************** ** This file is an amalgamation of many separate C source files from SQLite -** version 3.19.3. By combining all the individual C code files into this +** version 3.19.2. By combining all the individual C code files into this ** single large file, the entire code can be compiled as a single translation ** unit. This allows many compilers to do optimizations that would not be ** possible if the files were compiled separately. Performance improvements @@ -398,9 +398,9 @@ extern "C" { ** [sqlite3_libversion_number()], [sqlite3_sourceid()], ** [sqlite_version()] and [sqlite_source_id()]. */ -#define SQLITE_VERSION "3.19.3" -#define SQLITE_VERSION_NUMBER 3019003 -#define SQLITE_SOURCE_ID "2017-06-08 14:26:16 0ee482a1e0eae22e08edc8978c9733a96603d4509645f348ebf55b579e89636b" +#define SQLITE_VERSION "3.19.2" +#define SQLITE_VERSION_NUMBER 3019002 +#define SQLITE_SOURCE_ID "2017-05-25 16:50:27 edb4e819b0c058c7d74d27ebd14cc5ceb2bad6a6144a486a970182b7afe3f8b9" /* ** CAPI3REF: Run-Time Library Version Numbers @@ -67208,18 +67208,12 @@ SQLITE_PRIVATE int sqlite3BtreeInsert( memcpy(newCell, oldCell, 4); } rc = clearCell(pPage, oldCell, &info); - if( info.nSize==szNew && info.nLocal==info.nPayload - && (!ISAUTOVACUUM || szNew<pPage->minLocal) - ){ + if( info.nSize==szNew && info.nLocal==info.nPayload ){ /* Overwrite the old cell with the new if they are the same size. ** We could also try to do this if the old cell is smaller, then add ** the leftover space to the free list. But experiments show that ** doing that is no faster then skipping this optimization and just - ** calling dropCell() and insertCell(). - ** - ** This optimization cannot be used on an autovacuum database if the - ** new entry uses overflow pages, as the insertCell() call below is - ** necessary to add the PTRMAP_OVERFLOW1 pointer-map entry. */ + ** calling dropCell() and insertCell(). */ assert( rc==SQLITE_OK ); /* clearCell never fails when nLocal==nPayload */ if( oldCell+szNew > pPage->aDataEnd ) return SQLITE_CORRUPT_BKPT; memcpy(oldCell, newCell, szNew); @@ -199062,7 +199056,7 @@ static void fts5SourceIdFunc( ){ assert( nArg==0 ); UNUSED_PARAM2(nArg, apUnused); - sqlite3_result_text(pCtx, "fts5: 2017-06-08 14:26:16 0ee482a1e0eae22e08edc8978c9733a96603d4509645f348ebf55b579e89636b", -1, SQLITE_TRANSIENT); + sqlite3_result_text(pCtx, "fts5: 2017-05-25 16:50:27 edb4e819b0c058c7d74d27ebd14cc5ceb2bad6a6144a486a970182b7afe3f8b9", -1, SQLITE_TRANSIENT); } static int fts5Init(sqlite3 *db){ diff --git a/dist/orig/sqlite3.h b/dist/orig/sqlite3.h index 3deb9c7..296ada0 100644 --- a/dist/orig/sqlite3.h +++ b/dist/orig/sqlite3.h @@ -121,9 +121,9 @@ extern "C" { ** [sqlite3_libversion_number()], [sqlite3_sourceid()], ** [sqlite_version()] and [sqlite_source_id()]. */ -#define SQLITE_VERSION "3.19.3" -#define SQLITE_VERSION_NUMBER 3019003 -#define SQLITE_SOURCE_ID "2017-06-08 14:26:16 0ee482a1e0eae22e08edc8978c9733a96603d4509645f348ebf55b579e89636b" +#define SQLITE_VERSION "3.19.2" +#define SQLITE_VERSION_NUMBER 3019002 +#define SQLITE_SOURCE_ID "2017-05-25 16:50:27 edb4e819b0c058c7d74d27ebd14cc5ceb2bad6a6144a486a970182b7afe3f8b9" /* ** CAPI3REF: Run-Time Library Version Numbers diff --git a/dist/sqlite3.c b/dist/sqlite3.c index c89de64..9db21a8 100644 --- a/dist/sqlite3.c +++ b/dist/sqlite3.c @@ -1,6 +1,6 @@ /****************************************************************************** ** This file is an amalgamation of many separate C source files from SQLite -** version 3.19.3. By combining all the individual C code files into this +** version 3.19.2. By combining all the individual C code files into this ** single large file, the entire code can be compiled as a single translation ** unit. This allows many compilers to do optimizations that would not be ** possible if the files were compiled separately. Performance improvements @@ -398,9 +398,9 @@ extern "C" { ** [sqlite3_libversion_number()], [sqlite3_sourceid()], ** [sqlite_version()] and [sqlite_source_id()]. */ -#define SQLITE_VERSION "3.19.3" -#define SQLITE_VERSION_NUMBER 3019003 -#define SQLITE_SOURCE_ID "2017-06-08 14:26:16 0ee482a1e0eae22e08edc8978c9733a96603d4509645f348ebf55b579e89636b" +#define SQLITE_VERSION "3.19.2" +#define SQLITE_VERSION_NUMBER 3019002 +#define SQLITE_SOURCE_ID "2017-05-25 16:50:27 edb4e819b0c058c7d74d27ebd14cc5ceb2bad6a6144a486a970182b7afe3f8b9" /* ** CAPI3REF: Run-Time Library Version Numbers @@ -67208,18 +67208,12 @@ SQLITE_PRIVATE int sqlite3BtreeInsert( memcpy(newCell, oldCell, 4); } rc = clearCell(pPage, oldCell, &info); - if( info.nSize==szNew && info.nLocal==info.nPayload - && (!ISAUTOVACUUM || szNew<pPage->minLocal) - ){ + if( info.nSize==szNew && info.nLocal==info.nPayload ){ /* Overwrite the old cell with the new if they are the same size. ** We could also try to do this if the old cell is smaller, then add ** the leftover space to the free list. But experiments show that ** doing that is no faster then skipping this optimization and just - ** calling dropCell() and insertCell(). - ** - ** This optimization cannot be used on an autovacuum database if the - ** new entry uses overflow pages, as the insertCell() call below is - ** necessary to add the PTRMAP_OVERFLOW1 pointer-map entry. */ + ** calling dropCell() and insertCell(). */ assert( rc==SQLITE_OK ); /* clearCell never fails when nLocal==nPayload */ if( oldCell+szNew > pPage->aDataEnd ) return SQLITE_CORRUPT_BKPT; memcpy(oldCell, newCell, szNew); @@ -199074,7 +199068,7 @@ static void fts5SourceIdFunc( ){ assert( nArg==0 ); UNUSED_PARAM2(nArg, apUnused); - sqlite3_result_text(pCtx, "fts5: 2017-06-08 14:26:16 0ee482a1e0eae22e08edc8978c9733a96603d4509645f348ebf55b579e89636b", -1, SQLITE_TRANSIENT); + sqlite3_result_text(pCtx, "fts5: 2017-05-25 16:50:27 edb4e819b0c058c7d74d27ebd14cc5ceb2bad6a6144a486a970182b7afe3f8b9", -1, SQLITE_TRANSIENT); } static int fts5Init(sqlite3 *db){ diff --git a/dist/sqlite3.h b/dist/sqlite3.h index 3deb9c7..296ada0 100644 --- a/dist/sqlite3.h +++ b/dist/sqlite3.h @@ -121,9 +121,9 @@ extern "C" { ** [sqlite3_libversion_number()], [sqlite3_sourceid()], ** [sqlite_version()] and [sqlite_source_id()]. */ -#define SQLITE_VERSION "3.19.3" -#define SQLITE_VERSION_NUMBER 3019003 -#define SQLITE_SOURCE_ID "2017-06-08 14:26:16 0ee482a1e0eae22e08edc8978c9733a96603d4509645f348ebf55b579e89636b" +#define SQLITE_VERSION "3.19.2" +#define SQLITE_VERSION_NUMBER 3019002 +#define SQLITE_SOURCE_ID "2017-05-25 16:50:27 edb4e819b0c058c7d74d27ebd14cc5ceb2bad6a6144a486a970182b7afe3f8b9" /* ** CAPI3REF: Run-Time Library Version Numbers |