chore: update patches

electron · Sep 7, 2022 · 5ab4999 · 5ab4999
1 parent 2c9d717
commit 5ab4999
Showing 1 changed file with 4 additions and 48 deletions.
diff --git a/patches/sqlite/utf-8_q_when_20applying_20the_20omit-order-by_20optimization.patch b/patches/sqlite/utf-8_q_when_20applying_20the_20omit-order-by_20optimization.patch
@@ -14,19 +14,10 @@ Commit-Queue: Ayu Ishii <ayui@chromium.org>
 Reviewed-by: Joshua Bell <jsbell@chromium.org>
 
 diff --git a/amalgamation/sqlite3.c b/amalgamation/sqlite3.c
-index 081f682bf9c3d97230b91e0cc59d0da24dd2524d..f534c68ed4816ae536798a0827b464fccaee88a3 100644
+index b903fd1c4440a9f83b2ec513c5f38ec21b9557ef..9b9c2d727e7b0c21a03353aba6b4725e7d7c1633 100644
 --- a/amalgamation/sqlite3.c
 +++ b/amalgamation/sqlite3.c
-@@ -454,7 +454,7 @@ extern "C" {
- */
- #define SQLITE_VERSION        "3.38.5"
- #define SQLITE_VERSION_NUMBER 3038005
--#define SQLITE_SOURCE_ID      "2022-05-06 15:25:27 78d9c993d404cdfaa7fdd2973fa1052e3da9f66215cff9c5540ebe55c407d9fe"
-+#define SQLITE_SOURCE_ID      "2022-05-06 15:25:27 78d9c993d404cdfaa7fdd2973fa1052e3da9f66215cff9c5540ebe55c407alt1"
-
- /*
- ** CAPI3REF: Run-Time Library Version Numbers
-@@ -140775,7 +140775,9 @@ SQLITE_PRIVATE int sqlite3Select(
+@@ -140765,7 +140765,9 @@ SQLITE_PRIVATE int sqlite3Select(
      ){
        SELECTTRACE(0x100,pParse,p,
                  ("omit superfluous ORDER BY on %r FROM-clause subquery\n",i+1));
@@ -37,33 +28,11 @@ index 081f682bf9c3d97230b91e0cc59d0da24dd2524d..f534c68ed4816ae536798a0827b464fc
        pSub->pOrderBy = 0;
      }
 
-diff --git a/amalgamation/sqlite3.h b/amalgamation/sqlite3.h
-index de393da9dccc430bde8ad1d5e4ed94e9913a4dc1..4ef161c20403dfc7f71e9b081a3dff8b1c615506 100644
---- a/amalgamation/sqlite3.h
-+++ b/amalgamation/sqlite3.h
-@@ -148,7 +148,7 @@ extern "C" {
- */
- #define SQLITE_VERSION        "3.38.5"
- #define SQLITE_VERSION_NUMBER 3038005
--#define SQLITE_SOURCE_ID      "2022-05-06 15:25:27 78d9c993d404cdfaa7fdd2973fa1052e3da9f66215cff9c5540ebe55c407d9fe"
-+#define SQLITE_SOURCE_ID      "2022-05-06 15:25:27 78d9c993d404cdfaa7fdd2973fa1052e3da9f66215cff9c5540ebe55c407alt1"
-
- /*
- ** CAPI3REF: Run-Time Library Version Numbers
 diff --git a/amalgamation_dev/sqlite3.c b/amalgamation_dev/sqlite3.c
-index eb8d7d5cd438af3b2bb844ee2939338282090aa3..b405e1e2cf0e7cc03886a21684893eb7e04d4dfc 100644
+index 88b0bcb38e8e2f45aa449b5895bfc29baa543fea..94222875ff2d1e47370e3fa766003cfb0f8dc015 100644
 --- a/amalgamation_dev/sqlite3.c
 +++ b/amalgamation_dev/sqlite3.c
-@@ -454,7 +454,7 @@ extern "C" {
- */
- #define SQLITE_VERSION        "3.38.5"
- #define SQLITE_VERSION_NUMBER 3038005
--#define SQLITE_SOURCE_ID      "2022-05-06 15:25:27 78d9c993d404cdfaa7fdd2973fa1052e3da9f66215cff9c5540ebe55c407d9fe"
-+#define SQLITE_SOURCE_ID      "2022-05-06 15:25:27 78d9c993d404cdfaa7fdd2973fa1052e3da9f66215cff9c5540ebe55c407alt1"
-
- /*
- ** CAPI3REF: Run-Time Library Version Numbers
-@@ -140788,7 +140788,9 @@ SQLITE_PRIVATE int sqlite3Select(
+@@ -140778,7 +140778,9 @@ SQLITE_PRIVATE int sqlite3Select(
      ){
        SELECTTRACE(0x100,pParse,p,
                  ("omit superfluous ORDER BY on %r FROM-clause subquery\n",i+1));
@@ -74,19 +43,6 @@ index eb8d7d5cd438af3b2bb844ee2939338282090aa3..b405e1e2cf0e7cc03886a21684893eb7
        pSub->pOrderBy = 0;
      }
 
-diff --git a/amalgamation_dev/sqlite3.h b/amalgamation_dev/sqlite3.h
-index de393da9dccc430bde8ad1d5e4ed94e9913a4dc1..4ef161c20403dfc7f71e9b081a3dff8b1c615506 100644
---- a/amalgamation_dev/sqlite3.h
-+++ b/amalgamation_dev/sqlite3.h
-@@ -148,7 +148,7 @@ extern "C" {
- */
- #define SQLITE_VERSION        "3.38.5"
- #define SQLITE_VERSION_NUMBER 3038005
--#define SQLITE_SOURCE_ID      "2022-05-06 15:25:27 78d9c993d404cdfaa7fdd2973fa1052e3da9f66215cff9c5540ebe55c407d9fe"
-+#define SQLITE_SOURCE_ID      "2022-05-06 15:25:27 78d9c993d404cdfaa7fdd2973fa1052e3da9f66215cff9c5540ebe55c407alt1"
-
- /*
- ** CAPI3REF: Run-Time Library Version Numbers
 diff --git a/src/select.c b/src/select.c
 index d6d6097401a748bf1b8268deb8a66daf23f4ea7c..ad7635f76c29c7a7206920947f9ea21626faf0ab 100644
 --- a/src/select.c