From 3d6ea6737ca3665a744f8cb4d8920c69f05a3def Mon Sep 17 00:00:00 2001
From: Brad Chase <bchase@ripple.com>
Date: Fri, 1 Dec 2017 12:06:50 -0500
Subject: [PATCH] Update soci unity build

---
 Builds/VisualStudio2015/RippleD.vcxproj         | 12 +++++++++---
 Builds/VisualStudio2015/RippleD.vcxproj.filters | 15 ++++++++++++---
 src/ripple/unity/soci.cpp                       |  2 +-
 3 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/Builds/VisualStudio2015/RippleD.vcxproj b/Builds/VisualStudio2015/RippleD.vcxproj
index 9f3e25ebe8..948d857cfb 100644
--- a/Builds/VisualStudio2015/RippleD.vcxproj
+++ b/Builds/VisualStudio2015/RippleD.vcxproj
@@ -4067,6 +4067,8 @@
     </ClInclude>
     <ClInclude Include="..\..\src\soci\include\soci\boost-tuple.h">
     </ClInclude>
+    <ClInclude Include="..\..\src\soci\include\soci\column-info.h">
+    </ClInclude>
     <ClInclude Include="..\..\src\soci\include\soci\connection-parameters.h">
     </ClInclude>
     <ClInclude Include="..\..\src\soci\include\soci\connection-pool.h">
@@ -4107,6 +4109,8 @@
     </ClInclude>
     <ClInclude Include="..\..\src\soci\include\soci\soci-backend.h">
     </ClInclude>
+    <ClInclude Include="..\..\src\soci\include\soci\soci-config.h">
+    </ClInclude>
     <ClInclude Include="..\..\src\soci\include\soci\soci-platform.h">
     </ClInclude>
     <ClInclude Include="..\..\src\soci\include\soci\soci-simple.h">
@@ -4127,6 +4131,8 @@
     </ClInclude>
     <ClInclude Include="..\..\src\soci\include\soci\type-ptr.h">
     </ClInclude>
+    <ClInclude Include="..\..\src\soci\include\soci\type-wrappers.h">
+    </ClInclude>
     <ClInclude Include="..\..\src\soci\include\soci\unsigned-types.h">
     </ClInclude>
     <ClInclude Include="..\..\src\soci\include\soci\use-type.h">
@@ -4140,9 +4146,6 @@
     <ClCompile Include="..\..\src\soci\src\backends\sqlite3\blob.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\src\soci\src\backends\sqlite3\common.cpp">
-      <ExcludedFromBuild>True</ExcludedFromBuild>
-    </ClCompile>
     <ClInclude Include="..\..\src\soci\src\backends\sqlite3\common.h">
     </ClInclude>
     <ClCompile Include="..\..\src\soci\src\backends\sqlite3\error.cpp">
@@ -4175,6 +4178,9 @@
     <ClCompile Include="..\..\src\soci\src\core\blob.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="..\..\src\soci\src\core\common.cpp">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="..\..\src\soci\src\core\connection-parameters.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
diff --git a/Builds/VisualStudio2015/RippleD.vcxproj.filters b/Builds/VisualStudio2015/RippleD.vcxproj.filters
index 1e641ad67e..4f0da94aa8 100644
--- a/Builds/VisualStudio2015/RippleD.vcxproj.filters
+++ b/Builds/VisualStudio2015/RippleD.vcxproj.filters
@@ -4854,6 +4854,9 @@
     <ClInclude Include="..\..\src\soci\include\soci\boost-tuple.h">
       <Filter>soci\include\soci</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\soci\include\soci\column-info.h">
+      <Filter>soci\include\soci</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\src\soci\include\soci\connection-parameters.h">
       <Filter>soci\include\soci</Filter>
     </ClInclude>
@@ -4914,6 +4917,9 @@
     <ClInclude Include="..\..\src\soci\include\soci\soci-backend.h">
       <Filter>soci\include\soci</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\soci\include\soci\soci-config.h">
+      <Filter>soci\include\soci</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\src\soci\include\soci\soci-platform.h">
       <Filter>soci\include\soci</Filter>
     </ClInclude>
@@ -4944,6 +4950,9 @@
     <ClInclude Include="..\..\src\soci\include\soci\type-ptr.h">
       <Filter>soci\include\soci</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\soci\include\soci\type-wrappers.h">
+      <Filter>soci\include\soci</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\src\soci\include\soci\unsigned-types.h">
       <Filter>soci\include\soci</Filter>
     </ClInclude>
@@ -4962,9 +4971,6 @@
     <ClCompile Include="..\..\src\soci\src\backends\sqlite3\blob.cpp">
       <Filter>soci\src\backends\sqlite3</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\soci\src\backends\sqlite3\common.cpp">
-      <Filter>soci\src\backends\sqlite3</Filter>
-    </ClCompile>
     <ClInclude Include="..\..\src\soci\src\backends\sqlite3\common.h">
       <Filter>soci\src\backends\sqlite3</Filter>
     </ClInclude>
@@ -4998,6 +5004,9 @@
     <ClCompile Include="..\..\src\soci\src\core\blob.cpp">
       <Filter>soci\src\core</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\soci\src\core\common.cpp">
+      <Filter>soci\src\core</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\src\soci\src\core\connection-parameters.cpp">
       <Filter>soci\src\core</Filter>
     </ClCompile>
diff --git a/src/ripple/unity/soci.cpp b/src/ripple/unity/soci.cpp
index ea76a2dcea..d3fcf5c2c6 100644
--- a/src/ripple/unity/soci.cpp
+++ b/src/ripple/unity/soci.cpp
@@ -25,6 +25,7 @@
 #include <BeastConfig.h>
 
 // Core soci
+#include <core/common.cpp>
 #include <core/connection-parameters.cpp>
 #include <core/connection-pool.cpp>
 #include <core/error.cpp>
@@ -43,7 +44,6 @@
 #include <core/use-type.cpp>
 #include <core/values.cpp>
 
-#include <backends/sqlite3/common.cpp>
 #include <backends/sqlite3/error.cpp>
 #include <backends/sqlite3/factory.cpp>
 #include <backends/sqlite3/row-id.cpp>