From 49bf6b777893120b0b3452eb2762a765e3bed3f8 Mon Sep 17 00:00:00 2001 From: Ammar Askar Date: Tue, 14 Apr 2020 16:16:19 -0700 Subject: [PATCH 1/2] bpo-40270: Enable json extension in windows sqlite extension --- .../next/Library/2020-04-14-16-18-49.bpo-40270.XVJzeG.rst | 2 ++ PCbuild/sqlite3.vcxproj | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 Misc/NEWS.d/next/Library/2020-04-14-16-18-49.bpo-40270.XVJzeG.rst diff --git a/Misc/NEWS.d/next/Library/2020-04-14-16-18-49.bpo-40270.XVJzeG.rst b/Misc/NEWS.d/next/Library/2020-04-14-16-18-49.bpo-40270.XVJzeG.rst new file mode 100644 index 00000000000000..0aa42d8dfd054e --- /dev/null +++ b/Misc/NEWS.d/next/Library/2020-04-14-16-18-49.bpo-40270.XVJzeG.rst @@ -0,0 +1,2 @@ +The in-built sqlite extension on Windows is now compiled with the json +extension. This allows the use of functions such as ``json_object``. diff --git a/PCbuild/sqlite3.vcxproj b/PCbuild/sqlite3.vcxproj index 90b4d3108fa557..7351a6dda2c763 100644 --- a/PCbuild/sqlite3.vcxproj +++ b/PCbuild/sqlite3.vcxproj @@ -98,7 +98,7 @@ $(sqlite3Dir);%(AdditionalIncludeDirectories) - SQLITE_ENABLE_FTS4;SQLITE_ENABLE_FTS5;SQLITE_API=__declspec(dllexport);%(PreprocessorDefinitions) + SQLITE_ENABLE_JSON1;SQLITE_ENABLE_FTS4;SQLITE_ENABLE_FTS5;SQLITE_API=__declspec(dllexport);%(PreprocessorDefinitions) Level1 From b22b71953c7fba60c34048da9eac755693b635a9 Mon Sep 17 00:00:00 2001 From: Ammar Askar Date: Wed, 15 Apr 2020 13:55:13 -0700 Subject: [PATCH 2/2] Improve wording of NEWS entry --- .../next/Library/2020-04-14-16-18-49.bpo-40270.XVJzeG.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Misc/NEWS.d/next/Library/2020-04-14-16-18-49.bpo-40270.XVJzeG.rst b/Misc/NEWS.d/next/Library/2020-04-14-16-18-49.bpo-40270.XVJzeG.rst index 0aa42d8dfd054e..c23f7c9d37d989 100644 --- a/Misc/NEWS.d/next/Library/2020-04-14-16-18-49.bpo-40270.XVJzeG.rst +++ b/Misc/NEWS.d/next/Library/2020-04-14-16-18-49.bpo-40270.XVJzeG.rst @@ -1,2 +1,2 @@ -The in-built sqlite extension on Windows is now compiled with the json +The included copy of sqlite3 on Windows is now compiled with the json extension. This allows the use of functions such as ``json_object``.