diff --git a/build/AgaLib.vcxproj b/build/AgaLib.vcxproj
index 0742ae91d..f18fa04a1 100644
--- a/build/AgaLib.vcxproj
+++ b/build/AgaLib.vcxproj
@@ -186,6 +186,7 @@
+
diff --git a/build/AgaLib.vcxproj.filters b/build/AgaLib.vcxproj.filters
index 92caaf358..0cbdf75e1 100644
--- a/build/AgaLib.vcxproj.filters
+++ b/build/AgaLib.vcxproj.filters
@@ -538,6 +538,9 @@
Headers
+
+ Headers
+
diff --git a/build/cg.sln b/build/cg.sln
index c6b630b92..40dd7fae5 100644
--- a/build/cg.sln
+++ b/build/cg.sln
@@ -27,8 +27,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Cg7", "Cg7.vcxproj", "{95FE
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AgaLib", "AgaLib.vcxproj", "{2D38A763-3D74-4338-9362-B891784EC90E}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fplib", "fplib.vcxproj", "{C575788B-0BE4-4F68-B9C9-3C204EC04E07}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "f1lib", "f1lib.vcxproj", "{41F4C25F-6BD2-4FC9-A0D3-A68CD1C9E4FC}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vedoc", "vedoc.vcxproj", "{A1CE9743-A597-4F92-B55A-345A366C9E55}"
@@ -39,6 +37,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vedocext", "vedocext.vcxpro
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cglib", "cglib.vcxproj", "{7B80F974-CE2E-4BD9-855A-44FF139FF288}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fplib", "fplib.vcxproj", "{C575788B-0BE4-4F68-B9C9-3C204EC04E07}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -85,10 +85,6 @@ Global
{2D38A763-3D74-4338-9362-B891784EC90E}.Debug|Win32.Build.0 = Debug|Win32
{2D38A763-3D74-4338-9362-B891784EC90E}.Release|Win32.ActiveCfg = Release|Win32
{2D38A763-3D74-4338-9362-B891784EC90E}.Release|Win32.Build.0 = Release|Win32
- {C575788B-0BE4-4F68-B9C9-3C204EC04E07}.Debug|Win32.ActiveCfg = Debug|Win32
- {C575788B-0BE4-4F68-B9C9-3C204EC04E07}.Debug|Win32.Build.0 = Debug|Win32
- {C575788B-0BE4-4F68-B9C9-3C204EC04E07}.Release|Win32.ActiveCfg = Release|Win32
- {C575788B-0BE4-4F68-B9C9-3C204EC04E07}.Release|Win32.Build.0 = Release|Win32
{41F4C25F-6BD2-4FC9-A0D3-A68CD1C9E4FC}.Debug|Win32.ActiveCfg = Debug|Win32
{41F4C25F-6BD2-4FC9-A0D3-A68CD1C9E4FC}.Debug|Win32.Build.0 = Debug|Win32
{41F4C25F-6BD2-4FC9-A0D3-A68CD1C9E4FC}.Release|Win32.ActiveCfg = Release|Win32
@@ -109,6 +105,10 @@ Global
{7B80F974-CE2E-4BD9-855A-44FF139FF288}.Debug|Win32.Build.0 = Debug|Win32
{7B80F974-CE2E-4BD9-855A-44FF139FF288}.Release|Win32.ActiveCfg = Release|Win32
{7B80F974-CE2E-4BD9-855A-44FF139FF288}.Release|Win32.Build.0 = Release|Win32
+ {C575788B-0BE4-4F68-B9C9-3C204EC04E07}.Debug|Win32.ActiveCfg = Debug|Win32
+ {C575788B-0BE4-4F68-B9C9-3C204EC04E07}.Debug|Win32.Build.0 = Debug|Win32
+ {C575788B-0BE4-4F68-B9C9-3C204EC04E07}.Release|Win32.ActiveCfg = Release|Win32
+ {C575788B-0BE4-4F68-B9C9-3C204EC04E07}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/build/setup.vcxproj b/build/setup.vcxproj
index 2cbe2d275..d69d3cceb 100644
--- a/build/setup.vcxproj
+++ b/build/setup.vcxproj
@@ -61,7 +61,6 @@
Default
MultiThreadedDebug
NotUsing
-
Level3
ProgramDatabase
true
@@ -291,15 +290,6 @@
true
-
-
- Document
- dncrypt %(FullPath) $(TargetDir)%(FileName).zip
- $(TargetDir)%(FileName).zip
- dncrypt %(FullPath) $(TargetDir)%(Filename).zip
- $(TargetDir)%(Filename).zip
-
-
diff --git a/build/setup.vcxproj.filters b/build/setup.vcxproj.filters
index 3f3c24115..62ee4a03c 100644
--- a/build/setup.vcxproj.filters
+++ b/build/setup.vcxproj.filters
@@ -16,9 +16,6 @@
{18793e00-9586-46b2-a2e5-7da381a369df}
-
- {8092c16a-242b-4c96-aa9b-e3b8cc4ec586}
-
{aebe04a0-bdea-4877-a1a1-012ce9434862}
lib
@@ -124,9 +121,4 @@
Library Files
-
-
- Txt
-
-
\ No newline at end of file
diff --git a/build/tf.sln b/build/tf.sln
index 08f7d93ad..1dec7e2bf 100644
--- a/build/tf.sln
+++ b/build/tf.sln
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.0.32126.317
+# Visual Studio 15
+VisualStudioVersion = 15.0.34320.172
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tf0", "tf0.vcxproj", "{9C91BACF-9A70-4973-B8CC-FA3D2AF9867C}"
ProjectSection(ProjectDependencies) = postProject
diff --git a/build/ve1.vcxproj b/build/ve1.vcxproj
index a88816fde..7b0d33092 100644
--- a/build/ve1.vcxproj
+++ b/build/ve1.vcxproj
@@ -193,12 +193,6 @@
-
- %(AdditionalIncludeDirectories)
- %(PreprocessorDefinitions)
- %(AdditionalIncludeDirectories)
- %(PreprocessorDefinitions)
-
%(AdditionalIncludeDirectories)
%(PreprocessorDefinitions)
diff --git a/build/ve1.vcxproj.filters b/build/ve1.vcxproj.filters
index 110d82918..ee0a6a63d 100644
--- a/build/ve1.vcxproj.filters
+++ b/build/ve1.vcxproj.filters
@@ -48,9 +48,6 @@
Sources
-
- Sources
-
Sources
diff --git a/build/ve2.vcxproj b/build/ve2.vcxproj
index 51af6727a..5fd911ac3 100644
--- a/build/ve2.vcxproj
+++ b/build/ve2.vcxproj
@@ -278,7 +278,9 @@
true
true
-
+
+ true
+
diff --git a/src/fp/sql/fp0126.sql b/src/fp/sql/fp0126.sql
new file mode 100644
index 000000000..251bb53ae
--- /dev/null
+++ b/src/fp/sql/fp0126.sql
@@ -0,0 +1,4 @@
+-- DROP PAF1800_NEWDF_DTINIZ
+ALTER TABLE PAF1800F DROP CONSTRAINT PAF1800_NEWDF_DTINIZ;
+-- DROP PAF1800_NEWDF_DTFIN
+ALTER TABLE PAF1800F DROP CONSTRAINT PAF1800_NEWDF_DTFIN;
\ No newline at end of file
diff --git a/src/include/postman.cpp b/src/include/postman.cpp
index ab89c49c2..1f8470800 100755
--- a/src/include/postman.cpp
+++ b/src/include/postman.cpp
@@ -742,7 +742,10 @@ HIDDEN void odbc_send(const TString & dsn, int num, TAuto_token_string & elab_fi
}
else
check_statement << name << "';";
+
int err = recset.exec(check_statement);
+
+ message_box("%s %d", (const char *)check_statement, err);
if (err <= 0)
{
create_table(recset, curr_file_num, name, wrk);