Merge pull request #1229 from yaojiejia/psql_v13_drop_db_force

mrigger · web-flow · commit 0d6d264521c8 · 2025-06-09T13:59:42.000+08:00
Add support for Drop Database Force in Postgres v13
diff --git a/src/sqlancer/postgres/PostgresProvider.java b/src/sqlancer/postgres/PostgresProvider.java
@@ -279,12 +279,33 @@ public SQLConnection createDatabase(PostgresGlobalState globalState) throws SQLE
         }
         Connection con = DriverManager.getConnection("jdbc:" + entryURL, username, password);
         globalState.getState().logStatement(String.format("\\c %s;", entryDatabaseName));
-        globalState.getState().logStatement("DROP DATABASE IF EXISTS " + databaseName);
-        createDatabaseCommand = getCreateDatabaseCommand(globalState);
-        globalState.getState().logStatement(createDatabaseCommand);
+        
+        String dropCommand = "DROP DATABASE";
+        boolean forceDrop = Randomly.getBoolean();
+        if (forceDrop) {
+            dropCommand += " FORCE";
+        }
+        dropCommand += " IF EXISTS " + databaseName;
+        
+        globalState.getState().logStatement(dropCommand + ";");
         try (Statement s = con.createStatement()) {
-            s.execute("DROP DATABASE IF EXISTS " + databaseName);
+            s.execute(dropCommand);
+        } catch (SQLException e) {
+            // If force fails, fall back to regular drop
+            if (forceDrop) {
+                String fallbackDrop = "DROP DATABASE IF EXISTS " + databaseName;
+                globalState.getState().logStatement(fallbackDrop + ";");
+                try (Statement s = con.createStatement()) {
+                    s.execute(fallbackDrop);
+                }
+            } else {
+                throw e;
+            }
         }
+        
+        // Create database section
+        createDatabaseCommand = getCreateDatabaseCommand(globalState);
+        globalState.getState().logStatement(createDatabaseCommand + ";");
         try (Statement s = con.createStatement()) {
             s.execute(createDatabaseCommand);
         }
