Merge pull request #1400 from nspadaccino/nspadaccino/query-updates

Mysql 8.0 compatibility

modules/api/src/it/scala/vinyldns/api/MySqlApiIntegrationSpec.scala

@@ -34,6 +34,6 @@ trait MySqlApiIntegrationSpec extends MySqlIntegrationSpec {
 
   def clearGroupRepo(): Unit =
     DB.localTx { s =>
-      s.executeUpdate("DELETE FROM groups")
+      s.executeUpdate("DELETE FROM `groups`")
     }
 }

modules/mysql/src/it/scala/vinyldns/mysql/repository/MySqlGroupRepositoryIntegrationSpec.scala

@@ -50,7 +50,7 @@ class MySqlGroupRepositoryIntegrationSpec
 
   override protected def beforeAll(): Unit = {
     DB.localTx { s =>
-      s.executeUpdate("DELETE FROM groups")
+      s.executeUpdate("DELETE FROM `groups`")
     }
 
     for (group <- groups) {
@@ -60,7 +60,7 @@ class MySqlGroupRepositoryIntegrationSpec
 
   override protected def afterAll(): Unit = {
     DB.localTx { s =>
-      s.executeUpdate("DELETE FROM groups")
+      s.executeUpdate("DELETE FROM `groups`")
     }
     super.afterAll()
   }

modules/mysql/src/main/resources/db/migration/V3.22__AddGroupFields.sql

@@ -2,6 +2,6 @@ CREATE SCHEMA IF NOT EXISTS ${dbName};
 
 USE ${dbName};
 
-ALTER TABLE groups ADD COLUMN description VARCHAR(256) NULL;
+ALTER TABLE `groups` ADD COLUMN description VARCHAR(256) NULL;
-ALTER TABLE groups ADD COLUMN created_timestamp DATETIME NOT NULL;
+ALTER TABLE `groups` ADD COLUMN created_timestamp DATETIME NOT NULL;
-ALTER TABLE groups ADD COLUMN email VARCHAR(256) NOT NULL;
+ALTER TABLE `groups` ADD COLUMN email VARCHAR(256) NOT NULL;

modules/mysql/src/main/resources/db/migration/V3.4__Groups.sql

@@ -5,7 +5,7 @@ USE ${dbName};
 /*
 Create table to store groups
 */
-CREATE TABLE groups (
+CREATE TABLE `groups` (
   id CHAR(36) NOT NULL,
   name VARCHAR(256) NOT NULL,
   data BLOB NOT NULL,

modules/mysql/src/main/scala/vinyldns/mysql/repository/MySqlGroupRepository.scala

@@ -32,47 +32,47 @@ class MySqlGroupRepository extends GroupRepository with GroupProtobufConversions
 
   private final val PUT_GROUP =
     sql"""
-         |REPLACE INTO groups(id, name, data, description, created_timestamp, email)
+         |REPLACE INTO `groups`(id, name, data, description, created_timestamp, email)
          | VALUES ({id}, {name}, {data}, {description}, {createdTimestamp}, {email})
        """.stripMargin
 
   private final val DELETE_GROUP =
     sql"""
-         |DELETE FROM groups
+         |DELETE FROM `groups`
          | WHERE id = ?
        """.stripMargin
 
   private final val GET_GROUP_BY_ID =
     sql"""
          |SELECT data
-         |  FROM groups
+         |  FROM `groups`
          | WHERE id = ?
        """.stripMargin
 
   private final val GET_GROUP_BY_NAME =
     sql"""
          |SELECT data
-         |  FROM groups
+         |  FROM `groups`
          | WHERE name = ?
        """.stripMargin
 
   private final val GET_ALL_GROUPS =
     sql"""
          |SELECT data
-         |  FROM groups
+         |  FROM `groups`
        """.stripMargin
 
   private val BASE_GET_GROUPS_BY_IDS =
     """
       |SELECT data
-      |  FROM groups
+      |  FROM `groups`
       | WHERE id
     """.stripMargin
 
   private val BASE_GET_GROUPS_BY_NAMES =
     """
       |SELECT data
-      |  FROM groups
+      |  FROM `groups`
       | WHERE name
     """.stripMargin
 
@@ -187,7 +187,7 @@ class MySqlGroupRepository extends GroupRepository with GroupProtobufConversions
     monitor("repo.Group.getGroupByName") {
       IO {
         logger.debug(s"Getting groups with name: $nameFilter")
-        val initialQuery = "SELECT data FROM groups WHERE name"
+        val initialQuery = "SELECT data FROM `groups` WHERE name"
         val sb = new StringBuilder
         sb.append(initialQuery)
         val groupsLike = if (nameFilter.contains('*')) {