fix(sql): Fix bulk store objects JOOQ api to support both MySQL and P…

…ostgres (#908)
spinnaker · Jul 23, 2020 · 613cc2b · 613cc2b
1 parent e1ecc62
commit 613cc2b
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 1 deletion.
diff --git a/front50-sql/src/main/kotlin/com/netflix/spinnaker/front50/model/SqlStorageService.kt b/front50-sql/src/main/kotlin/com/netflix/spinnaker/front50/model/SqlStorageService.kt
@@ -184,7 +184,8 @@ class SqlStorageService(
                     *insertPairs.keys.map { DSL.field(it) }.toTypedArray()
                   )
                     .values(insertPairs.values)
-                    .onDuplicateKeyUpdate()
+                    .onConflict(DSL.field("id", String::class.java))
+                    .doUpdate()
                     .set(updatePairs.mapKeys { DSL.field(it.key) })
                 }
               ).execute()

diff --git a/front50-sql/src/test/kotlin/com/netflix/spinnaker/front50/model/SqlStorageServiceTests.kt b/front50-sql/src/test/kotlin/com/netflix/spinnaker/front50/model/SqlStorageServiceTests.kt
@@ -245,6 +245,36 @@ internal object SqlStorageServiceTests : JUnit5Minutests {
           expectThrows<NotFoundException> {
             sqlStorageService.loadObject<EntityTags>(ObjectType.ENTITY_TAGS, "id-entitytags001")
           }
+
+          // Verify we can store more than object
+          sqlStorageService.storeObjects(
+            ObjectType.ENTITY_TAGS,
+            listOf(
+              EntityTags().apply {
+                id = "id-entitytags1of1"
+                lastModified = 100
+                lastModifiedBy = "anonymous"
+                entityRef = EntityTags.EntityRef().apply {
+                  entityId = "application001"
+                }
+              },
+              EntityTags().apply {
+                id = "id-entitytags1of2"
+                lastModified = 100
+                lastModifiedBy = "anonymous"
+                entityRef = EntityTags.EntityRef().apply {
+                  entityId = "application001"
+                }
+              }
+
+            )
+          )
+          // Retrieve tags saved above
+          entityTags = sqlStorageService.loadObject<EntityTags>(ObjectType.ENTITY_TAGS, "id-entitytags1of1")
+          expectThat(entityTags.id).isEqualTo("id-entitytags1of1")
+
+          entityTags = sqlStorageService.loadObject<EntityTags>(ObjectType.ENTITY_TAGS, "id-entitytags1of2")
+          expectThat(entityTags.id).isEqualTo("id-entitytags1of2")
         }
       }
     }