summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmmar Askar <ammar@ammaraskar.com>2020-04-15 21:19:26 (GMT)
committerGitHub <noreply@github.com>2020-04-15 21:19:26 (GMT)
commit58d6f2ee3aeb699156d4784acccd2910d27982e7 (patch)
tree5f60674aa1b5a2a2e187b763b978856b4f8e923e
parentfbf2786c4c89430e2067016603078cf3500cfe94 (diff)
downloadcpython-58d6f2ee3aeb699156d4784acccd2910d27982e7.zip
cpython-58d6f2ee3aeb699156d4784acccd2910d27982e7.tar.gz
cpython-58d6f2ee3aeb699156d4784acccd2910d27982e7.tar.bz2
bpo-40270: Enable json extension in Windows sqlite extension (GH-19528)
-rw-r--r--Misc/NEWS.d/next/Library/2020-04-14-16-18-49.bpo-40270.XVJzeG.rst2
-rw-r--r--PCbuild/sqlite3.vcxproj2
2 files changed, 3 insertions, 1 deletions
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 0000000..c23f7c9
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2020-04-14-16-18-49.bpo-40270.XVJzeG.rst
@@ -0,0 +1,2 @@
+The included copy of sqlite3 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 90b4d31..7351a6d 100644
--- a/PCbuild/sqlite3.vcxproj
+++ b/PCbuild/sqlite3.vcxproj
@@ -98,7 +98,7 @@
<ItemDefinitionGroup>
<ClCompile>
<AdditionalIncludeDirectories>$(sqlite3Dir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>SQLITE_ENABLE_FTS4;SQLITE_ENABLE_FTS5;SQLITE_API=__declspec(dllexport);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>SQLITE_ENABLE_JSON1;SQLITE_ENABLE_FTS4;SQLITE_ENABLE_FTS5;SQLITE_API=__declspec(dllexport);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<WarningLevel>Level1</WarningLevel>
</ClCompile>
<ResourceCompile>