From 1f493265ba3652a202763d1aaf8d4a83e4498770 Mon Sep 17 00:00:00 2001
From: "Marius B. Kotsbak" <marius.kotsbak@webstep.no>
Date: Mon, 4 Apr 2016 11:39:16 +0200
Subject: [PATCH] Add quoting of table names and fk in ALTER TABLE for MySQL

Closes #1471: Drop / dropStatements for MySQL are not escaping reserved words (like "order")
---
 .../slick/test/lifted/MySQLDDLTest.scala      | 37 +++++++++++++++++++
 .../main/scala/slick/jdbc/MySQLProfile.scala  |  4 +-
 2 files changed, 39 insertions(+), 2 deletions(-)
 create mode 100644 slick-testkit/src/test/scala/slick/test/lifted/MySQLDDLTest.scala

diff --git a/slick-testkit/src/test/scala/slick/test/lifted/MySQLDDLTest.scala b/slick-testkit/src/test/scala/slick/test/lifted/MySQLDDLTest.scala
new file mode 100644
index 0000000000..78b97a8173
--- /dev/null
+++ b/slick-testkit/src/test/scala/slick/test/lifted/MySQLDDLTest.scala
@@ -0,0 +1,37 @@
+package slick.test.lifted
+
+import org.junit.Test
+import org.junit.Assert._
+
+/** Test case for the MySQL SQL DDL overrides */
+class MysqlDDLTest {
+  import slick.jdbc.MySQLProfile.api._
+
+  @Test def testTablenameEscaped {
+    class T(tag: Tag) extends Table[Int](tag, "mytable") {
+      def id = column[Int]("id", O.PrimaryKey)
+
+      def * = id
+    }
+    val ts = TableQuery[T]
+
+    class T2(tag: Tag) extends Table[Int](tag, "mytable2") {
+      def id = column[Int]("id", O.PrimaryKey)
+
+      def testFk = column[Int]("test_fk")
+      def fk = foreignKey("t_test_fk", testFk, ts)(_.id)
+
+      def * = id
+    }
+    val ts2 = TableQuery[T2]
+
+    val s1 = ts2.schema.createStatements.toList
+    assertTrue("DDL (create) must contain any SQL statements", s1.nonEmpty)
+    s1.foreach(s => assertTrue("DDL (create) uses escaped table name: " + s, s contains "`mytable2`"))
+    assertTrue("Fk name must be escaped", s1.exists(_.contains("`t_test_fk`")))
+
+    val s2 = ts2.schema.dropStatements.toList
+    s2.foreach(s => assertTrue("DDL (drop) uses escaped table name: " + s, s contains "`mytable2`"))
+    assertTrue("Fk name must be escaped", s2.exists(_.contains("`t_test_fk`")))
+  }
+}
diff --git a/slick/src/main/scala/slick/jdbc/MySQLProfile.scala b/slick/src/main/scala/slick/jdbc/MySQLProfile.scala
index 33eac205d2..041fa3cb21 100644
--- a/slick/src/main/scala/slick/jdbc/MySQLProfile.scala
+++ b/slick/src/main/scala/slick/jdbc/MySQLProfile.scala
@@ -194,10 +194,10 @@ trait MySQLProfile extends JdbcProfile { profile =>
 
   class TableDDLBuilder(table: Table[_]) extends super.TableDDLBuilder(table) {
     override protected def dropForeignKey(fk: ForeignKey) = {
-      "ALTER TABLE " + table.tableName + " DROP FOREIGN KEY " + fk.name
+      "ALTER TABLE " + quoteIdentifier(table.tableName) + " DROP FOREIGN KEY " + quoteIdentifier(fk.name)
     }
     override protected def dropPrimaryKey(pk: PrimaryKey): String = {
-      "ALTER TABLE " + table.tableName + " DROP PRIMARY KEY"
+      "ALTER TABLE " + quoteIdentifier(table.tableName) + " DROP PRIMARY KEY"
     }
   }