Commit 0296a6ef authored by ElenaSubbotina's avatar ElenaSubbotina

fix bug #35681

parent dcee1127
...@@ -249,10 +249,6 @@ int FDB::serialize(std::wostream & strm, bool bSql) ...@@ -249,10 +249,6 @@ int FDB::serialize(std::wostream & strm, bool bSql)
// CP_XML_ATTR(L"containsString", 0); // CP_XML_ATTR(L"containsString", 0);
// } // }
//} //}
if (bInteger && bNumber)
{
bInteger = false;
}
if ((bDate & bNumber) || (bNumber & bString)) if ((bDate & bNumber) || (bNumber & bString))
{ {
...@@ -278,7 +274,20 @@ int FDB::serialize(std::wostream & strm, bool bSql) ...@@ -278,7 +274,20 @@ int FDB::serialize(std::wostream & strm, bool bSql)
if (bEmpty) CP_XML_ATTR(L"containsBlank", 1); if (bEmpty) CP_XML_ATTR(L"containsBlank", 1);
if (bNumber) CP_XML_ATTR(L"containsNumber", 1); if (bNumber) CP_XML_ATTR(L"containsNumber", 1);
if (bInteger && !bDate & bString) CP_XML_ATTR(L"containsInteger", 1);
if (bInteger && !bDate)
{
if (bString)
{
CP_XML_ATTR(L"containsInteger", 1);
}
else if (!bNumber)
{
CP_XML_ATTR(L"containsNumber", 1);
CP_XML_ATTR(L"containsInteger", 1);
}
}
if (fdb->fnumMinMaxValid) if (fdb->fnumMinMaxValid)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment