Remove Db2 handling

Author: KodaiD

.github/workflows/permission-check.yaml

@@ -709,111 +709,3 @@ jobs:
         with:
           name: yugabytedb_2_permission_integration_test_reports
           path: core/build/reports/tests/integrationTestJdbcPermission
-
-  integration-test-permission-jdbc-db2-11-5:
-    name: Db2 11.5 Permission Integration Test
-    runs-on: ubuntu-latest
-
-    services:
-      db2:
-        image: icr.io/db2_community/db2:11.5.9.0
-        env:
-          DB2INSTANCE: db2inst1
-          DB2INST1_PASSWORD: db2inst1
-          DBNAME: test_db
-          LICENSE: accept
-        ports:
-          - 50000:50000
-        options: --privileged --name db2
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Set up JDK ${{ env.JAVA_VERSION }} (${{ env.JAVA_VENDOR }})
-        uses: actions/setup-java@v4
-        with:
-          java-version: ${{ env.JAVA_VERSION }}
-          distribution: ${{ env.JAVA_VENDOR }}
-
-      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v4
-
-      - name: Wait for the container to be ready
-        timeout-minutes: 10
-        run: |
-          while ! docker logs db2 2>&1 | grep -q "Setup has completed"
-          do
-            echo "Container is not yet ready"
-            sleep 5s
-          done
-          echo "Container is ready"
-
-      - name: Create OS user for Db2
-        run: |
-          docker exec db2 bash -c "useradd -m -s /bin/bash test"
-          docker exec db2 bash -c "echo \"test:test\" | sudo chpasswd"
-          docker exec db2 bash -c "usermod -aG db2iadm1 test"
-
-      - name: Execute Gradle 'integrationTestJdbcPermission' task
-        run: ./gradlew integrationTestJdbcPermission -Dscalardb.jdbc.url="jdbc:db2://localhost:50000/test_db" -Dscalardb.jdbc.username=db2inst1 -Dscalardb.jdbc.password=db2inst1
-
-      - name: Upload Gradle test reports
-        if: always()
-        uses: actions/upload-artifact@v4
-        with:
-          name: db2_11.5_permission_integration_test_reports
-          path: core/build/reports/tests/integrationTestJdbcPermission
-
-  integration-test-permission-jdbc-db2-12-1:
-    name: Db2 12.1 Permission Integration Test
-    runs-on: ubuntu-latest
-
-    services:
-      db2:
-        image: icr.io/db2_community/db2:12.1.1.0
-        env:
-          DB2INSTANCE: db2inst1
-          DB2INST1_PASSWORD: db2inst1
-          DBNAME: test_db
-          LICENSE: accept
-        ports:
-          - 50000:50000
-        options: --privileged --name db2
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Set up JDK ${{ env.JAVA_VERSION }} (${{ env.JAVA_VENDOR }})
-        uses: actions/setup-java@v4
-        with:
-          java-version: ${{ env.JAVA_VERSION }}
-          distribution: ${{ env.JAVA_VENDOR }}
-
-      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v4
-
-      - name: Wait for the container to be ready
-        timeout-minutes: 10
-        run: |
-          while ! docker logs db2 2>&1 | grep -q "Setup has completed"
-          do
-            echo "Container is not yet ready"
-            sleep 5s
-          done
-          echo "Container is ready"
-
-      - name: Create OS user for Db2
-        run: |
-          docker exec db2 bash -c "useradd -m -s /bin/bash test"
-          docker exec db2 bash -c "echo \"test:test\" | sudo chpasswd"
-          docker exec db2 bash -c "usermod -aG db2iadm1 test"
-
-      - name: Execute Gradle 'integrationTestJdbcPermission' task
-        run: ./gradlew integrationTestJdbcPermission -Dscalardb.jdbc.url="jdbc:db2://localhost:50000/test_db" -Dscalardb.jdbc.username=db2inst1 -Dscalardb.jdbc.password=db2inst1
-
-      - name: Upload Gradle test reports
-        if: always()
-        uses: actions/upload-artifact@v4
-        with:
-          name: db2_12.1_permission_integration_test_reports
-          path: core/build/reports/tests/integrationTestJdbcPermission

core/src/integration-test/java/com/scalar/db/storage/jdbc/JdbcPermissionTestUtils.java

@@ -21,29 +21,25 @@ public JdbcPermissionTestUtils(Properties properties) {
 
   @Override
   public void createNormalUser(String userName, String password) {
-    if (!JdbcTestUtils.isDb2(rdbEngine)) {
-      try (Connection connection = dataSource.getConnection()) {
-        String createUserSql = getCreateUserSql(userName, password);
-        try (Statement statement = connection.createStatement()) {
-          statement.execute(createUserSql);
-        }
-      } catch (SQLException e) {
-        throw new RuntimeException("Failed to create user: " + userName, e);
+    try (Connection connection = dataSource.getConnection()) {
+      String createUserSql = getCreateUserSql(userName, password);
+      try (Statement statement = connection.createStatement()) {
+        statement.execute(createUserSql);
       }
+    } catch (SQLException e) {
+      throw new RuntimeException("Failed to create user: " + userName, e);
     }
   }
 
   @Override
   public void dropNormalUser(String userName) {
-    if (!JdbcTestUtils.isDb2(rdbEngine)) {
-      try (Connection connection = dataSource.getConnection()) {
-        String dropUserSql = getDropUserSql(userName);
-        try (Statement statement = connection.createStatement()) {
-          statement.execute(dropUserSql);
-        }
-      } catch (SQLException e) {
-        throw new RuntimeException("Failed to drop user: " + userName, e);
+    try (Connection connection = dataSource.getConnection()) {
+      String dropUserSql = getDropUserSql(userName);
+      try (Statement statement = connection.createStatement()) {
+        statement.execute(dropUserSql);
       }
+    } catch (SQLException e) {
+      throw new RuntimeException("Failed to drop user: " + userName, e);
     }
   }
 
@@ -133,11 +129,6 @@ private String[] getGrantPermissionStatements(String userName) {
         String.format("ALTER ROLE [db_datareader] ADD MEMBER %s", userName),
         String.format("ALTER ROLE [db_datawriter] ADD MEMBER %s", userName)
       };
-    } else if (JdbcTestUtils.isDb2(rdbEngine)) {
-      return new String[] {
-        String.format("GRANT DBADM ON DATABASE TO USER %s", userName),
-        String.format("GRANT DATAACCESS ON DATABASE TO USER %s", userName)
-      };
     } else {
       throw new UnsupportedOperationException(
           "Granting permissions is not supported for " + rdbEngine);