Skip to content

Commit 0a61d7a

Browse files
aleks-faleks-f
committed
GH pocoproject#154 Add support for MYSQL_TYPE_NEWDECIMAL
GH pocoproject#154 Add support for MYSQL_TYPE_NEWDECIMAL to Poco::Data::MySQL
1 parent abce28b commit 0a61d7a

File tree

6 files changed

+84
-79
lines changed

6 files changed

+84
-79
lines changed

‎CHANGELOG‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ Release 1.5.3 (2014-05-xx)
6666
- added SevenZip library (Guenter Obiltschnig)
6767
- fixed GH #442: Use correct prefix length field of Windows IP_ADAPTER_PREFIX structure
6868
- improved GH #328: NetworkInterface on Windows XP
69+
- fixed GH #154 Add support for MYSQL_TYPE_NEWDECIMAL to Poco::Data::MySQL
6970

7071
Release 1.5.2 (2013-09-16)
7172
==========================

‎Data/MySQL/MySQL_x64_vs120.vcxproj‎

Lines changed: 46 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
44
<ProjectConfiguration Include="debug_shared|x64">
@@ -32,7 +32,7 @@
3232
<RootNamespace>MySQL</RootNamespace>
3333
<Keyword>Win32Proj</Keyword>
3434
</PropertyGroup>
35-
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props"/>
35+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
3636
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="Configuration">
3737
<ConfigurationType>StaticLibrary</ConfigurationType>
3838
<CharacterSet>MultiByte</CharacterSet>
@@ -63,27 +63,27 @@
6363
<CharacterSet>MultiByte</CharacterSet>
6464
<PlatformToolset>v120</PlatformToolset>
6565
</PropertyGroup>
66-
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props"/>
67-
<ImportGroup Label="ExtensionSettings"/>
66+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
67+
<ImportGroup Label="ExtensionSettings" />
6868
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="PropertySheets">
69-
<Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
69+
<Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
7070
</ImportGroup>
7171
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'" Label="PropertySheets">
72-
<Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
72+
<Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
7373
</ImportGroup>
7474
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'" Label="PropertySheets">
75-
<Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
75+
<Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
7676
</ImportGroup>
7777
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'" Label="PropertySheets">
78-
<Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
78+
<Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
7979
</ImportGroup>
8080
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'" Label="PropertySheets">
81-
<Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
81+
<Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
8282
</ImportGroup>
8383
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'" Label="PropertySheets">
84-
<Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
84+
<Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
8585
</ImportGroup>
86-
<PropertyGroup Label="UserMacros"/>
86+
<PropertyGroup Label="UserMacros" />
8787
<PropertyGroup>
8888
<_ProjectFileVersion>11.0.61030.0</_ProjectFileVersion>
8989
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">PocoDataMySQL64d</TargetName>
@@ -97,6 +97,8 @@
9797
<OutDir>..\..\bin64\</OutDir>
9898
<IntDir>obj64\$(Configuration)\</IntDir>
9999
<LinkIncremental>true</LinkIncremental>
100+
<IncludePath>%MYSQL_BASE%\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
101+
<LibraryPath>%MYSQL_BASE%\lib;$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);</LibraryPath>
100102
</PropertyGroup>
101103
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">
102104
<OutDir>..\..\bin64\</OutDir>
@@ -132,7 +134,7 @@
132134
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
133135
<ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
134136
<RuntimeTypeInfo>true</RuntimeTypeInfo>
135-
<PrecompiledHeader/>
137+
<PrecompiledHeader />
136138
<WarningLevel>Level3</WarningLevel>
137139
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
138140
<CompileAs>Default</CompileAs>
@@ -164,9 +166,9 @@
164166
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
165167
<ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
166168
<RuntimeTypeInfo>true</RuntimeTypeInfo>
167-
<PrecompiledHeader/>
169+
<PrecompiledHeader />
168170
<WarningLevel>Level3</WarningLevel>
169-
<DebugInformationFormat/>
171+
<DebugInformationFormat />
170172
<CompileAs>Default</CompileAs>
171173
</ClCompile>
172174
<Link>
@@ -195,7 +197,7 @@
195197
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
196198
<ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
197199
<RuntimeTypeInfo>true</RuntimeTypeInfo>
198-
<PrecompiledHeader/>
200+
<PrecompiledHeader />
199201
<ProgramDataBaseFileName>..\..\lib64\PocoDataMySQLmtd.pdb</ProgramDataBaseFileName>
200202
<WarningLevel>Level3</WarningLevel>
201203
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -220,9 +222,9 @@
220222
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
221223
<ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
222224
<RuntimeTypeInfo>true</RuntimeTypeInfo>
223-
<PrecompiledHeader/>
225+
<PrecompiledHeader />
224226
<WarningLevel>Level3</WarningLevel>
225-
<DebugInformationFormat/>
227+
<DebugInformationFormat />
226228
<CompileAs>Default</CompileAs>
227229
</ClCompile>
228230
<Lib>
@@ -242,7 +244,7 @@
242244
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
243245
<ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
244246
<RuntimeTypeInfo>true</RuntimeTypeInfo>
245-
<PrecompiledHeader/>
247+
<PrecompiledHeader />
246248
<ProgramDataBaseFileName>..\..\lib64\PocoDataMySQLmdd.pdb</ProgramDataBaseFileName>
247249
<WarningLevel>Level3</WarningLevel>
248250
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -267,40 +269,40 @@
267269
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
268270
<ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
269271
<RuntimeTypeInfo>true</RuntimeTypeInfo>
270-
<PrecompiledHeader/>
272+
<PrecompiledHeader />
271273
<WarningLevel>Level3</WarningLevel>
272-
<DebugInformationFormat/>
274+
<DebugInformationFormat />
273275
<CompileAs>Default</CompileAs>
274276
</ClCompile>
275277
<Lib>
276278
<OutputFile>..\..\lib64\PocoDataMySQLmd.lib</OutputFile>
277279
</Lib>
278280
</ItemDefinitionGroup>
279281
<ItemGroup>
280-
<ClCompile Include="src\Binder.cpp"/>
281-
<ClCompile Include="src\Connector.cpp"/>
282-
<ClCompile Include="src\Extractor.cpp"/>
283-
<ClCompile Include="src\MySQLException.cpp"/>
284-
<ClCompile Include="src\MySQLStatementImpl.cpp"/>
285-
<ClCompile Include="src\ResultMetadata.cpp"/>
286-
<ClCompile Include="src\SessionHandle.cpp"/>
287-
<ClCompile Include="src\SessionImpl.cpp"/>
288-
<ClCompile Include="src\StatementExecutor.cpp"/>
289-
<ClCompile Include="src\Utility.cpp"/>
282+
<ClCompile Include="src\Binder.cpp" />
283+
<ClCompile Include="src\Connector.cpp" />
284+
<ClCompile Include="src\Extractor.cpp" />
285+
<ClCompile Include="src\MySQLException.cpp" />
286+
<ClCompile Include="src\MySQLStatementImpl.cpp" />
287+
<ClCompile Include="src\ResultMetadata.cpp" />
288+
<ClCompile Include="src\SessionHandle.cpp" />
289+
<ClCompile Include="src\SessionImpl.cpp" />
290+
<ClCompile Include="src\StatementExecutor.cpp" />
291+
<ClCompile Include="src\Utility.cpp" />
290292
</ItemGroup>
291293
<ItemGroup>
292-
<ClInclude Include="include\Poco\Data\MySQL\Binder.h"/>
293-
<ClInclude Include="include\Poco\Data\MySQL\Connector.h"/>
294-
<ClInclude Include="include\Poco\Data\MySQL\Extractor.h"/>
295-
<ClInclude Include="include\Poco\Data\MySQL\MySQL.h"/>
296-
<ClInclude Include="include\Poco\Data\MySQL\MySQLException.h"/>
297-
<ClInclude Include="include\Poco\Data\MySQL\MySQLStatementImpl.h"/>
298-
<ClInclude Include="include\Poco\Data\MySQL\ResultMetadata.h"/>
299-
<ClInclude Include="include\Poco\Data\MySQL\SessionHandle.h"/>
300-
<ClInclude Include="include\Poco\Data\MySQL\SessionImpl.h"/>
301-
<ClInclude Include="include\Poco\Data\MySQL\StatementExecutor.h"/>
302-
<ClInclude Include="include\Poco\Data\MySQL\Utility.h"/>
294+
<ClInclude Include="include\Poco\Data\MySQL\Binder.h" />
295+
<ClInclude Include="include\Poco\Data\MySQL\Connector.h" />
296+
<ClInclude Include="include\Poco\Data\MySQL\Extractor.h" />
297+
<ClInclude Include="include\Poco\Data\MySQL\MySQL.h" />
298+
<ClInclude Include="include\Poco\Data\MySQL\MySQLException.h" />
299+
<ClInclude Include="include\Poco\Data\MySQL\MySQLStatementImpl.h" />
300+
<ClInclude Include="include\Poco\Data\MySQL\ResultMetadata.h" />
301+
<ClInclude Include="include\Poco\Data\MySQL\SessionHandle.h" />
302+
<ClInclude Include="include\Poco\Data\MySQL\SessionImpl.h" />
303+
<ClInclude Include="include\Poco\Data\MySQL\StatementExecutor.h" />
304+
<ClInclude Include="include\Poco\Data\MySQL\Utility.h" />
303305
</ItemGroup>
304-
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>
305-
<ImportGroup Label="ExtensionTargets"/>
306-
</Project>
306+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
307+
<ImportGroup Label="ExtensionTargets" />
308+
</Project>

‎Data/MySQL/src/ResultMetadata.cpp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,8 @@ namespace
104104
case MYSQL_TYPE_FLOAT:
105105
return Poco::Data::MetaColumn::FDT_FLOAT;
106106

107+
case MYSQL_TYPE_DECIMAL:
108+
case MYSQL_TYPE_NEWDECIMAL:
107109
case MYSQL_TYPE_DOUBLE:
108110
return Poco::Data::MetaColumn::FDT_DOUBLE;
109111

‎Data/MySQL/testsuite/TestSuite_x64_vs120.vcxproj‎

Lines changed: 32 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
44
<ProjectConfiguration Include="debug_shared|x64">
@@ -32,7 +32,7 @@
3232
<RootNamespace>TestSuite</RootNamespace>
3333
<Keyword>Win32Proj</Keyword>
3434
</PropertyGroup>
35-
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props"/>
35+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
3636
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="Configuration">
3737
<ConfigurationType>Application</ConfigurationType>
3838
<CharacterSet>MultiByte</CharacterSet>
@@ -63,27 +63,27 @@
6363
<CharacterSet>MultiByte</CharacterSet>
6464
<PlatformToolset>v120</PlatformToolset>
6565
</PropertyGroup>
66-
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props"/>
67-
<ImportGroup Label="ExtensionSettings"/>
66+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
67+
<ImportGroup Label="ExtensionSettings" />
6868
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="PropertySheets">
69-
<Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
69+
<Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
7070
</ImportGroup>
7171
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'" Label="PropertySheets">
72-
<Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
72+
<Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
7373
</ImportGroup>
7474
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'" Label="PropertySheets">
75-
<Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
75+
<Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
7676
</ImportGroup>
7777
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'" Label="PropertySheets">
78-
<Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
78+
<Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
7979
</ImportGroup>
8080
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'" Label="PropertySheets">
81-
<Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
81+
<Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
8282
</ImportGroup>
8383
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'" Label="PropertySheets">
84-
<Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
84+
<Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
8585
</ImportGroup>
86-
<PropertyGroup Label="UserMacros"/>
86+
<PropertyGroup Label="UserMacros" />
8787
<PropertyGroup>
8888
<_ProjectFileVersion>11.0.61030.0</_ProjectFileVersion>
8989
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">TestSuited</TargetName>
@@ -97,6 +97,8 @@
9797
<OutDir>bin64\</OutDir>
9898
<IntDir>obj64\$(Configuration)\</IntDir>
9999
<LinkIncremental>true</LinkIncremental>
100+
<IncludePath>%MYSQL_BASE%\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
101+
<LibraryPath>%MYSQL_BASE%\lib;$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);</LibraryPath>
100102
</PropertyGroup>
101103
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">
102104
<OutDir>bin64\</OutDir>
@@ -136,7 +138,7 @@
136138
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
137139
<ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
138140
<RuntimeTypeInfo>true</RuntimeTypeInfo>
139-
<PrecompiledHeader/>
141+
<PrecompiledHeader />
140142
<WarningLevel>Level3</WarningLevel>
141143
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
142144
<CompileAs>Default</CompileAs>
@@ -167,9 +169,9 @@
167169
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
168170
<ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
169171
<RuntimeTypeInfo>true</RuntimeTypeInfo>
170-
<PrecompiledHeader/>
172+
<PrecompiledHeader />
171173
<WarningLevel>Level3</WarningLevel>
172-
<DebugInformationFormat/>
174+
<DebugInformationFormat />
173175
<CompileAs>Default</CompileAs>
174176
</ClCompile>
175177
<Link>
@@ -196,7 +198,7 @@
196198
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
197199
<ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
198200
<RuntimeTypeInfo>true</RuntimeTypeInfo>
199-
<PrecompiledHeader/>
201+
<PrecompiledHeader />
200202
<WarningLevel>Level3</WarningLevel>
201203
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
202204
<CompileAs>Default</CompileAs>
@@ -227,9 +229,9 @@
227229
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
228230
<ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
229231
<RuntimeTypeInfo>true</RuntimeTypeInfo>
230-
<PrecompiledHeader/>
232+
<PrecompiledHeader />
231233
<WarningLevel>Level3</WarningLevel>
232-
<DebugInformationFormat/>
234+
<DebugInformationFormat />
233235
<CompileAs>Default</CompileAs>
234236
</ClCompile>
235237
<Link>
@@ -256,7 +258,7 @@
256258
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
257259
<ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
258260
<RuntimeTypeInfo>true</RuntimeTypeInfo>
259-
<PrecompiledHeader/>
261+
<PrecompiledHeader />
260262
<WarningLevel>Level3</WarningLevel>
261263
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
262264
<CompileAs>Default</CompileAs>
@@ -287,9 +289,9 @@
287289
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
288290
<ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
289291
<RuntimeTypeInfo>true</RuntimeTypeInfo>
290-
<PrecompiledHeader/>
292+
<PrecompiledHeader />
291293
<WarningLevel>Level3</WarningLevel>
292-
<DebugInformationFormat/>
294+
<DebugInformationFormat />
293295
<CompileAs>Default</CompileAs>
294296
</ClCompile>
295297
<Link>
@@ -304,16 +306,16 @@
304306
</Link>
305307
</ItemDefinitionGroup>
306308
<ItemGroup>
307-
<ClInclude Include="src\MySQLTest.h"/>
308-
<ClInclude Include="src\SQLExecutor.h"/>
309-
<ClInclude Include="src\MySQLTestSuite.h"/>
309+
<ClInclude Include="src\MySQLTest.h" />
310+
<ClInclude Include="src\SQLExecutor.h" />
311+
<ClInclude Include="src\MySQLTestSuite.h" />
310312
</ItemGroup>
311313
<ItemGroup>
312-
<ClCompile Include="src\MySQLTest.cpp"/>
313-
<ClCompile Include="src\SQLExecutor.cpp"/>
314-
<ClCompile Include="src\MySQLTestSuite.cpp"/>
315-
<ClCompile Include="src\Driver.cpp"/>
314+
<ClCompile Include="src\MySQLTest.cpp" />
315+
<ClCompile Include="src\SQLExecutor.cpp" />
316+
<ClCompile Include="src\MySQLTestSuite.cpp" />
317+
<ClCompile Include="src\Driver.cpp" />
316318
</ItemGroup>
317-
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>
318-
<ImportGroup Label="ExtensionTargets"/>
319-
</Project>
319+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
320+
<ImportGroup Label="ExtensionTargets" />
321+
</Project>

‎Data/MySQL/testsuite/TestSuite_x64_vs120.vcxproj.filters‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,6 @@
4747
<ClCompile Include="src\MySQLTestSuite.cpp">
4848
<Filter>_Suite\Source Files</Filter>
4949
</ClCompile>
50-
<ClCompile Include="src\WinDriver.cpp">
51-
<Filter>_Driver\Source Files</Filter>
52-
</ClCompile>
50+
<ClCompile Include="src\Driver.cpp" />
5351
</ItemGroup>
5452
</Project>

‎buildwin.ps1‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,8 @@ function Set-Environment
111111
$Env:MYSQL_DIR = "$mysql_base"
112112
$Env:MYSQL_INCLUDE = "$Env:MYSQL_DIR\include"
113113
$Env:MYSQL_LIB = "$Env:MYSQL_DIR\lib"
114-
Add-Env-Var "MYSQL", "INCLUDE"
115-
Add-Env-Var "MYSQL", "LIB"
114+
Add-Env-Var "MYSQL" "INCLUDE"
115+
Add-Env-Var "MYSQL" "LIB"
116116
}
117117

118118
$vsct = "VS$($vs_version)COMNTOOLS"

0 commit comments

Comments
 (0)