adjust jump_if_null branch offset

Author: pedrocarlo

core/translate/expr.rs

@@ -3823,13 +3823,17 @@ fn emit_binary_condition_insn(
         opposite_op
     };
 
-    // Similarly, we "jump if NULL" only when we intend to jump if the condition is false.
-    let flags = if condition_metadata.jump_if_condition_is_true {
-        CmpInsFlags::default().with_affinity(affinity)
-    } else {
-        CmpInsFlags::default()
-            .with_affinity(affinity)
-            .jump_if_null()
+    // Set the "jump if NULL" flag when the NULL target matches the jump target.
+    // When jump_if_condition_is_true: we jump on true, so set jump_if_null when NULL should also jump (e.g. CHECK constraints in integrity_check).
+    // When !jump_if_condition_is_true: we jump on false, so set jump_if_null when NULL should also jump (standard SQL 3-valued logic).
+    let mut flags = CmpInsFlags::default().with_affinity(affinity);
+    if condition_metadata.jump_if_condition_is_true {
+        if condition_metadata.jump_target_when_null == condition_metadata.jump_target_when_true {
+            flags = flags.jump_if_null()
+        }
+    } else if condition_metadata.jump_target_when_null == condition_metadata.jump_target_when_false
+    {
+        flags = flags.jump_if_null()
     };
 
     let target_pc = if condition_metadata.jump_if_condition_is_true {

testing/runner/tests/check_constraint.sqltest

@@ -1655,14 +1655,33 @@ expect {
 # Bug fix: CHECK constraint type coercion must use column affinity (#5170)
 # TEXT column comparing with integer literal should use TEXT affinity,
 # meaning the integer is coerced to text for comparison.
-test check_constraint_text_affinity_coercion_violation {
-    CREATE TABLE t(val TEXT CHECK(val > 5));
-    INSERT INTO t VALUES ('10');
+# Bug fix: integrity_check must not flag NULL values as CHECK violations.
+# Per SQL standard, NULL does not violate CHECK constraints.
+@skip-if mvcc "MVCC integrity_check does not perform row-level CHECK validation"
+test check_constraint_integrity_check_null_not_violation {
+    CREATE TABLE t(id INTEGER PRIMARY KEY, val REAL CHECK (val > 0));
+    INSERT INTO t (id, val) VALUES (1, 100.0);
+    INSERT INTO t (id, val) VALUES (2, NULL);
+    INSERT INTO t (id, val) VALUES (3, 200.0);
+    PRAGMA integrity_check;
 }
-expect error {
-    CHECK constraint failed: val > 5
+expect {
+    ok
 }
 
+@skip-if mvcc "MVCC integrity_check does not perform row-level CHECK validation"
+test check_constraint_integrity_check_detects_real_violation {
+    CREATE TABLE t(id INTEGER PRIMARY KEY, val INTEGER CHECK (val > 0));
+    PRAGMA ignore_check_constraints = ON;
+    INSERT INTO t VALUES (1, -5);
+    PRAGMA ignore_check_constraints = OFF;
+    PRAGMA integrity_check;
+}
+expect {
+    CHECK constraint failed in t
+}
+
+
 test check_constraint_text_affinity_coercion_pass {
     CREATE TABLE t(val TEXT CHECK(val > 5));
     -- '6' > '5' in text comparison is true