sql joins list fix

vapor · Oct 10, 2019 · 510b23e · 510b23e
1 parent 354c843
commit 510b23e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/Sources/SQLKit/Query/SQLList.swift b/Sources/SQLKit/Query/SQLList.swift
@@ -1,16 +1,17 @@
 public struct SQLList: SQLExpression {
     public let expressions: [SQLExpression]
-
-    
-    public init(_ expressions: [SQLExpression]) {
+    public let separator: SQLExpression
+
+    public init(_ expressions: [SQLExpression], separator: SQLExpression = SQLRaw(", ")) {
         self.expressions = expressions
+        self.separator = separator
     }
 
     public func serialize(to serializer: inout SQLSerializer) {
         var first = true
         for el in self.expressions {
             if !first {
-                serializer.write(", ")
+                self.separator.serialize(to: &serializer)
             }
             first = false
             el.serialize(to: &serializer)

diff --git a/Sources/SQLKit/Query/SQLSelect.swift b/Sources/SQLKit/Query/SQLSelect.swift
@@ -53,7 +53,7 @@ public struct SQLSelect: SQLExpression {
         SQLList(self.tables).serialize(to: &serializer)
         if !self.joins.isEmpty {
             serializer.write(" ")
-            SQLList(self.joins).serialize(to: &serializer)
+            SQLList(self.joins, separator: SQLRaw(" ")).serialize(to: &serializer)
         }
         if let predicate = self.predicate {
             serializer.write(" WHERE ")