Skip to content

Commit d11f007

Browse files
aleks-faleks-f
committed
[SF 2580108] Improve transaction handling
1 parent ad543ac commit d11f007

41 files changed

Lines changed: 3484 additions & 2142 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Data/Data_VS71.vcproj‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -270,6 +270,9 @@
270270
<File
271271
RelativePath=".\include\Poco\Data\AbstractSessionImpl.h">
272272
</File>
273+
<File
274+
RelativePath=".\include\Poco\Data\AutoTransaction.h">
275+
</File>
273276
<File
274277
RelativePath=".\include\Poco\Data\Binder.h">
275278
</File>
@@ -366,6 +369,9 @@
366369
<File
367370
RelativePath=".\include\Poco\Data\Time.h">
368371
</File>
372+
<File
373+
RelativePath=".\include\Poco\Data\Transaction.h">
374+
</File>
369375
<File
370376
RelativePath=".\include\Poco\Data\TypeHandler.h">
371377
</File>
@@ -454,6 +460,9 @@
454460
<File
455461
RelativePath=".\src\Time.cpp">
456462
</File>
463+
<File
464+
RelativePath=".\src\Transaction.cpp">
465+
</File>
457466
</Filter>
458467
</Filter>
459468
<Filter

‎Data/Data_VS80.vcproj‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -505,6 +505,10 @@
505505
RelativePath=".\include\Poco\Data\Time.h"
506506
>
507507
</File>
508+
<File
509+
RelativePath=".\include\Poco\Data\Transaction.h"
510+
>
511+
</File>
508512
<File
509513
RelativePath=".\include\Poco\Data\TypeHandler.h"
510514
>
@@ -537,10 +541,6 @@
537541
RelativePath=".\src\AbstractPreparator.cpp"
538542
>
539543
</File>
540-
<File
541-
RelativePath=".\src\AutoTransaction.cpp"
542-
>
543-
</File>
544544
<File
545545
RelativePath=".\src\Bulk.cpp"
546546
>
@@ -625,6 +625,10 @@
625625
RelativePath=".\src\Time.cpp"
626626
>
627627
</File>
628+
<File
629+
RelativePath=".\src\Transaction.cpp"
630+
>
631+
</File>
628632
</Filter>
629633
</Filter>
630634
<Filter

‎Data/Data_VS90.vcproj‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -510,6 +510,10 @@
510510
RelativePath=".\include\Poco\Data\Time.h"
511511
>
512512
</File>
513+
<File
514+
RelativePath=".\include\Poco\Data\Transaction.h"
515+
>
516+
</File>
513517
<File
514518
RelativePath=".\include\Poco\Data\TypeHandler.h"
515519
>
@@ -542,10 +546,6 @@
542546
RelativePath=".\src\AbstractPreparator.cpp"
543547
>
544548
</File>
545-
<File
546-
RelativePath=".\src\AutoTransaction.cpp"
547-
>
548-
</File>
549549
<File
550550
RelativePath=".\src\Bulk.cpp"
551551
>
@@ -630,6 +630,10 @@
630630
RelativePath=".\src\Time.cpp"
631631
>
632632
</File>
633+
<File
634+
RelativePath=".\src\Transaction.cpp"
635+
>
636+
</File>
633637
</Filter>
634638
</Filter>
635639
<Filter

‎Data/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
include $(POCO_BASE)/build/rules/global
1010

1111
objects = AbstractBinder AbstractBinding AbstractExtraction AbstractExtractor \
12-
AbstractPreparation AbstractPreparator ArchiveStrategy AutoTransaction \
12+
AbstractPreparation AbstractPreparator ArchiveStrategy Transaction \
1313
Bulk Connector DataException Date Limit MetaColumn \
1414
PooledSessionHolder PooledSessionImpl Position \
1515
Range RecordSet Row RowFilter RowFormatter RowIterator \

‎Data/MySQL/MySQL_VS90.sln‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ Microsoft Visual Studio Solution File, Format Version 10.00
44
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MySQL", "MySQL_VS90.vcproj", "{D9C692A6-D089-4269-B444-C445ED192F0D}"
55
EndProject
66
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_VS90.vcproj", "{1B30A91B-375F-11DB-837B-00123FC423B5}"
7+
ProjectSection(ProjectDependencies) = postProject
8+
{D9C692A6-D089-4269-B444-C445ED192F0D} = {D9C692A6-D089-4269-B444-C445ED192F0D}
9+
EndProjectSection
710
EndProject
811
Global
912
GlobalSection(SolutionConfigurationPlatforms) = preSolution

‎Data/MySQL/MySQL_VS90.vcproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
<Tool
4242
Name="VCCLCompilerTool"
4343
Optimization="0"
44-
AdditionalIncludeDirectories=".\include;.\src;..\..\Foundation\include;..\..\Data\include"
44+
AdditionalIncludeDirectories=".\include;.\src;..\..\Foundation\include;..\..\Data\include;.\include\Poco\Data\MySQL\mysql"
4545
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MYSQL_EXPORTS;POCO_DLL;NO_TCL;THREADSAFE;__LCC__"
4646
MinimalRebuild="true"
4747
BasicRuntimeChecks="3"

‎Data/MySQL/include/Poco/Data/MySQL/SessionHandle.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ class SessionHandle
8989

9090
private:
9191

92-
MYSQL* h;
92+
MYSQL* _pHandle;
9393
};
9494

9595

@@ -99,7 +99,7 @@ class SessionHandle
9999

100100
inline SessionHandle::operator MYSQL* ()
101101
{
102-
return h;
102+
return _pHandle;
103103
}
104104

105105

0 commit comments

Comments
 (0)