Merge pull request #6330 from ViacheslavKlimov/fix/ota-constraint-install-script

[3.4] Fix SQL error on reinstall

dao/src/main/resources/sql/schema-entities.sql

@@ -242,10 +242,17 @@ CREATE TABLE IF NOT EXISTS device_profile (
     CONSTRAINT fk_software_device_profile FOREIGN KEY (software_id) REFERENCES ota_package(id)
 );
 
-ALTER TABLE ota_package
-    ADD CONSTRAINT fk_device_profile_ota_package
-        FOREIGN KEY (device_profile_id) REFERENCES device_profile (id)
-            ON DELETE CASCADE;
+DO
+$$
+    BEGIN
+        IF NOT EXISTS(SELECT 1 FROM pg_constraint WHERE conname = 'fk_device_profile_ota_package') THEN
+            ALTER TABLE ota_package
+                ADD CONSTRAINT fk_device_profile_ota_package
+                    FOREIGN KEY (device_profile_id) REFERENCES device_profile (id)
+                        ON DELETE CASCADE;
+        END IF;
+    END;
+$$;
 
 -- We will use one-to-many relation in the first release and extend this feature in case of user requests
 -- CREATE TABLE IF NOT EXISTS device_profile_firmware (

dao/src/test/java/org/thingsboard/server/dao/SqlDaoServiceTestSuite.java

@@ -25,6 +25,7 @@ import org.junit.runner.RunWith;
         "org.thingsboard.server.dao.service.event.sql.*SqlTest",
         "org.thingsboard.server.dao.service.sql.*SqlTest",
         "org.thingsboard.server.dao.service.timeseries.sql.*SqlTest",
+        "org.thingsboard.server.dao.service.install.sql.*SqlTest"
 })
 public class SqlDaoServiceTestSuite {
 }

dao/src/test/java/org/thingsboard/server/dao/service/install/sql/EntitiesSchemaSqlTest.java

@@ -0,0 +1,72 @@
+/**
+ * Copyright © 2016-2022 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.service.install.sql;
+
+import org.assertj.core.api.Assertions;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.thingsboard.server.dao.service.AbstractServiceTest;
+import org.thingsboard.server.dao.service.DaoSqlTest;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+
+@DaoSqlTest
+public class EntitiesSchemaSqlTest extends AbstractServiceTest {
+
+    @Value("${classpath:sql/schema-entities.sql}")
+    private Path installScriptPath;
+
+    @Autowired
+    private JdbcTemplate jdbcTemplate;
+
+    @Test
+    public void testRepeatedInstall() throws IOException {
+        String installScript = Files.readString(installScriptPath);
+        try {
+            for (int i = 1; i <= 2; i++) {
+                jdbcTemplate.execute(installScript);
+            }
+        } catch (Exception e) {
+            Assertions.fail("Failed to execute reinstall", e);
+        }
+    }
+
+    @Test
+    public void testRepeatedInstall_badScript() {
+        String illegalInstallScript = "CREATE TABLE IF NOT EXISTS qwerty ();\n" +
+                "ALTER TABLE qwerty ADD COLUMN first VARCHAR(10);";
+
+        assertDoesNotThrow(() -> {
+            jdbcTemplate.execute(illegalInstallScript);
+        });
+
+        try {
+            assertThatThrownBy(() -> {
+                jdbcTemplate.execute(illegalInstallScript);
+            }).getCause().hasMessageContaining("column").hasMessageContaining("already exists");
+        } finally {
+            jdbcTemplate.execute("DROP TABLE qwerty;");
+        }
+    }
+
+}