Make parentheses-for-union-queries specific to MySQL

slick · Jun 19, 2017 · c9c6dd0 · c9c6dd0
1 parent aeb7bb7
commit c9c6dd0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/slick/src/main/scala/slick/jdbc/JdbcStatementBuilderComponent.scala b/slick/src/main/scala/slick/jdbc/JdbcStatementBuilderComponent.scala
@@ -424,9 +424,9 @@ trait JdbcStatementBuilderComponent { self: JdbcProfile =>
         b"\}"
       case Union(left, right, all) =>
         b"\{"
-        buildFrom(left, None, false)
+        buildFrom(left, None, true)
         if(all) b"\nunion all " else b"\nunion "
-        buildFrom(right, None, false)
+        buildFrom(right, None, true)
         b"\}"
       case SimpleLiteral(w) => b += w
       case s: SimpleExpression => s.toSQL(this)

diff --git a/slick/src/main/scala/slick/jdbc/MySQLProfile.scala b/slick/src/main/scala/slick/jdbc/MySQLProfile.scala
@@ -186,6 +186,12 @@ trait MySQLProfile extends JdbcProfile { profile =>
       case RowNum(sym, true) => b"(@`$sym := @`$sym + 1)"
       case RowNum(sym, false) => b"@`$sym"
       case RowNumGen(sym, init) => b"@`$sym := $init"
+      case Union(left, right, all) =>
+        b"\{"
+        buildFrom(left, None, false)
+        if(all) b"\nunion all " else b"\nunion "
+        buildFrom(right, None, false)
+        b"\}"
       case _ => super.expr(n, skipParens)
     }