Version 3.2.3

edwig · Apr 17, 2023 · c4f563c · c4f563c
1 parent a3912a8
commit c4f563c
Show file tree

Hide file tree

Showing 40 changed files with 1,524 additions and 265 deletions.
diff --git a/BaseLibrary/BaseLibrary.vcxproj b/BaseLibrary/BaseLibrary.vcxproj
@@ -153,6 +153,7 @@
     <ClInclude Include="StdException.h" />
     <ClInclude Include="StoreMessage.h" />
     <ClInclude Include="StringUtilities.h" />
+    <ClInclude Include="XSDSchema.h" />
     <ClInclude Include="XStringBuilder.h" />
     <ClInclude Include="targetver.h" />
     <ClInclude Include="unzip.h" />
@@ -233,6 +234,7 @@
     <ClCompile Include="StdException.cpp" />
     <ClCompile Include="StoreMessage.cpp" />
     <ClCompile Include="StringUtilities.cpp" />
+    <ClCompile Include="XSDSchema.cpp" />
     <ClCompile Include="XStringBuilder.cpp" />
     <ClCompile Include="unzip.cpp" />
     <ClCompile Include="WideMessageBox.cpp" />

diff --git a/BaseLibrary/BaseLibrary.vcxproj.filters b/BaseLibrary/BaseLibrary.vcxproj.filters
@@ -276,11 +276,11 @@
     <ClInclude Include="AuthenticationHeader.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="XSDSchema.h">
+      <Filter>Header Files\XML_SOAP</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="pch.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="bcd.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -485,5 +485,11 @@
     <ClCompile Include="AuthenticationHeader.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="XSDSchema.cpp">
+      <Filter>Source Files\XML_SOAP</Filter>
+    </ClCompile>
+    <ClCompile Include="pch.cpp">
+      <Filter>Configuration</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>
diff --git a/BaseLibrary/QueryReWriter.cpp b/BaseLibrary/QueryReWriter.cpp
@@ -73,6 +73,8 @@ static const char* all_tokens[] =
   ,"HAVING"
   ,"INTO"
   ,"UNION"
+  ,"STATISTICS"
+  ,"FOR"
 };
 
 // All registered SQL words including tokens and special registrations
@@ -334,21 +336,36 @@ QueryReWriter::ParseStatement(bool p_closingEscape /*= false*/)
       odbc = true;
     }
 
+    if(m_token == Token::TK_STATISTICS)
+    {
+      m_inStatement = m_token;
+      PrintToken();
+      continue;
+    }
+    if(m_token == Token::TK_FOR)
+    {
+      m_nextTable = false;
+    }
+
     // Append schema
     if(m_nextTable)
     {
       AppendSchema();
     }
 
     // Find next table for appending a schema
-    if(m_inStatement == Token::TK_SELECT && (m_token == Token::TK_FROM || m_token == Token::TK_JOIN))
+    if(m_inStatement == Token::TK_SELECT && (m_token == Token::TK_FROM || m_token == Token::TK_JOIN ))
     {
       m_nextTable = true;
       if(m_token == Token::TK_FROM)
       {
         m_inFrom = true;
       }
     }
+    if(m_inStatement == Token::TK_STATISTICS && m_token == Token::TK_FOR)
+    {
+      m_nextTable = true;
+    }
     if(m_inStatement == Token::TK_SELECT && m_inFrom && m_token == Token::TK_COMMA)
     {
       m_nextTable = true;
@@ -454,6 +471,8 @@ QueryReWriter::PrintToken()
     case Token::TK_ORDER:     [[fallthrough]];
     case Token::TK_HAVING:    [[fallthrough]];
     case Token::TK_INTO:      [[fallthrough]];
+    case Token::TK_STATISTICS:[[fallthrough]];
+    case Token::TK_FOR:       [[fallthrough]];
     case Token::TK_UNION:     m_output += all_tokens[(int)m_token];
                               break;
     case Token::TK_EOS:       break;

diff --git a/BaseLibrary/QueryReWriter.h b/BaseLibrary/QueryReWriter.h
@@ -64,6 +64,8 @@ enum class Token
  ,TK_HAVING 
  ,TK_INTO
  ,TK_UNION
+ ,TK_STATISTICS
+ ,TK_FOR
 };
 
 enum class SROption