Disable SET_UNLOGGED_LOGGED for partitioned table for PG18; Fix NPE for PostgresBinaryComparisonOperation

albertZhangTJ · albertZhangTJ · commit a4bf0a9d65c5 · 2026-03-22T18:39:58.000Z
diff --git a/src/sqlancer/postgres/PostgresSchema.java b/src/sqlancer/postgres/PostgresSchema.java
@@ -164,13 +164,26 @@ public enum TableType {
         private final TableType tableType;
         private final List<PostgresStatisticsObject> statistics;
         private final boolean isInsertable;
+        private final boolean isPartitioned;
 
         public PostgresTable(String tableName, List<PostgresColumn> columns, List<PostgresIndex> indexes,
                 TableType tableType, List<PostgresStatisticsObject> statistics, boolean isView, boolean isInsertable) {
             super(tableName, columns, indexes, isView);
             this.statistics = statistics;
             this.isInsertable = isInsertable;
             this.tableType = tableType;
+            //TODO: simple adapter for other implementations 
+            this.isPartitioned = false;
+        }
+
+        public PostgresTable(String tableName, List<PostgresColumn> columns, List<PostgresIndex> indexes,
+                TableType tableType, List<PostgresStatisticsObject> statistics, boolean isView, boolean isInsertable,
+                boolean isPartitioned) {
+            super(tableName, columns, indexes, isView);
+            this.statistics = statistics;
+            this.isInsertable = isInsertable;
+            this.tableType = tableType;
+            this.isPartitioned = isPartitioned;
         }
 
         public List<PostgresStatisticsObject> getStatistics() {
@@ -185,6 +198,10 @@ public boolean isInsertable() {
             return isInsertable;
         }
 
+        public boolean isPartitioned() {
+            return isPartitioned;
+        }
+
     }
 
     public static final class PostgresStatisticsObject {
@@ -225,11 +242,12 @@ public static PostgresSchema fromConnection(SQLConnection con, String databaseNa
             List<PostgresTable> databaseTables = new ArrayList<>();
             try (Statement s = con.createStatement()) {
                 try (ResultSet rs = s.executeQuery(
-                        "SELECT table_name, table_schema, table_type, is_insertable_into FROM information_schema.tables WHERE table_schema='public' OR table_schema LIKE 'pg_temp_%' ORDER BY table_name;")) {
+                        "SELECT t.table_name, t.table_schema, t.table_type, t.is_insertable_into, c.relkind FROM information_schema.tables t JOIN pg_class c ON c.relname = t.table_name JOIN pg_namespace n ON n.oid = c.relnamespace AND n.nspname = t.table_schema WHERE t.table_schema='public' OR t.table_schema LIKE 'pg_temp_%' ORDER BY t.table_name;")) {
                     while (rs.next()) {
                         String tableName = rs.getString("table_name");
                         String tableTypeSchema = rs.getString("table_schema");
                         boolean isInsertable = rs.getBoolean("is_insertable_into");
+                        boolean isPartitioned = "p".equals(rs.getString("relkind"));
                         // TODO: also check insertable
                         // TODO: insert into view?
                         boolean isView = tableName.startsWith("v"); // tableTypeStr.contains("VIEW") ||
@@ -240,7 +258,7 @@ public static PostgresSchema fromConnection(SQLConnection con, String databaseNa
                         List<PostgresIndex> indexes = getIndexes(con, tableName);
                         List<PostgresStatisticsObject> statistics = getStatistics(con);
                         PostgresTable t = new PostgresTable(tableName, databaseColumns, indexes, tableType, statistics,
-                                isView, isInsertable);
+                                isView, isInsertable, isPartitioned);
                         for (PostgresColumn c : databaseColumns) {
                             c.setTable(t);
                         }
@@ -324,4 +342,4 @@ public String getDatabaseName() {
         return databaseName;
     }
 
-}
+}
diff --git a/src/sqlancer/postgres/ast/PostgresBinaryComparisonOperation.java b/src/sqlancer/postgres/ast/PostgresBinaryComparisonOperation.java
@@ -126,7 +126,7 @@ public PostgresConstant getExpectedValue() {
         PostgresConstant leftExpectedValue = getLeft().getExpectedValue();
         PostgresConstant rightExpectedValue = getRight().getExpectedValue();
         if (leftExpectedValue == null || rightExpectedValue == null) {
-            return null;
+            return PostgresConstant.createNullConstant();
         }
         return getOp().getExpectedValue(leftExpectedValue, rightExpectedValue);
     }
diff --git a/src/sqlancer/postgres/gen/PostgresAlterTableGenerator.java b/src/sqlancer/postgres/gen/PostgresAlterTableGenerator.java
@@ -127,6 +127,9 @@ public List<Action> getActions(ExpectedErrors errors) {
         if (!randomTable.hasIndexes()) {
             action.remove(Action.ADD_TABLE_CONSTRAINT_USING_INDEX);
         }
+        if (randomTable.isPartitioned()){
+            action.remove(Action.SET_LOGGED_UNLOGGED);
+        }
         if (action.isEmpty()) {
             throw new IgnoreMeException();
         }

Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ public PostgresConstant getExpectedValue() {`
`126`	`126`	`PostgresConstant leftExpectedValue = getLeft().getExpectedValue();`
`127`	`127`	`PostgresConstant rightExpectedValue = getRight().getExpectedValue();`
`128`	`128`	`if (leftExpectedValue == null \|\| rightExpectedValue == null) {`
`129`		`- return null;`
	`129`	`+ return PostgresConstant.createNullConstant();`
`130`	`130`	`}`
`131`	`131`	`return getOp().getExpectedValue(leftExpectedValue, rightExpectedValue);`
`132`	`132`	`}`
Original file line number	Diff line number	Diff line change
`@@ -127,6 +127,9 @@ public List<Action> getActions(ExpectedErrors errors) {`
`127`	`127`	`if (!randomTable.hasIndexes()) {`
`128`	`128`	`action.remove(Action.ADD_TABLE_CONSTRAINT_USING_INDEX);`
`129`	`129`	`}`
	`130`	`+ if (randomTable.isPartitioned()){`
	`131`	`+ action.remove(Action.SET_LOGGED_UNLOGGED);`
	`132`	`+ }`
`130`	`133`	`if (action.isEmpty()) {`
`131`	`134`	`throw new IgnoreMeException();`
`132`	`135`	`}`