Merge branch 'development'

Author: kritikov

SQLParser/Translators/BaseTranslator.cs

@@ -297,6 +297,11 @@ public virtual FlowDocument GetFlowDocument(string text) {
             return document;
         }
 
+        /// <summary>
+        /// formats the final text to a Paragraph of FlowDocument with colors and styles
+        /// </summary>
+        /// <param name="text"></param>
+        /// <returns></returns>
         private Paragraph Format(string text) {
             Paragraph paragraph = new Paragraph();
 
@@ -1500,6 +1505,9 @@ public virtual string BinaryExpressionParse(BinaryExpression expression, object
                 else if (expression.FirstExpression is CastCall castCall1) {
                     firstExpression = CastCallParse(castCall1);
                 } 
+                else if (expression.FirstExpression is FunctionCall functionCall1) {
+                    firstExpression = FunctionCallParse(functionCall1);
+                } 
                 else {
                     firstExpression = "~UNKNOWN ScalarExpression~";
                 }
@@ -1528,6 +1536,9 @@ public virtual string BinaryExpressionParse(BinaryExpression expression, object
                 else if (expression.SecondExpression is CastCall castCall2) {
                     secondExpression = CastCallParse(castCall2);
                 } 
+                else if (expression.SecondExpression is FunctionCall functionCall2) {
+                    secondExpression = FunctionCallParse(functionCall2);
+                } 
                 else {
                     secondExpression = "~UNKNOWN ScalarExpression~";
                 }

SQLParser/Translators/SqlOMTranslator.cs

@@ -193,6 +193,11 @@ public virtual FlowDocument GetFlowDocument(string text) {
             return document;
         }
 
+        /// <summary>
+        /// formats the final text to a Paragraph of FlowDocument with colors and styles
+        /// </summary>
+        /// <param name="text"></param>
+        /// <returns></returns>
         public virtual Paragraph Format(string text, ref bool isText) {
             Paragraph paragraph = new Paragraph();
 

SQLTailor/MainWindow.xaml.cs

@@ -481,9 +481,9 @@ private void Window_Loaded(object sender, RoutedEventArgs e) {
 
         private void AnalyzeSql(object sender, RoutedEventArgs e) {
 
-            if (string.IsNullOrWhiteSpace(sqlSource)) {
-                return;
-            }
+            //if (string.IsNullOrWhiteSpace(sqlSource)) {
+            //    return;
+            //}
 
             try {
                 Mouse.OverrideCursor = Cursors.Wait;
@@ -585,7 +585,10 @@ private void ClearEditor(object sender, RoutedEventArgs e) {
         }
 
         private void CopyFromEditor(object sender, RoutedEventArgs e) {
-            Copy(sqlSource);
+
+            FlowDocument document = SQLSourceEditor.Document;
+            string source = new TextRange(document.ContentStart, document.ContentEnd).Text;
+            Copy(source);
         }
 
         private void CopyMicrosoftTSQL(object sender, RoutedEventArgs e) {
@@ -1006,7 +1009,7 @@ private void FillParserQueryParametersFromList() {
         /// </summary>
         /// <param name="text"></param>
         private void Copy(string text) {
-            Clipboard.SetText(sqlSource);
+            Clipboard.SetText(text);
             Message = "query copied";
         }
 
@@ -1015,6 +1018,11 @@ private void Copy(string text) {
         /// </summary>
         /// <param name="document"></param>
         private void Copy(FlowDocument document) {
+
+            if (document == null) {
+                document = new FlowDocument();
+            }
+
             TextRange range = new TextRange(document.ContentStart, document.ContentEnd);
 
             using (Stream stream = new MemoryStream()) {
@@ -1024,9 +1032,8 @@ private void Copy(FlowDocument document) {
             Message = "query copied";
         }
 
-
         #endregion
 
-        
+ 
     }
 }