Merge pull request #689 from roddone/multiline-expanded-select

Allow expanded select to be multiline

Author: ahmad-moussawi

QueryBuilder.Tests/SelectTests.cs

@@ -74,6 +74,20 @@ public void ExpandedSelect()
             Assert.Equal("SELECT `users`.`id`, `users`.`name`, `users`.`age` FROM `users`", c[EngineCodes.MySql]);
         }
 
+        [Fact]
+        public void ExpandedSelectMultiline()
+        {
+            var q = new Query().From("users").Select(@"users.{
+                                                                id,
+                                                                name as Name,
+                                                                age
+                                                              }");
+            var c = Compile(q);
+
+            Assert.Equal("SELECT [users].[id], [users].[name] AS [Name], [users].[age] FROM [users]", c[EngineCodes.SqlServer]);
+            Assert.Equal("SELECT `users`.`id`, `users`.`name` AS `Name`, `users`.`age` FROM `users`", c[EngineCodes.MySql]);
+        }
+
         [Fact]
         public void ExpandedSelectWithSchema()
         {
@@ -83,6 +97,19 @@ public void ExpandedSelectWithSchema()
             Assert.Equal("SELECT [dbo].[users].[id], [dbo].[users].[name], [dbo].[users].[age] FROM [users]", c[EngineCodes.SqlServer]);
         }
 
+        [Fact]
+        public void ExpandedSelectMultilineWithSchema()
+        {
+            var q = new Query().From("users").Select(@"dbo.users.{
+                                                                id,
+                                                                name as Name,
+                                                                age
+                                                              }");
+            var c = Compile(q);
+
+            Assert.Equal("SELECT [dbo].[users].[id], [dbo].[users].[name] AS [Name], [dbo].[users].[age] FROM [users]", c[EngineCodes.SqlServer]);
+        }
+
         [Fact]
         public void NestedEmptyWhereAtFirstCondition()
         {

QueryBuilder/Helper.cs

@@ -136,8 +136,8 @@ public static int EnumerableCount(IEnumerable obj)
 
         public static List<string> ExpandExpression(string expression)
         {
-            var regex = @"^(?:\w+\.){1,2}{(.*)}";
-            var match = Regex.Match(expression, regex);
+            var regex = @"^(?:\w+\.){1,2}{([^}]*)}";
+            var match = Regex.Match(expression, regex, RegexOptions.Multiline);
 
             if (!match.Success)
             {
@@ -149,7 +149,7 @@ public static List<string> ExpandExpression(string expression)
 
             var captures = match.Groups[1].Value;
 
-            var cols = Regex.Split(captures, @"\s*,\s*")
+            var cols = Regex.Split(captures, @"\s*,\s*", RegexOptions.Multiline)
                 .Select(x => $"{table}.{x.Trim()}")
                 .ToList();