Automatically wrap Query objects when specified in a column

danielgindi · Dec 18, 2015 · 09f7ae0 · 09f7ae0
1 parent 9aef66e
commit 09f7ae0
Showing 1 changed file with 30 additions and 10 deletions.
diff --git a/dg.Sql/Sql/Query/Query.cs b/dg.Sql/Sql/Query/Query.cs
@@ -263,17 +263,41 @@ public static string PrepareColumnValue(TableSchema.Column ColumnDefinition, obj
         /// <param name="Connection">A connector to use. Mandatory.</param>
         public static void PrepareColumnValue(TableSchema.Column ColumnDefinition, object Value, StringBuilder OutputBuilder, ConnectorBase Connection)
         {
-            if (ColumnDefinition == null)
+            if (Value == null)
             {
-                OutputBuilder.Append(Connection.PrepareValue(Value));
+                OutputBuilder.Append(@"NULL");
                 return;
             }
-            if (Value == null)
+
+            if (Value is dg.Sql.IPhrase)
             {
-                OutputBuilder.Append(@"NULL");
+                // Output the complete phrase
+
+                OutputBuilder.Append(((dg.Sql.IPhrase)Value).BuildPhrase(Connection));
+
+                return;
+            }
+
+            if (Value is dg.Sql.Query)
+            {
+                // Output a properly wrapped query
+
+                OutputBuilder.Append("(" + ((dg.Sql.Query)Value).BuildCommand(Connection) + ")");
+
+                return;
+            }
+
+            if (ColumnDefinition == null)
+            {
+                // No definition to match against,
+                // so just prepare the value as it is, output it and return
+
+                OutputBuilder.Append(Connection.PrepareValue(Value));
+
                 return;
             }
-            else if (Value.GetType() != ColumnDefinition.Type)
+
+            if (Value.GetType() != ColumnDefinition.Type)
             {
                 if (Value is string)
                 {
@@ -374,11 +398,6 @@ public static void PrepareColumnValue(TableSchema.Column ColumnDefinition, objec
                         }
                         catch { }
                     }
-                    else if (Value is dg.Sql.IPhrase)
-                    {
-                        OutputBuilder.Append(((dg.Sql.IPhrase)Value).BuildPhrase(Connection));
-                        return;
-                    }
                 }
             }
             else if (Value is string)
@@ -405,6 +424,7 @@ public static void PrepareColumnValue(TableSchema.Column ColumnDefinition, objec
                 }
                 catch { }
             }
+
             OutputBuilder.Append(Connection.PrepareValue(Value));
         }