diff --git a/crates/squawk/src/reporter.rs b/crates/squawk/src/reporter.rs
index 11a27153..de6a02bf 100644
--- a/crates/squawk/src/reporter.rs
+++ b/crates/squawk/src/reporter.rs
@@ -528,14 +528,16 @@ SELECT 1;
         );
         assert!(res.is_ok());
 
-        assert_snapshot!(String::from_utf8_lossy(&buff), @r###"
+        assert_snapshot!(String::from_utf8_lossy(&buff), @r"
+        main.sql:1:3: warning: require-timeout-settings Missing `set lock_timeout` before potentially slow operations
+        main.sql:1:3: warning: require-timeout-settings Missing `set statement_timeout` before potentially slow operations
         main.sql:1:29: warning: adding-required-field Adding a new column that is `NOT NULL` and has no default value to an existing table effectively makes it required.
         main.sql:1:29: warning: prefer-robust-stmts Missing `IF NOT EXISTS`, the migration can't be rerun if it fails part way through.
         main.sql:1:46: warning: prefer-bigint-over-int Using 32-bit integer fields can result in hitting the max `int` limit.
         main.sql:2:23: warning: adding-required-field Adding a new column that is `NOT NULL` and has no default value to an existing table effectively makes it required.
         main.sql:2:23: warning: prefer-robust-stmts Missing `IF NOT EXISTS`, the migration can't be rerun if it fails part way through.
         main.sql:2:40: warning: prefer-bigint-over-int Using 32-bit integer fields can result in hitting the max `int` limit.
-        "###);
+        ");
     }
 
     #[test]
@@ -619,7 +621,7 @@ SELECT 1;
         );
 
         assert!(res.is_ok());
-        assert_snapshot!(String::from_utf8_lossy(&buff), @r#"[{"file":"main.sql","line":1,"column":29,"level":"Warning","message":"Adding a new column that is `NOT NULL` and has no default value to an existing table effectively makes it required.","help":"Make the field nullable or add a non-VOLATILE DEFAULT","rule_name":"adding-required-field","column_end":62,"line_end":1},{"file":"main.sql","line":1,"column":29,"level":"Warning","message":"Missing `IF NOT EXISTS`, the migration can't be rerun if it fails part way through.","help":null,"rule_name":"prefer-robust-stmts","column_end":62,"line_end":1},{"file":"main.sql","line":1,"column":46,"level":"Warning","message":"Using 32-bit integer fields can result in hitting the max `int` limit.","help":"Use 64-bit integer values instead to prevent hitting this limit.","rule_name":"prefer-bigint-over-int","column_end":53,"line_end":1},{"file":"main.sql","line":2,"column":23,"level":"Warning","message":"Adding a new column that is `NOT NULL` and has no default value to an existing table effectively makes it required.","help":"Make the field nullable or add a non-VOLATILE DEFAULT","rule_name":"adding-required-field","column_end":56,"line_end":2},{"file":"main.sql","line":2,"column":23,"level":"Warning","message":"Missing `IF NOT EXISTS`, the migration can't be rerun if it fails part way through.","help":null,"rule_name":"prefer-robust-stmts","column_end":56,"line_end":2},{"file":"main.sql","line":2,"column":40,"level":"Warning","message":"Using 32-bit integer fields can result in hitting the max `int` limit.","help":"Use 64-bit integer values instead to prevent hitting this limit.","rule_name":"prefer-bigint-over-int","column_end":47,"line_end":2}]"#);
+        assert_snapshot!(String::from_utf8_lossy(&buff), @r#"[{"file":"main.sql","line":1,"column":3,"level":"Warning","message":"Missing `set lock_timeout` before potentially slow operations","help":"Configure a `lock_timeout` before this statement.","rule_name":"require-timeout-settings","column_end":62,"line_end":1},{"file":"main.sql","line":1,"column":3,"level":"Warning","message":"Missing `set statement_timeout` before potentially slow operations","help":"Configure a `statement_timeout` before this statement","rule_name":"require-timeout-settings","column_end":62,"line_end":1},{"file":"main.sql","line":1,"column":29,"level":"Warning","message":"Adding a new column that is `NOT NULL` and has no default value to an existing table effectively makes it required.","help":"Make the field nullable or add a non-VOLATILE DEFAULT","rule_name":"adding-required-field","column_end":62,"line_end":1},{"file":"main.sql","line":1,"column":29,"level":"Warning","message":"Missing `IF NOT EXISTS`, the migration can't be rerun if it fails part way through.","help":null,"rule_name":"prefer-robust-stmts","column_end":62,"line_end":1},{"file":"main.sql","line":1,"column":46,"level":"Warning","message":"Using 32-bit integer fields can result in hitting the max `int` limit.","help":"Use 64-bit integer values instead to prevent hitting this limit.","rule_name":"prefer-bigint-over-int","column_end":53,"line_end":1},{"file":"main.sql","line":2,"column":23,"level":"Warning","message":"Adding a new column that is `NOT NULL` and has no default value to an existing table effectively makes it required.","help":"Make the field nullable or add a non-VOLATILE DEFAULT","rule_name":"adding-required-field","column_end":56,"line_end":2},{"file":"main.sql","line":2,"column":23,"level":"Warning","message":"Missing `IF NOT EXISTS`, the migration can't be rerun if it fails part way through.","help":null,"rule_name":"prefer-robust-stmts","column_end":56,"line_end":2},{"file":"main.sql","line":2,"column":40,"level":"Warning","message":"Using 32-bit integer fields can result in hitting the max `int` limit.","help":"Use 64-bit integer values instead to prevent hitting this limit.","rule_name":"prefer-bigint-over-int","column_end":47,"line_end":2}]"#);
     }
 
     #[test]
@@ -641,9 +643,7 @@ SELECT 1;
 
         assert!(res.is_ok());
 
-        assert_snapshot!(String::from_utf8_lossy(&buff), @r###"
-        [{"description":"Adding a new column that is `NOT NULL` and has no default value to an existing table effectively makes it required. Suggestion: Make the field nullable or add a non-VOLATILE DEFAULT","severity":"minor","fingerprint":"87fbb54d93cdb8c9","location":{"path":"main.sql","lines":{"begin":1,"end":1}},"check_name":"adding-required-field"},{"description":"Missing `IF NOT EXISTS`, the migration can't be rerun if it fails part way through.","severity":"minor","fingerprint":"21df0ee3817ad84","location":{"path":"main.sql","lines":{"begin":1,"end":1}},"check_name":"prefer-robust-stmts"},{"description":"Using 32-bit integer fields can result in hitting the max `int` limit. Suggestion: Use 64-bit integer values instead to prevent hitting this limit.","severity":"minor","fingerprint":"3d0e81dc13bc8757","location":{"path":"main.sql","lines":{"begin":1,"end":1}},"check_name":"prefer-bigint-over-int"},{"description":"Adding a new column that is `NOT NULL` and has no default value to an existing table effectively makes it required. Suggestion: Make the field nullable or add a non-VOLATILE DEFAULT","severity":"minor","fingerprint":"4bdd655ad8e102ad","location":{"path":"main.sql","lines":{"begin":2,"end":2}},"check_name":"adding-required-field"},{"description":"Missing `IF NOT EXISTS`, the migration can't be rerun if it fails part way through.","severity":"minor","fingerprint":"1b2e8c81e717c442","location":{"path":"main.sql","lines":{"begin":2,"end":2}},"check_name":"prefer-robust-stmts"},{"description":"Using 32-bit integer fields can result in hitting the max `int` limit. Suggestion: Use 64-bit integer values instead to prevent hitting this limit.","severity":"minor","fingerprint":"2bed2a431803b811","location":{"path":"main.sql","lines":{"begin":2,"end":2}},"check_name":"prefer-bigint-over-int"}]
-        "###);
+        assert_snapshot!(String::from_utf8_lossy(&buff), @r#"[{"description":"Missing `set lock_timeout` before potentially slow operations Suggestion: Configure a `lock_timeout` before this statement.","severity":"minor","fingerprint":"106496a54f0e1a20","location":{"path":"main.sql","lines":{"begin":1,"end":1}},"check_name":"require-timeout-settings"},{"description":"Missing `set statement_timeout` before potentially slow operations Suggestion: Configure a `statement_timeout` before this statement","severity":"minor","fingerprint":"2904632bf27251d2","location":{"path":"main.sql","lines":{"begin":1,"end":1}},"check_name":"require-timeout-settings"},{"description":"Adding a new column that is `NOT NULL` and has no default value to an existing table effectively makes it required. Suggestion: Make the field nullable or add a non-VOLATILE DEFAULT","severity":"minor","fingerprint":"87fbb54d93cdb8c9","location":{"path":"main.sql","lines":{"begin":1,"end":1}},"check_name":"adding-required-field"},{"description":"Missing `IF NOT EXISTS`, the migration can't be rerun if it fails part way through.","severity":"minor","fingerprint":"21df0ee3817ad84","location":{"path":"main.sql","lines":{"begin":1,"end":1}},"check_name":"prefer-robust-stmts"},{"description":"Using 32-bit integer fields can result in hitting the max `int` limit. Suggestion: Use 64-bit integer values instead to prevent hitting this limit.","severity":"minor","fingerprint":"3d0e81dc13bc8757","location":{"path":"main.sql","lines":{"begin":1,"end":1}},"check_name":"prefer-bigint-over-int"},{"description":"Adding a new column that is `NOT NULL` and has no default value to an existing table effectively makes it required. Suggestion: Make the field nullable or add a non-VOLATILE DEFAULT","severity":"minor","fingerprint":"4bdd655ad8e102ad","location":{"path":"main.sql","lines":{"begin":2,"end":2}},"check_name":"adding-required-field"},{"description":"Missing `IF NOT EXISTS`, the migration can't be rerun if it fails part way through.","severity":"minor","fingerprint":"1b2e8c81e717c442","location":{"path":"main.sql","lines":{"begin":2,"end":2}},"check_name":"prefer-robust-stmts"},{"description":"Using 32-bit integer fields can result in hitting the max `int` limit. Suggestion: Use 64-bit integer values instead to prevent hitting this limit.","severity":"minor","fingerprint":"2bed2a431803b811","location":{"path":"main.sql","lines":{"begin":2,"end":2}},"check_name":"prefer-bigint-over-int"}]"#);
     }
 
     #[test]
diff --git a/crates/squawk/src/snapshots/example.svg b/crates/squawk/src/snapshots/example.svg
index 3498bde2..1ca46f85 100644
--- a/crates/squawk/src/snapshots/example.svg
+++ b/crates/squawk/src/snapshots/example.svg
@@ -1,4 +1,4 @@
-<svg width="1465px" height="1100px" xmlns="http://www.w3.org/2000/svg">
+<svg width="1465px" height="1568px" xmlns="http://www.w3.org/2000/svg">
   <style>
     .fg { fill: #AAAAAA }
     .bg { fill: #000000 }
@@ -22,125 +22,177 @@
   <rect width="100%" height="100%" y="0" rx="4.5" class="bg" />
 
   <text xml:space="preserve" class="container fg">
-    <tspan x="10px" y="28px"><tspan class="fg-yellow bold">warning[prefer-bigint-over-int]</tspan><tspan class="bold">: Using 32-bit integer fields can result in hitting the max `int` limit.</tspan>
+    <tspan x="10px" y="28px"><tspan class="fg-yellow bold">warning[require-timeout-settings]</tspan><tspan class="bold">: Missing `set lock_timeout` before potentially slow operations</tspan>
 </tspan>
-    <tspan x="10px" y="46px"><tspan> </tspan><tspan class="fg-bright-blue bold"> ╭▸ </tspan><tspan>../../example.sql:6:10</tspan>
+    <tspan x="10px" y="46px"><tspan> </tspan><tspan class="fg-bright-blue bold"> ╭▸ </tspan><tspan>../../example.sql:5:1</tspan>
 </tspan>
     <tspan x="10px" y="64px"><tspan>  </tspan><tspan class="fg-bright-blue bold">│</tspan>
 </tspan>
-    <tspan x="10px" y="82px"><tspan class="fg-bright-blue bold">6</tspan><tspan> </tspan><tspan class="fg-bright-blue bold">│</tspan><tspan>     "id" serial NOT NULL PRIMARY KEY, </tspan>
+    <tspan x="10px" y="82px"><tspan class="fg-bright-blue bold">5</tspan><tspan> </tspan><tspan class="fg-bright-blue bold">│</tspan><tspan> </tspan><tspan class="fg-yellow bold">┏</tspan><tspan> CREATE TABLE "core_bar" (</tspan>
 </tspan>
-    <tspan x="10px" y="100px"><tspan>  </tspan><tspan class="fg-bright-blue bold">│</tspan><tspan>          </tspan><tspan class="fg-yellow bold">━━━━━━</tspan>
+    <tspan x="10px" y="100px"><tspan class="fg-bright-blue bold">6</tspan><tspan> </tspan><tspan class="fg-bright-blue bold">│</tspan><tspan> </tspan><tspan class="fg-yellow bold">┃</tspan><tspan>     "id" serial NOT NULL PRIMARY KEY, </tspan>
 </tspan>
-    <tspan x="10px" y="118px"><tspan>  </tspan><tspan class="fg-bright-blue bold">│</tspan>
+    <tspan x="10px" y="118px"><tspan class="fg-bright-blue bold">7</tspan><tspan> </tspan><tspan class="fg-bright-blue bold">│</tspan><tspan> </tspan><tspan class="fg-yellow bold">┃</tspan><tspan>     "alpha" varchar(100) NOT NULL</tspan>
 </tspan>
-    <tspan x="10px" y="136px"><tspan>  </tspan><tspan class="fg-bright-blue bold">├ </tspan><tspan class="bold">help</tspan><tspan>: Use 64-bit integer values instead to prevent hitting this limit.</tspan>
+    <tspan x="10px" y="136px"><tspan class="fg-bright-blue bold">8</tspan><tspan> </tspan><tspan class="fg-bright-blue bold">│</tspan><tspan> </tspan><tspan class="fg-yellow bold">┃</tspan><tspan> );</tspan>
 </tspan>
-    <tspan x="10px" y="154px"><tspan>  </tspan><tspan class="fg-bright-blue bold">╭╴</tspan>
+    <tspan x="10px" y="154px"><tspan>  </tspan><tspan class="fg-bright-blue bold">│</tspan><tspan> </tspan><tspan class="fg-yellow bold">┗━┛</tspan>
 </tspan>
-    <tspan x="10px" y="172px"><tspan class="fg-bright-blue bold">6</tspan><tspan> </tspan><tspan class="fg-bright-blue bold">│ </tspan><tspan>    "id" </tspan><tspan class="fg-bright-green">big</tspan><tspan>serial NOT NULL PRIMARY KEY, </tspan>
+    <tspan x="10px" y="172px"><tspan>  </tspan><tspan class="fg-bright-blue bold">│</tspan>
 </tspan>
-    <tspan x="10px" y="190px"><tspan>  </tspan><tspan class="fg-bright-blue bold">╰╴</tspan><tspan>         </tspan><tspan class="fg-bright-green">+++</tspan>
+    <tspan x="10px" y="190px"><tspan>  </tspan><tspan class="fg-bright-blue bold">├ </tspan><tspan class="bold">help</tspan><tspan>: Configure a `lock_timeout` before this statement.</tspan>
 </tspan>
-    <tspan x="10px" y="208px"><tspan class="fg-yellow bold">warning[prefer-identity]</tspan><tspan class="bold">: Serial types make schema, dependency, and permission management difficult.</tspan>
+    <tspan x="10px" y="208px"><tspan>  </tspan><tspan class="fg-bright-blue bold">╭╴</tspan>
 </tspan>
-    <tspan x="10px" y="226px"><tspan> </tspan><tspan class="fg-bright-blue bold"> ╭▸ </tspan><tspan>../../example.sql:6:10</tspan>
+    <tspan x="10px" y="226px"><tspan class="fg-bright-blue bold">1</tspan><tspan> </tspan><tspan class="fg-bright-green">+ set lock_timeout = '1s';</tspan>
 </tspan>
-    <tspan x="10px" y="244px"><tspan>  </tspan><tspan class="fg-bright-blue bold">│</tspan>
+    <tspan x="10px" y="244px"><tspan>  </tspan><tspan class="fg-bright-blue bold">╰╴</tspan>
 </tspan>
-    <tspan x="10px" y="262px"><tspan class="fg-bright-blue bold">6</tspan><tspan> </tspan><tspan class="fg-bright-blue bold">│</tspan><tspan>     "id" serial NOT NULL PRIMARY KEY, </tspan>
+    <tspan x="10px" y="262px"><tspan class="fg-yellow bold">warning[require-timeout-settings]</tspan><tspan class="bold">: Missing `set statement_timeout` before potentially slow operations</tspan>
 </tspan>
-    <tspan x="10px" y="280px"><tspan>  </tspan><tspan class="fg-bright-blue bold">│</tspan><tspan>          </tspan><tspan class="fg-yellow bold">━━━━━━</tspan>
+    <tspan x="10px" y="280px"><tspan> </tspan><tspan class="fg-bright-blue bold"> ╭▸ </tspan><tspan>../../example.sql:5:1</tspan>
 </tspan>
     <tspan x="10px" y="298px"><tspan>  </tspan><tspan class="fg-bright-blue bold">│</tspan>
 </tspan>
-    <tspan x="10px" y="316px"><tspan>  </tspan><tspan class="fg-bright-blue bold">├ </tspan><tspan class="bold">help</tspan><tspan>: Use an `IDENTITY` column instead.</tspan>
+    <tspan x="10px" y="316px"><tspan class="fg-bright-blue bold">5</tspan><tspan> </tspan><tspan class="fg-bright-blue bold">│</tspan><tspan> </tspan><tspan class="fg-yellow bold">┏</tspan><tspan> CREATE TABLE "core_bar" (</tspan>
 </tspan>
-    <tspan x="10px" y="334px"><tspan>  </tspan><tspan class="fg-bright-blue bold">╭╴</tspan>
+    <tspan x="10px" y="334px"><tspan class="fg-bright-blue bold">6</tspan><tspan> </tspan><tspan class="fg-bright-blue bold">│</tspan><tspan> </tspan><tspan class="fg-yellow bold">┃</tspan><tspan>     "id" serial NOT NULL PRIMARY KEY, </tspan>
 </tspan>
-    <tspan x="10px" y="352px"><tspan class="fg-bright-blue bold">6</tspan><tspan> </tspan><tspan class="fg-bright-red">- </tspan><tspan>    "id" </tspan><tspan class="fg-bright-red">serial</tspan><tspan> NOT NULL PRIMARY KEY, </tspan>
+    <tspan x="10px" y="352px"><tspan class="fg-bright-blue bold">7</tspan><tspan> </tspan><tspan class="fg-bright-blue bold">│</tspan><tspan> </tspan><tspan class="fg-yellow bold">┃</tspan><tspan>     "alpha" varchar(100) NOT NULL</tspan>
 </tspan>
-    <tspan x="10px" y="370px"><tspan class="fg-bright-blue bold">6</tspan><tspan> </tspan><tspan class="fg-bright-green">+ </tspan><tspan>    "id" </tspan><tspan class="fg-bright-green">integer generated by default as identity</tspan><tspan> NOT NULL PRIMARY KEY, </tspan>
+    <tspan x="10px" y="370px"><tspan class="fg-bright-blue bold">8</tspan><tspan> </tspan><tspan class="fg-bright-blue bold">│</tspan><tspan> </tspan><tspan class="fg-yellow bold">┃</tspan><tspan> );</tspan>
 </tspan>
-    <tspan x="10px" y="388px"><tspan>  </tspan><tspan class="fg-bright-blue bold">╰╴</tspan>
+    <tspan x="10px" y="388px"><tspan>  </tspan><tspan class="fg-bright-blue bold">│</tspan><tspan> </tspan><tspan class="fg-yellow bold">┗━┛</tspan>
 </tspan>
-    <tspan x="10px" y="406px"><tspan class="fg-yellow bold">warning[prefer-text-field]</tspan><tspan class="bold">: Changing the size of a `varchar` field requires an `ACCESS EXCLUSIVE` lock, that will prevent all reads and writes to the table.</tspan>
+    <tspan x="10px" y="406px"><tspan>  </tspan><tspan class="fg-bright-blue bold">│</tspan>
 </tspan>
-    <tspan x="10px" y="424px"><tspan> </tspan><tspan class="fg-bright-blue bold"> ╭▸ </tspan><tspan>../../example.sql:7:13</tspan>
+    <tspan x="10px" y="424px"><tspan>  </tspan><tspan class="fg-bright-blue bold">├ </tspan><tspan class="bold">help</tspan><tspan>: Configure a `statement_timeout` before this statement</tspan>
 </tspan>
-    <tspan x="10px" y="442px"><tspan>  </tspan><tspan class="fg-bright-blue bold">│</tspan>
+    <tspan x="10px" y="442px"><tspan>  </tspan><tspan class="fg-bright-blue bold">╭╴</tspan>
 </tspan>
-    <tspan x="10px" y="460px"><tspan class="fg-bright-blue bold">7</tspan><tspan> </tspan><tspan class="fg-bright-blue bold">│</tspan><tspan>     "alpha" varchar(100) NOT NULL</tspan>
+    <tspan x="10px" y="460px"><tspan class="fg-bright-blue bold">1</tspan><tspan> </tspan><tspan class="fg-bright-green">+ set statement_timeout = '5s';</tspan>
 </tspan>
-    <tspan x="10px" y="478px"><tspan>  </tspan><tspan class="fg-bright-blue bold">│</tspan><tspan>             </tspan><tspan class="fg-yellow bold">━━━━━━━━━━━━</tspan>
+    <tspan x="10px" y="478px"><tspan>  </tspan><tspan class="fg-bright-blue bold">╰╴</tspan>
 </tspan>
-    <tspan x="10px" y="496px"><tspan>  </tspan><tspan class="fg-bright-blue bold">│</tspan>
+    <tspan x="10px" y="496px"><tspan class="fg-yellow bold">warning[prefer-bigint-over-int]</tspan><tspan class="bold">: Using 32-bit integer fields can result in hitting the max `int` limit.</tspan>
 </tspan>
-    <tspan x="10px" y="514px"><tspan>  </tspan><tspan class="fg-bright-blue bold">├ </tspan><tspan class="bold">help</tspan><tspan>: Use a `TEXT` field with a `CHECK` constraint.</tspan>
+    <tspan x="10px" y="514px"><tspan> </tspan><tspan class="fg-bright-blue bold"> ╭▸ </tspan><tspan>../../example.sql:6:10</tspan>
 </tspan>
-    <tspan x="10px" y="532px"><tspan>  </tspan><tspan class="fg-bright-blue bold">╭╴</tspan>
+    <tspan x="10px" y="532px"><tspan>  </tspan><tspan class="fg-bright-blue bold">│</tspan>
 </tspan>
-    <tspan x="10px" y="550px"><tspan class="fg-bright-blue bold">7</tspan><tspan> </tspan><tspan class="fg-bright-red">- </tspan><tspan>    "alpha" </tspan><tspan class="fg-bright-red">varchar(100)</tspan><tspan> NOT NULL</tspan>
+    <tspan x="10px" y="550px"><tspan class="fg-bright-blue bold">6</tspan><tspan> </tspan><tspan class="fg-bright-blue bold">│</tspan><tspan>     "id" serial NOT NULL PRIMARY KEY, </tspan>
 </tspan>
-    <tspan x="10px" y="568px"><tspan class="fg-bright-blue bold">7</tspan><tspan> </tspan><tspan class="fg-bright-green">+ </tspan><tspan>    "alpha" </tspan><tspan class="fg-bright-green">text</tspan><tspan> NOT NULL</tspan>
+    <tspan x="10px" y="568px"><tspan>  </tspan><tspan class="fg-bright-blue bold">│</tspan><tspan>          </tspan><tspan class="fg-yellow bold">━━━━━━</tspan>
 </tspan>
-    <tspan x="10px" y="586px"><tspan>  </tspan><tspan class="fg-bright-blue bold">╰╴</tspan>
+    <tspan x="10px" y="586px"><tspan>  </tspan><tspan class="fg-bright-blue bold">│</tspan>
 </tspan>
-    <tspan x="10px" y="604px"><tspan class="fg-yellow bold">warning[require-concurrent-index-creation]</tspan><tspan class="bold">: During normal index creation, table updates are blocked, but reads are still allowed.</tspan>
+    <tspan x="10px" y="604px"><tspan>  </tspan><tspan class="fg-bright-blue bold">├ </tspan><tspan class="bold">help</tspan><tspan>: Use 64-bit integer values instead to prevent hitting this limit.</tspan>
 </tspan>
-    <tspan x="10px" y="622px"><tspan>  </tspan><tspan class="fg-bright-blue bold"> ╭▸ </tspan><tspan>../../example.sql:10:1</tspan>
+    <tspan x="10px" y="622px"><tspan>  </tspan><tspan class="fg-bright-blue bold">╭╴</tspan>
 </tspan>
-    <tspan x="10px" y="640px"><tspan>   </tspan><tspan class="fg-bright-blue bold">│</tspan>
+    <tspan x="10px" y="640px"><tspan class="fg-bright-blue bold">6</tspan><tspan> </tspan><tspan class="fg-bright-blue bold">│ </tspan><tspan>    "id" </tspan><tspan class="fg-bright-green">big</tspan><tspan>serial NOT NULL PRIMARY KEY, </tspan>
 </tspan>
-    <tspan x="10px" y="658px"><tspan class="fg-bright-blue bold">10</tspan><tspan> </tspan><tspan class="fg-bright-blue bold">│</tspan><tspan> CREATE INDEX "field_name_idx" ON "table_name" ("field_name");</tspan>
+    <tspan x="10px" y="658px"><tspan>  </tspan><tspan class="fg-bright-blue bold">╰╴</tspan><tspan>         </tspan><tspan class="fg-bright-green">+++</tspan>
 </tspan>
-    <tspan x="10px" y="676px"><tspan>   </tspan><tspan class="fg-bright-blue bold">│</tspan><tspan> </tspan><tspan class="fg-yellow bold">━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━</tspan>
+    <tspan x="10px" y="676px"><tspan class="fg-yellow bold">warning[prefer-identity]</tspan><tspan class="bold">: Serial types make schema, dependency, and permission management difficult.</tspan>
 </tspan>
-    <tspan x="10px" y="694px"><tspan>   </tspan><tspan class="fg-bright-blue bold">│</tspan>
+    <tspan x="10px" y="694px"><tspan> </tspan><tspan class="fg-bright-blue bold"> ╭▸ </tspan><tspan>../../example.sql:6:10</tspan>
 </tspan>
-    <tspan x="10px" y="712px"><tspan>   </tspan><tspan class="fg-bright-blue bold">├ </tspan><tspan class="bold">help</tspan><tspan>: Use `concurrently` to avoid blocking writes.</tspan>
+    <tspan x="10px" y="712px"><tspan>  </tspan><tspan class="fg-bright-blue bold">│</tspan>
 </tspan>
-    <tspan x="10px" y="730px"><tspan>   </tspan><tspan class="fg-bright-blue bold">╭╴</tspan>
+    <tspan x="10px" y="730px"><tspan class="fg-bright-blue bold">6</tspan><tspan> </tspan><tspan class="fg-bright-blue bold">│</tspan><tspan>     "id" serial NOT NULL PRIMARY KEY, </tspan>
 </tspan>
-    <tspan x="10px" y="748px"><tspan class="fg-bright-blue bold">10</tspan><tspan> </tspan><tspan class="fg-bright-blue bold">│ </tspan><tspan>CREATE INDEX</tspan><tspan class="fg-bright-green"> concurrently</tspan><tspan> "field_name_idx" ON "table_name" ("field_name");</tspan>
+    <tspan x="10px" y="748px"><tspan>  </tspan><tspan class="fg-bright-blue bold">│</tspan><tspan>          </tspan><tspan class="fg-yellow bold">━━━━━━</tspan>
 </tspan>
-    <tspan x="10px" y="766px"><tspan>   </tspan><tspan class="fg-bright-blue bold">╰╴</tspan><tspan>             </tspan><tspan class="fg-bright-green">++++++++++++</tspan>
+    <tspan x="10px" y="766px"><tspan>  </tspan><tspan class="fg-bright-blue bold">│</tspan>
 </tspan>
-    <tspan x="10px" y="784px"><tspan class="fg-yellow bold">warning[constraint-missing-not-valid]</tspan><tspan class="bold">: By default new constraints require a table scan and block writes to the table while that scan occurs.</tspan>
+    <tspan x="10px" y="784px"><tspan>  </tspan><tspan class="fg-bright-blue bold">├ </tspan><tspan class="bold">help</tspan><tspan>: Use an `IDENTITY` column instead.</tspan>
 </tspan>
-    <tspan x="10px" y="802px"><tspan>  </tspan><tspan class="fg-bright-blue bold"> ╭▸ </tspan><tspan>../../example.sql:12:24</tspan>
+    <tspan x="10px" y="802px"><tspan>  </tspan><tspan class="fg-bright-blue bold">╭╴</tspan>
 </tspan>
-    <tspan x="10px" y="820px"><tspan>   </tspan><tspan class="fg-bright-blue bold">│</tspan>
+    <tspan x="10px" y="820px"><tspan class="fg-bright-blue bold">6</tspan><tspan> </tspan><tspan class="fg-bright-red">- </tspan><tspan>    "id" </tspan><tspan class="fg-bright-red">serial</tspan><tspan> NOT NULL PRIMARY KEY, </tspan>
 </tspan>
-    <tspan x="10px" y="838px"><tspan class="fg-bright-blue bold">12</tspan><tspan> </tspan><tspan class="fg-bright-blue bold">│</tspan><tspan> ALTER TABLE table_name ADD CONSTRAINT field_name_constraint UNIQUE (field_name);</tspan>
+    <tspan x="10px" y="838px"><tspan class="fg-bright-blue bold">6</tspan><tspan> </tspan><tspan class="fg-bright-green">+ </tspan><tspan>    "id" </tspan><tspan class="fg-bright-green">integer generated by default as identity</tspan><tspan> NOT NULL PRIMARY KEY, </tspan>
 </tspan>
-    <tspan x="10px" y="856px"><tspan>   </tspan><tspan class="fg-bright-blue bold">│</tspan><tspan>                        </tspan><tspan class="fg-yellow bold">━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━</tspan>
+    <tspan x="10px" y="856px"><tspan>  </tspan><tspan class="fg-bright-blue bold">╰╴</tspan>
 </tspan>
-    <tspan x="10px" y="874px"><tspan>   </tspan><tspan class="fg-bright-blue bold">│</tspan>
+    <tspan x="10px" y="874px"><tspan class="fg-yellow bold">warning[prefer-text-field]</tspan><tspan class="bold">: Changing the size of a `varchar` field requires an `ACCESS EXCLUSIVE` lock, that will prevent all reads and writes to the table.</tspan>
 </tspan>
-    <tspan x="10px" y="892px"><tspan>   </tspan><tspan class="fg-bright-blue bold">╰ </tspan><tspan class="bold">help</tspan><tspan>: Use `NOT VALID` with a later `VALIDATE CONSTRAINT` call.</tspan>
+    <tspan x="10px" y="892px"><tspan> </tspan><tspan class="fg-bright-blue bold"> ╭▸ </tspan><tspan>../../example.sql:7:13</tspan>
 </tspan>
-    <tspan x="10px" y="910px"><tspan class="fg-yellow bold">warning[disallowed-unique-constraint]</tspan><tspan class="bold">: Adding a `UNIQUE` constraint requires an `ACCESS EXCLUSIVE` lock which blocks reads and writes to the table while the index is built.</tspan>
+    <tspan x="10px" y="910px"><tspan>  </tspan><tspan class="fg-bright-blue bold">│</tspan>
 </tspan>
-    <tspan x="10px" y="928px"><tspan>  </tspan><tspan class="fg-bright-blue bold"> ╭▸ </tspan><tspan>../../example.sql:12:28</tspan>
+    <tspan x="10px" y="928px"><tspan class="fg-bright-blue bold">7</tspan><tspan> </tspan><tspan class="fg-bright-blue bold">│</tspan><tspan>     "alpha" varchar(100) NOT NULL</tspan>
 </tspan>
-    <tspan x="10px" y="946px"><tspan>   </tspan><tspan class="fg-bright-blue bold">│</tspan>
+    <tspan x="10px" y="946px"><tspan>  </tspan><tspan class="fg-bright-blue bold">│</tspan><tspan>             </tspan><tspan class="fg-yellow bold">━━━━━━━━━━━━</tspan>
 </tspan>
-    <tspan x="10px" y="964px"><tspan class="fg-bright-blue bold">12</tspan><tspan> </tspan><tspan class="fg-bright-blue bold">│</tspan><tspan> ALTER TABLE table_name ADD CONSTRAINT field_name_constraint UNIQUE (field_name);</tspan>
+    <tspan x="10px" y="964px"><tspan>  </tspan><tspan class="fg-bright-blue bold">│</tspan>
 </tspan>
-    <tspan x="10px" y="982px"><tspan>   </tspan><tspan class="fg-bright-blue bold">│</tspan><tspan>                            </tspan><tspan class="fg-yellow bold">━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━</tspan>
+    <tspan x="10px" y="982px"><tspan>  </tspan><tspan class="fg-bright-blue bold">├ </tspan><tspan class="bold">help</tspan><tspan>: Use a `TEXT` field with a `CHECK` constraint.</tspan>
 </tspan>
-    <tspan x="10px" y="1000px"><tspan>   </tspan><tspan class="fg-bright-blue bold">│</tspan>
+    <tspan x="10px" y="1000px"><tspan>  </tspan><tspan class="fg-bright-blue bold">╭╴</tspan>
 </tspan>
-    <tspan x="10px" y="1018px"><tspan>   </tspan><tspan class="fg-bright-blue bold">╰ </tspan><tspan class="bold">help</tspan><tspan>: Create an index `CONCURRENTLY` and create the constraint using the index.</tspan>
+    <tspan x="10px" y="1018px"><tspan class="fg-bright-blue bold">7</tspan><tspan> </tspan><tspan class="fg-bright-red">- </tspan><tspan>    "alpha" </tspan><tspan class="fg-bright-red">varchar(100)</tspan><tspan> NOT NULL</tspan>
 </tspan>
-    <tspan x="10px" y="1036px">
+    <tspan x="10px" y="1036px"><tspan class="fg-bright-blue bold">7</tspan><tspan> </tspan><tspan class="fg-bright-green">+ </tspan><tspan>    "alpha" </tspan><tspan class="fg-bright-green">text</tspan><tspan> NOT NULL</tspan>
 </tspan>
-    <tspan x="10px" y="1054px"><tspan>Find detailed examples and solutions for each rule at </tspan><tspan class="underline">https://squawkhq.com/docs/rules</tspan>
+    <tspan x="10px" y="1054px"><tspan>  </tspan><tspan class="fg-bright-blue bold">╰╴</tspan>
 </tspan>
-    <tspan x="10px" y="1072px"><tspan>Found 6 issues in 1 file (checked 1 source file)</tspan>
+    <tspan x="10px" y="1072px"><tspan class="fg-yellow bold">warning[require-concurrent-index-creation]</tspan><tspan class="bold">: During normal index creation, table updates are blocked, but reads are still allowed.</tspan>
 </tspan>
-    <tspan x="10px" y="1090px">
+    <tspan x="10px" y="1090px"><tspan>  </tspan><tspan class="fg-bright-blue bold"> ╭▸ </tspan><tspan>../../example.sql:10:1</tspan>
+</tspan>
+    <tspan x="10px" y="1108px"><tspan>   </tspan><tspan class="fg-bright-blue bold">│</tspan>
+</tspan>
+    <tspan x="10px" y="1126px"><tspan class="fg-bright-blue bold">10</tspan><tspan> </tspan><tspan class="fg-bright-blue bold">│</tspan><tspan> CREATE INDEX "field_name_idx" ON "table_name" ("field_name");</tspan>
+</tspan>
+    <tspan x="10px" y="1144px"><tspan>   </tspan><tspan class="fg-bright-blue bold">│</tspan><tspan> </tspan><tspan class="fg-yellow bold">━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━</tspan>
+</tspan>
+    <tspan x="10px" y="1162px"><tspan>   </tspan><tspan class="fg-bright-blue bold">│</tspan>
+</tspan>
+    <tspan x="10px" y="1180px"><tspan>   </tspan><tspan class="fg-bright-blue bold">├ </tspan><tspan class="bold">help</tspan><tspan>: Use `concurrently` to avoid blocking writes.</tspan>
+</tspan>
+    <tspan x="10px" y="1198px"><tspan>   </tspan><tspan class="fg-bright-blue bold">╭╴</tspan>
+</tspan>
+    <tspan x="10px" y="1216px"><tspan class="fg-bright-blue bold">10</tspan><tspan> </tspan><tspan class="fg-bright-blue bold">│ </tspan><tspan>CREATE INDEX</tspan><tspan class="fg-bright-green"> concurrently</tspan><tspan> "field_name_idx" ON "table_name" ("field_name");</tspan>
+</tspan>
+    <tspan x="10px" y="1234px"><tspan>   </tspan><tspan class="fg-bright-blue bold">╰╴</tspan><tspan>             </tspan><tspan class="fg-bright-green">++++++++++++</tspan>
+</tspan>
+    <tspan x="10px" y="1252px"><tspan class="fg-yellow bold">warning[constraint-missing-not-valid]</tspan><tspan class="bold">: By default new constraints require a table scan and block writes to the table while that scan occurs.</tspan>
+</tspan>
+    <tspan x="10px" y="1270px"><tspan>  </tspan><tspan class="fg-bright-blue bold"> ╭▸ </tspan><tspan>../../example.sql:12:24</tspan>
+</tspan>
+    <tspan x="10px" y="1288px"><tspan>   </tspan><tspan class="fg-bright-blue bold">│</tspan>
+</tspan>
+    <tspan x="10px" y="1306px"><tspan class="fg-bright-blue bold">12</tspan><tspan> </tspan><tspan class="fg-bright-blue bold">│</tspan><tspan> ALTER TABLE table_name ADD CONSTRAINT field_name_constraint UNIQUE (field_name);</tspan>
+</tspan>
+    <tspan x="10px" y="1324px"><tspan>   </tspan><tspan class="fg-bright-blue bold">│</tspan><tspan>                        </tspan><tspan class="fg-yellow bold">━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━</tspan>
+</tspan>
+    <tspan x="10px" y="1342px"><tspan>   </tspan><tspan class="fg-bright-blue bold">│</tspan>
+</tspan>
+    <tspan x="10px" y="1360px"><tspan>   </tspan><tspan class="fg-bright-blue bold">╰ </tspan><tspan class="bold">help</tspan><tspan>: Use `NOT VALID` with a later `VALIDATE CONSTRAINT` call.</tspan>
+</tspan>
+    <tspan x="10px" y="1378px"><tspan class="fg-yellow bold">warning[disallowed-unique-constraint]</tspan><tspan class="bold">: Adding a `UNIQUE` constraint requires an `ACCESS EXCLUSIVE` lock which blocks reads and writes to the table while the index is built.</tspan>
+</tspan>
+    <tspan x="10px" y="1396px"><tspan>  </tspan><tspan class="fg-bright-blue bold"> ╭▸ </tspan><tspan>../../example.sql:12:28</tspan>
+</tspan>
+    <tspan x="10px" y="1414px"><tspan>   </tspan><tspan class="fg-bright-blue bold">│</tspan>
+</tspan>
+    <tspan x="10px" y="1432px"><tspan class="fg-bright-blue bold">12</tspan><tspan> </tspan><tspan class="fg-bright-blue bold">│</tspan><tspan> ALTER TABLE table_name ADD CONSTRAINT field_name_constraint UNIQUE (field_name);</tspan>
+</tspan>
+    <tspan x="10px" y="1450px"><tspan>   </tspan><tspan class="fg-bright-blue bold">│</tspan><tspan>                            </tspan><tspan class="fg-yellow bold">━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━</tspan>
+</tspan>
+    <tspan x="10px" y="1468px"><tspan>   </tspan><tspan class="fg-bright-blue bold">│</tspan>
+</tspan>
+    <tspan x="10px" y="1486px"><tspan>   </tspan><tspan class="fg-bright-blue bold">╰ </tspan><tspan class="bold">help</tspan><tspan>: Create an index `CONCURRENTLY` and create the constraint using the index.</tspan>
+</tspan>
+    <tspan x="10px" y="1504px">
+</tspan>
+    <tspan x="10px" y="1522px"><tspan>Find detailed examples and solutions for each rule at </tspan><tspan class="underline">https://squawkhq.com/docs/rules</tspan>
+</tspan>
+    <tspan x="10px" y="1540px"><tspan>Found 8 issues in 1 file (checked 1 source file)</tspan>
+</tspan>
+    <tspan x="10px" y="1558px">
 </tspan>
   </text>
 
diff --git a/crates/squawk/src/snapshots/squawk__reporter__test_reporter__display_violations_tty.snap b/crates/squawk/src/snapshots/squawk__reporter__test_reporter__display_violations_tty.snap
index 03a5c73a..e4df9ce7 100644
--- a/crates/squawk/src/snapshots/squawk__reporter__test_reporter__display_violations_tty.snap
+++ b/crates/squawk/src/snapshots/squawk__reporter__test_reporter__display_violations_tty.snap
@@ -2,6 +2,26 @@
 source: crates/squawk/src/reporter.rs
 expression: "strip_ansi_codes(&String::from_utf8_lossy(&buff))"
 ---
+warning[require-timeout-settings]: Missing `set lock_timeout` before potentially slow operations
+  ╭▸ main.sql:2:4
+  │
+2 │    ALTER TABLE "core_recipe" ADD COLUMN "foo" integer NOT NULL;
+  │    ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+  │
+  ├ help: Configure a `lock_timeout` before this statement.
+  ╭╴
+2 +    set lock_timeout = '1s';
+  ╰╴
+warning[require-timeout-settings]: Missing `set statement_timeout` before potentially slow operations
+  ╭▸ main.sql:2:4
+  │
+2 │    ALTER TABLE "core_recipe" ADD COLUMN "foo" integer NOT NULL;
+  │    ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+  │
+  ├ help: Configure a `statement_timeout` before this statement
+  ╭╴
+2 +    set statement_timeout = '5s';
+  ╰╴
 warning[adding-required-field]: Adding a new column that is `NOT NULL` and has no default value to an existing table effectively makes it required.
   ╭▸ main.sql:2:30
   │
@@ -56,4 +76,4 @@ warning[prefer-bigint-over-int]: Using 32-bit integer fields can result in hitti
   ╰╴
 
 Find detailed examples and solutions for each rule at https://squawkhq.com/docs/rules
-Found 6 issues in 1 file (checked 1 source file)
+Found 8 issues in 1 file (checked 1 source file)
diff --git a/crates/squawk/src/snapshots/squawk__reporter__test_reporter__display_violations_tty_and_github_annotations.snap b/crates/squawk/src/snapshots/squawk__reporter__test_reporter__display_violations_tty_and_github_annotations.snap
index d92952d0..22b866d1 100644
--- a/crates/squawk/src/snapshots/squawk__reporter__test_reporter__display_violations_tty_and_github_annotations.snap
+++ b/crates/squawk/src/snapshots/squawk__reporter__test_reporter__display_violations_tty_and_github_annotations.snap
@@ -2,12 +2,34 @@
 source: crates/squawk/src/reporter.rs
 expression: "strip_ansi_codes(&String::from_utf8_lossy(&buff))"
 ---
+::warning file=main.sql,line=2,col=3,endLine=2,endColumn=62,title=require-timeout-settings::Missing `set lock_timeout` before potentially slow operations
+::warning file=main.sql,line=2,col=3,endLine=2,endColumn=62,title=require-timeout-settings::Missing `set statement_timeout` before potentially slow operations
 ::warning file=main.sql,line=2,col=29,endLine=2,endColumn=62,title=adding-required-field::Adding a new column that is `NOT NULL` and has no default value to an existing table effectively makes it required.
 ::warning file=main.sql,line=2,col=29,endLine=2,endColumn=62,title=prefer-robust-stmts::Missing `IF NOT EXISTS`, the migration can't be rerun if it fails part way through.
 ::warning file=main.sql,line=2,col=46,endLine=2,endColumn=53,title=prefer-bigint-over-int::Using 32-bit integer fields can result in hitting the max `int` limit.
 ::warning file=main.sql,line=5,col=2,endLine=6,endColumn=20,title=adding-required-field::Adding a new column that is `NOT NULL` and has no default value to an existing table effectively makes it required.
 ::warning file=main.sql,line=5,col=2,endLine=6,endColumn=20,title=prefer-robust-stmts::Missing `IF NOT EXISTS`, the migration can't be rerun if it fails part way through.
 ::warning file=main.sql,line=6,col=4,endLine=6,endColumn=11,title=prefer-bigint-over-int::Using 32-bit integer fields can result in hitting the max `int` limit.
+warning[require-timeout-settings]: Missing `set lock_timeout` before potentially slow operations
+  ╭▸ main.sql:2:4
+  │
+2 │    ALTER TABLE "core_recipe" ADD COLUMN "foo" integer NOT NULL;
+  │    ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+  │
+  ├ help: Configure a `lock_timeout` before this statement.
+  ╭╴
+2 +    set lock_timeout = '1s';
+  ╰╴
+warning[require-timeout-settings]: Missing `set statement_timeout` before potentially slow operations
+  ╭▸ main.sql:2:4
+  │
+2 │    ALTER TABLE "core_recipe" ADD COLUMN "foo" integer NOT NULL;
+  │    ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+  │
+  ├ help: Configure a `statement_timeout` before this statement
+  ╭╴
+2 +    set statement_timeout = '5s';
+  ╰╴
 warning[adding-required-field]: Adding a new column that is `NOT NULL` and has no default value to an existing table effectively makes it required.
   ╭▸ main.sql:2:30
   │
@@ -64,4 +86,4 @@ warning[prefer-bigint-over-int]: Using 32-bit integer fields can result in hitti
   ╰╴
 
 Find detailed examples and solutions for each rule at https://squawkhq.com/docs/rules
-Found 6 issues in 1 file (checked 1 source file)
+Found 8 issues in 1 file (checked 1 source file)
diff --git a/crates/squawk/src/snapshots/squawk__reporter__test_reporter__span_offsets.snap b/crates/squawk/src/snapshots/squawk__reporter__test_reporter__span_offsets.snap
index f16d8fb7..67809564 100644
--- a/crates/squawk/src/snapshots/squawk__reporter__test_reporter__span_offsets.snap
+++ b/crates/squawk/src/snapshots/squawk__reporter__test_reporter__span_offsets.snap
@@ -6,6 +6,60 @@ CheckReport {
     filename: "main.sql",
     sql: "\n\n   ALTER TABLE \"core_recipe\" ADD COLUMN \"foo\" integer NOT NULL;\nALTER TABLE \"core_foo\" ADD COLUMN \"bar\" integer NOT NULL;\nSELECT 1;\n",
     violations: [
+        ReportViolation {
+            file: "main.sql",
+            line: 2,
+            column: 3,
+            range: 5..64,
+            level: Warning,
+            message: "Missing `set lock_timeout` before potentially slow operations",
+            help: Some(
+                "Configure a `lock_timeout` before this statement.",
+            ),
+            rule_name: "require-timeout-settings",
+            column_end: 62,
+            line_end: 2,
+            fix: Some(
+                Fix {
+                    title: "Add lock timeout",
+                    edits: [
+                        Edit {
+                            text_range: 5..5,
+                            text: Some(
+                                "set lock_timeout = '1s';\n",
+                            ),
+                        },
+                    ],
+                },
+            ),
+        },
+        ReportViolation {
+            file: "main.sql",
+            line: 2,
+            column: 3,
+            range: 5..64,
+            level: Warning,
+            message: "Missing `set statement_timeout` before potentially slow operations",
+            help: Some(
+                "Configure a `statement_timeout` before this statement",
+            ),
+            rule_name: "require-timeout-settings",
+            column_end: 62,
+            line_end: 2,
+            fix: Some(
+                Fix {
+                    title: "Add statement timeout",
+                    edits: [
+                        Edit {
+                            text_range: 5..5,
+                            text: Some(
+                                "set statement_timeout = '5s';\n",
+                            ),
+                        },
+                    ],
+                },
+            ),
+        },
         ReportViolation {
             file: "main.sql",
             line: 2,
diff --git a/crates/squawk_linter/src/analyze.rs b/crates/squawk_linter/src/analyze.rs
new file mode 100644
index 00000000..f48b325f
--- /dev/null
+++ b/crates/squawk_linter/src/analyze.rs
@@ -0,0 +1,214 @@
+use squawk_syntax::ast;
+
+/// Returns `true` if the statement might impede normal database queries.
+pub fn possibly_slow_stmt(stmt: &ast::Stmt) -> bool {
+    // We assume all DDL like Alter, Create, Drop could affect queries.
+    //
+    // We don't want to warn about DML style queries, like select,
+    // insert, update, delete, etc. This allows using squawk for normal SQL
+    // editing.
+    match stmt {
+        | ast::Stmt::AlterAggregate(_)
+        | ast::Stmt::AlterCollation(_)
+        | ast::Stmt::AlterConversion(_)
+        | ast::Stmt::AlterDatabase(_)
+        | ast::Stmt::AlterDefaultPrivileges(_)
+        | ast::Stmt::AlterDomain(_)
+        | ast::Stmt::AlterEventTrigger(_)
+        | ast::Stmt::AlterExtension(_)
+        | ast::Stmt::AlterForeignDataWrapper(_)
+        | ast::Stmt::AlterForeignTable(_)
+        | ast::Stmt::AlterFunction(_)
+        | ast::Stmt::AlterGroup(_)
+        | ast::Stmt::AlterIndex(_)
+        | ast::Stmt::AlterLanguage(_)
+        | ast::Stmt::AlterLargeObject(_)
+        | ast::Stmt::AlterMaterializedView(_)
+        | ast::Stmt::AlterOperator(_)
+        | ast::Stmt::AlterOperatorClass(_)
+        | ast::Stmt::AlterOperatorFamily(_)
+        | ast::Stmt::AlterPolicy(_)
+        | ast::Stmt::AlterProcedure(_)
+        | ast::Stmt::AlterPublication(_)
+        | ast::Stmt::AlterRole(_)
+        | ast::Stmt::AlterRoutine(_)
+        | ast::Stmt::AlterRule(_)
+        | ast::Stmt::AlterSchema(_)
+        | ast::Stmt::AlterSequence(_)
+        | ast::Stmt::AlterServer(_)
+        | ast::Stmt::AlterStatistics(_)
+        | ast::Stmt::AlterSubscription(_)
+        | ast::Stmt::AlterSystem(_)
+        | ast::Stmt::AlterTable(_)
+        | ast::Stmt::AlterTablespace(_)
+        | ast::Stmt::AlterTextSearchConfiguration(_)
+        | ast::Stmt::AlterTextSearchDictionary(_)
+        | ast::Stmt::AlterTextSearchParser(_)
+        | ast::Stmt::AlterTextSearchTemplate(_)
+        | ast::Stmt::AlterTrigger(_)
+        | ast::Stmt::AlterType(_)
+        | ast::Stmt::AlterUser(_)
+        | ast::Stmt::AlterUserMapping(_)
+        | ast::Stmt::AlterView(_)
+        | ast::Stmt::CreateAccessMethod(_)
+        | ast::Stmt::CreateAggregate(_)
+        | ast::Stmt::CreateCast(_)
+        | ast::Stmt::CreateCollation(_)
+        | ast::Stmt::CreateConversion(_)
+        | ast::Stmt::CreateDatabase(_)
+        | ast::Stmt::CreateDomain(_)
+        | ast::Stmt::CreateEventTrigger(_)
+        | ast::Stmt::CreateExtension(_)
+        | ast::Stmt::CreateForeignDataWrapper(_)
+        | ast::Stmt::CreateForeignTable(_)
+        | ast::Stmt::CreateFunction(_)
+        | ast::Stmt::CreateGroup(_)
+        | ast::Stmt::CreateIndex(_)
+        | ast::Stmt::CreateLanguage(_)
+        | ast::Stmt::CreateMaterializedView(_)
+        | ast::Stmt::CreateOperator(_)
+        | ast::Stmt::CreateOperatorClass(_)
+        | ast::Stmt::CreateOperatorFamily(_)
+        | ast::Stmt::CreatePolicy(_)
+        | ast::Stmt::CreateProcedure(_)
+        | ast::Stmt::CreatePublication(_)
+        | ast::Stmt::CreateRole(_)
+        | ast::Stmt::CreateRule(_)
+        | ast::Stmt::CreateSchema(_)
+        | ast::Stmt::CreateSequence(_)
+        | ast::Stmt::CreateServer(_)
+        | ast::Stmt::CreateStatistics(_)
+        | ast::Stmt::CreateSubscription(_)
+        | ast::Stmt::CreateTable(_)
+        | ast::Stmt::CreateTableAs(_)
+        | ast::Stmt::CreateTablespace(_)
+        | ast::Stmt::CreateTextSearchConfiguration(_)
+        | ast::Stmt::CreateTextSearchDictionary(_)
+        | ast::Stmt::CreateTextSearchParser(_)
+        | ast::Stmt::CreateTextSearchTemplate(_)
+        | ast::Stmt::CreateTransform(_)
+        | ast::Stmt::CreateTrigger(_)
+        | ast::Stmt::CreateType(_)
+        | ast::Stmt::CreateUser(_)
+        | ast::Stmt::CreateUserMapping(_)
+        | ast::Stmt::CreateView(_)
+        | ast::Stmt::DropAccessMethod(_)
+        | ast::Stmt::DropAggregate(_)
+        | ast::Stmt::DropCast(_)
+        | ast::Stmt::DropCollation(_)
+        | ast::Stmt::DropConversion(_)
+        | ast::Stmt::DropDatabase(_)
+        | ast::Stmt::DropDomain(_)
+        | ast::Stmt::DropEventTrigger(_)
+        | ast::Stmt::DropExtension(_)
+        | ast::Stmt::DropForeignDataWrapper(_)
+        | ast::Stmt::DropForeignTable(_)
+        | ast::Stmt::DropFunction(_)
+        | ast::Stmt::DropGroup(_)
+        | ast::Stmt::DropIndex(_)
+        | ast::Stmt::DropLanguage(_)
+        | ast::Stmt::DropMaterializedView(_)
+        | ast::Stmt::DropOperator(_)
+        | ast::Stmt::DropOperatorClass(_)
+        | ast::Stmt::DropOperatorFamily(_)
+        | ast::Stmt::DropOwned(_)
+        | ast::Stmt::DropPolicy(_)
+        | ast::Stmt::DropProcedure(_)
+        | ast::Stmt::DropPublication(_)
+        | ast::Stmt::DropRole(_)
+        | ast::Stmt::DropRoutine(_)
+        | ast::Stmt::DropRule(_)
+        | ast::Stmt::DropSchema(_)
+        | ast::Stmt::DropSequence(_)
+        | ast::Stmt::DropServer(_)
+        | ast::Stmt::DropStatistics(_)
+        | ast::Stmt::DropSubscription(_)
+        | ast::Stmt::DropTable(_)
+        | ast::Stmt::DropTablespace(_)
+        | ast::Stmt::DropTextSearchConfig(_)
+        | ast::Stmt::DropTextSearchDict(_)
+        | ast::Stmt::DropTextSearchParser(_)
+        | ast::Stmt::DropTextSearchTemplate(_)
+        | ast::Stmt::DropTransform(_)
+        | ast::Stmt::DropTrigger(_)
+        | ast::Stmt::DropType(_)
+        | ast::Stmt::DropUser(_)
+        | ast::Stmt::DropUserMapping(_)
+        | ast::Stmt::DropView(_)
+        // non-Alter, Create, Drop statements
+        | ast::Stmt::Cluster(_)
+        | ast::Stmt::CommentOn(_)
+        | ast::Stmt::ImportForeignSchema(_)
+        | ast::Stmt::Load(_)
+        | ast::Stmt::Lock(_)
+        | ast::Stmt::Refresh(_)
+        | ast::Stmt::Reindex(_)
+        | ast::Stmt::Truncate(_)
+        | ast::Stmt::Vacuum(_)
+        => true,
+        ast::Stmt::Analyze(_)
+        | ast::Stmt::Begin(_)
+        | ast::Stmt::Call(_)
+        | ast::Stmt::Checkpoint(_)
+        | ast::Stmt::Close(_)
+        | ast::Stmt::Commit(_)
+        | ast::Stmt::Copy(_)
+        | ast::Stmt::Deallocate(_)
+        | ast::Stmt::Declare(_)
+        | ast::Stmt::Delete(_)
+        | ast::Stmt::Discard(_)
+        | ast::Stmt::Do(_)
+        | ast::Stmt::Execute(_)
+        | ast::Stmt::Explain(_)
+        | ast::Stmt::Fetch(_)
+        | ast::Stmt::Grant(_)
+        | ast::Stmt::Insert(_)
+        | ast::Stmt::Listen(_)
+        | ast::Stmt::Merge(_)
+        | ast::Stmt::Move(_)
+        | ast::Stmt::Notify(_)
+        | ast::Stmt::ParenSelect(_)
+        | ast::Stmt::Prepare(_)
+        | ast::Stmt::PrepareTransaction(_)
+        | ast::Stmt::Reassign(_)
+        | ast::Stmt::ReleaseSavepoint(_)
+        | ast::Stmt::Reset(_)
+        | ast::Stmt::Revoke(_)
+        | ast::Stmt::Rollback(_)
+        | ast::Stmt::Savepoint(_)
+        | ast::Stmt::SecurityLabel(_)
+        | ast::Stmt::Select(_)
+        | ast::Stmt::SelectInto(_)
+        | ast::Stmt::Set(_)
+        | ast::Stmt::SetConstraints(_)
+        | ast::Stmt::SetRole(_)
+        | ast::Stmt::SetSessionAuth(_)
+        | ast::Stmt::SetTransaction(_)
+        | ast::Stmt::Show(_)
+        | ast::Stmt::Unlisten(_)
+        | ast::Stmt::Update(_)
+        | ast::Stmt::Values(_) => false,
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use squawk_syntax::SourceFile;
+
+    #[test]
+    fn alter_table() {
+        let sql = "ALTER TABLE users ADD COLUMN email TEXT;";
+        let file = SourceFile::parse(sql);
+        let stmts = file.tree().stmts().next().unwrap();
+        assert!(possibly_slow_stmt(&stmts));
+    }
+
+    #[test]
+    fn select() {
+        let sql = "select 1;";
+        let file = SourceFile::parse(sql);
+        let stmts = file.tree().stmts().next().unwrap();
+        assert!(!possibly_slow_stmt(&stmts));
+    }
+}
diff --git a/crates/squawk_linter/src/ignore.rs b/crates/squawk_linter/src/ignore.rs
index 821df8db..681c57f4 100644
--- a/crates/squawk_linter/src/ignore.rs
+++ b/crates/squawk_linter/src/ignore.rs
@@ -148,7 +148,7 @@ alter table t drop column c cascade;
         let sql = "
 -- fooo bar
 -- buzz
--- squawk-ignore prefer-robust-stmts
+-- squawk-ignore prefer-robust-stmts, require-timeout-settings
 create table x();
 
 select 1;
@@ -233,7 +233,7 @@ alter table t drop column c cascade;
     fn ignore_multiple_stmts() {
         let mut linter = Linter::with_all_rules();
         let sql = r#"
--- squawk-ignore ban-char-field,prefer-robust-stmts
+-- squawk-ignore ban-char-field,prefer-robust-stmts,require-timeout-settings
 alter table t add column c char;
 
 ALTER TABLE foo
@@ -258,14 +258,78 @@ create table users (
 
         let parse = squawk_syntax::SourceFile::parse(sql);
         let errors = linter.lint(&parse, sql);
-        assert_eq!(errors.len(), 1);
+        assert_debug_snapshot!(errors, @r#"
+        [
+            Violation {
+                code: RequireTimeoutSettings,
+                message: "Missing `set lock_timeout` before potentially slow operations",
+                text_range: 0..31,
+                help: Some(
+                    "Configure a `lock_timeout` before this statement.",
+                ),
+                fix: Some(
+                    Fix {
+                        title: "Add lock timeout",
+                        edits: [
+                            Edit {
+                                text_range: 0..0,
+                                text: Some(
+                                    "set lock_timeout = '1s';\n",
+                                ),
+                            },
+                        ],
+                    },
+                ),
+            },
+            Violation {
+                code: RequireTimeoutSettings,
+                message: "Missing `set statement_timeout` before potentially slow operations",
+                text_range: 0..31,
+                help: Some(
+                    "Configure a `statement_timeout` before this statement",
+                ),
+                fix: Some(
+                    Fix {
+                        title: "Add statement timeout",
+                        edits: [
+                            Edit {
+                                text_range: 0..0,
+                                text: Some(
+                                    "set statement_timeout = '5s';\n",
+                                ),
+                            },
+                        ],
+                    },
+                ),
+            },
+            Violation {
+                code: BanCharField,
+                message: "Using `character` is likely a mistake and should almost always be replaced by `text` or `varchar`.",
+                text_range: 27..31,
+                help: None,
+                fix: Some(
+                    Fix {
+                        title: "Replace with `text`",
+                        edits: [
+                            Edit {
+                                text_range: 27..31,
+                                text: Some(
+                                    "text",
+                                ),
+                            },
+                        ],
+                    },
+                ),
+            },
+        ]
+        "#);
     }
 
     #[test]
     fn regression_unknown_name() {
         let mut linter = Linter::with_all_rules();
         let sql = r#"
--- squawk-ignore prefer-robust-stmts
+-- squawk-ignore prefer-robust-stmts, require-timeout-settings
 create table test_table (
   -- squawk-ignore prefer-timestamp-tz
   created_at timestamp default current_timestamp,
@@ -275,6 +339,7 @@ create table test_table (
 
         let parse = squawk_syntax::SourceFile::parse(sql);
         let errors = linter.lint(&parse, sql);
+        assert_debug_snapshot!(errors, @"[]");
         assert_eq!(errors.len(), 0);
     }
 
@@ -390,6 +455,8 @@ alter table t2 drop column c2 cascade;
 
         assert_debug_snapshot!(errors, @r"
         [
+            RequireTimeoutSettings,
+            RequireTimeoutSettings,
             PreferRobustStmts,
             PreferRobustStmts,
         ]
@@ -414,6 +481,8 @@ alter table t2 drop column c2 cascade;
 
         assert_debug_snapshot!(errors, @r"
         [
+            RequireTimeoutSettings,
+            RequireTimeoutSettings,
             PreferRobustStmts,
             PreferRobustStmts,
         ]
diff --git a/crates/squawk_linter/src/lib.rs b/crates/squawk_linter/src/lib.rs
index 81fff6b0..0e6f6472 100644
--- a/crates/squawk_linter/src/lib.rs
+++ b/crates/squawk_linter/src/lib.rs
@@ -15,6 +15,7 @@ use squawk_syntax::{Parse, SourceFile};
 
 pub use version::Version;
 
+pub mod analyze;
 pub mod ignore;
 mod ignore_index;
 mod version;
@@ -51,6 +52,7 @@ use rules::renaming_column;
 use rules::renaming_table;
 use rules::require_concurrent_index_creation;
 use rules::require_concurrent_index_deletion;
+use rules::require_timeout_settings;
 use rules::transaction_nesting;
 // xtask:new-rule:rule-import
 
@@ -85,6 +87,7 @@ pub enum Rule {
     BanCreateDomainWithConstraint,
     BanAlterDomainWithAddConstraint,
     BanTruncateCascade,
+    RequireTimeoutSettings,
     // xtask:new-rule:error-name
 }
 
@@ -125,6 +128,7 @@ impl TryFrom<&str> for Rule {
             "ban-create-domain-with-constraint" => Ok(Rule::BanCreateDomainWithConstraint),
             "ban-alter-domain-with-add-constraint" => Ok(Rule::BanAlterDomainWithAddConstraint),
             "ban-truncate-cascade" => Ok(Rule::BanTruncateCascade),
+            "require-timeout-settings" => Ok(Rule::RequireTimeoutSettings),
             // xtask:new-rule:str-name
             _ => Err(format!("Unknown violation name: {s}")),
         }
@@ -185,6 +189,7 @@ impl fmt::Display for Rule {
             Rule::UnusedIgnore => "unused-ignore",
             Rule::BanAlterDomainWithAddConstraint => "ban-alter-domain-with-add-constraint",
             Rule::BanTruncateCascade => "ban-truncate-cascade",
+            Rule::RequireTimeoutSettings => "require-timeout-settings",
             // xtask:new-rule:variant-to-name
         };
         write!(f, "{val}")
@@ -399,6 +404,9 @@ impl Linter {
         if self.rules.contains(&Rule::BanTruncateCascade) {
             ban_truncate_cascade(self, file);
         }
+        if self.rules.contains(&Rule::RequireTimeoutSettings) {
+            require_timeout_settings(self, file);
+        }
         // xtask:new-rule:rule-call
 
         // locate any ignores in the file
diff --git a/crates/squawk_linter/src/rules/mod.rs b/crates/squawk_linter/src/rules/mod.rs
index 7886c25d..7df1f834 100644
--- a/crates/squawk_linter/src/rules/mod.rs
+++ b/crates/squawk_linter/src/rules/mod.rs
@@ -25,6 +25,7 @@ pub(crate) mod renaming_column;
 pub(crate) mod renaming_table;
 pub(crate) mod require_concurrent_index_creation;
 pub(crate) mod require_concurrent_index_deletion;
+pub(crate) mod require_timeout_settings;
 pub(crate) mod transaction_nesting;
 // xtask:new-rule:mod-decl
 
@@ -55,5 +56,6 @@ pub(crate) use renaming_column::renaming_column;
 pub(crate) use renaming_table::renaming_table;
 pub(crate) use require_concurrent_index_creation::require_concurrent_index_creation;
 pub(crate) use require_concurrent_index_deletion::require_concurrent_index_deletion;
+pub(crate) use require_timeout_settings::require_timeout_settings;
 pub(crate) use transaction_nesting::transaction_nesting;
 // xtask:new-rule:export
diff --git a/crates/squawk_linter/src/rules/require_timeout_settings.rs b/crates/squawk_linter/src/rules/require_timeout_settings.rs
new file mode 100644
index 00000000..8b66bd29
--- /dev/null
+++ b/crates/squawk_linter/src/rules/require_timeout_settings.rs
@@ -0,0 +1,551 @@
+use rowan::TextSize;
+use squawk_syntax::{
+    Parse, SourceFile, SyntaxKind,
+    ast::{self, AstNode},
+    identifier::Identifier,
+};
+
+use crate::{Edit, Fix, Linter, Rule, Violation, analyze};
+
+fn find_insert_pos(file: &SourceFile) -> TextSize {
+    for child in file.syntax().children_with_tokens() {
+        match child.kind() {
+            SyntaxKind::COMMENT | SyntaxKind::WHITESPACE => continue,
+            _ => return child.text_range().start(),
+        }
+    }
+    TextSize::from(0)
+}
+
+fn create_stmt_timeout_fix(file: &SourceFile) -> Fix {
+    let at = find_insert_pos(file);
+    Fix::new(
+        "Add statement timeout",
+        vec![Edit::insert("set statement_timeout = '5s';\n", at)],
+    )
+}
+
+fn create_lock_timeout_fix(file: &SourceFile) -> Fix {
+    let at = find_insert_pos(file);
+    Fix::new(
+        "Add lock timeout",
+        vec![Edit::insert("set lock_timeout = '1s';\n", at)],
+    )
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+enum ReportOnce {
+    Missing,
+    Present,
+    Reported,
+}
+
+pub(crate) fn require_timeout_settings(ctx: &mut Linter, parse: &Parse<SourceFile>) {
+    let file = parse.tree();
+
+    let mut lock_timeout = ReportOnce::Missing;
+    let mut stmt_timeout = ReportOnce::Missing;
+
+    for stmt in file.stmts() {
+        // stop early if both are reported
+        if lock_timeout == ReportOnce::Reported && stmt_timeout == ReportOnce::Reported {
+            break;
+        }
+
+        match stmt {
+            ast::Stmt::Set(set) => {
+                if let Some(path) = set.path() {
+                    // only want to check for `set lock_timeout = '1s'`, not `set foo.lock_timeout = '1s'`
+                    if path.qualifier().is_some() {
+                        continue;
+                    }
+                    if let Some(segment) = path.segment() {
+                        if let Some(name_ref) = segment.name_ref() {
+                            let name_ident = Identifier::new(name_ref.text().as_str());
+                            if name_ident == Identifier::new("lock_timeout") {
+                                lock_timeout = ReportOnce::Present;
+                            } else if name_ident == Identifier::new("statement_timeout") {
+                                stmt_timeout = ReportOnce::Present;
+                            }
+                        }
+                    }
+                }
+            }
+            _ if analyze::possibly_slow_stmt(&stmt) => {
+                if lock_timeout == ReportOnce::Missing {
+                    ctx.report(
+                        Violation::for_node(
+                            Rule::RequireTimeoutSettings,
+                            "Missing `set lock_timeout` before potentially slow operations"
+                                .to_string(),
+                            stmt.syntax(),
+                        )
+                        .help("Configure a `lock_timeout` before this statement.".to_string())
+                        .fix(Some(create_lock_timeout_fix(&file))),
+                    );
+                    lock_timeout = ReportOnce::Reported;
+                }
+                if stmt_timeout == ReportOnce::Missing {
+                    ctx.report(
+                        Violation::for_node(
+                            Rule::RequireTimeoutSettings,
+                            "Missing `set statement_timeout` before potentially slow operations"
+                                .to_string(),
+                            stmt.syntax(),
+                        )
+                        .help("Configure a `statement_timeout` before this statement".to_string())
+                        .fix(Some(create_stmt_timeout_fix(&file))),
+                    );
+                    stmt_timeout = ReportOnce::Reported;
+                }
+            }
+            _ => (),
+        }
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use insta::{assert_debug_snapshot, assert_snapshot};
+
+    use crate::{
+        Rule,
+        test_utils::{fix_sql, lint},
+    };
+
+    fn fix(sql: &str) -> String {
+        fix_sql(sql, Rule::RequireTimeoutSettings)
+    }
+
+    #[test]
+    fn err_missing_both_timeouts() {
+        let sql = r#"
+ALTER TABLE t ADD COLUMN c BOOLEAN;
+        "#;
+        let errors = lint(sql, Rule::RequireTimeoutSettings);
+        assert_ne!(errors.len(), 0);
+        assert_debug_snapshot!(errors, @r#"
+        [
+            Violation {
+                code: RequireTimeoutSettings,
+                message: "Missing `set lock_timeout` before potentially slow operations",
+                text_range: 1..35,
+                help: Some(
+                    "Configure a `lock_timeout` before this statement.",
+                ),
+                fix: Some(
+                    Fix {
+                        title: "Add lock timeout",
+                        edits: [
+                            Edit {
+                                text_range: 1..1,
+                                text: Some(
+                                    "set lock_timeout = '1s';\n",
+                                ),
+                            },
+                        ],
+                    },
+                ),
+            },
+            Violation {
+                code: RequireTimeoutSettings,
+                message: "Missing `set statement_timeout` before potentially slow operations",
+                text_range: 1..35,
+                help: Some(
+                    "Configure a `statement_timeout` before this statement",
+                ),
+                fix: Some(
+                    Fix {
+                        title: "Add statement timeout",
+                        edits: [
+                            Edit {
+                                text_range: 1..1,
+                                text: Some(
+                                    "set statement_timeout = '5s';\n",
+                                ),
+                            },
+                        ],
+                    },
+                ),
+            },
+        ]
+        "#);
+    }
+
+    #[test]
+    fn err_missing_lock_timeout() {
+        let sql = r#"
+SET statement_timeout = '5s';
+ALTER TABLE t ADD COLUMN c BOOLEAN;
+        "#;
+        let errors = lint(sql, Rule::RequireTimeoutSettings);
+        assert_ne!(errors.len(), 0);
+        assert_debug_snapshot!(errors, @r#"
+        [
+            Violation {
+                code: RequireTimeoutSettings,
+                message: "Missing `set lock_timeout` before potentially slow operations",
+                text_range: 31..65,
+                help: Some(
+                    "Configure a `lock_timeout` before this statement.",
+                ),
+                fix: Some(
+                    Fix {
+                        title: "Add lock timeout",
+                        edits: [
+                            Edit {
+                                text_range: 1..1,
+                                text: Some(
+                                    "set lock_timeout = '1s';\n",
+                                ),
+                            },
+                        ],
+                    },
+                ),
+            },
+        ]
+        "#);
+    }
+
+    #[test]
+    fn err_missing_statement_timeout() {
+        let sql = r#"
+SET lock_timeout = '1s';
+ALTER TABLE t ADD COLUMN c BOOLEAN;
+        "#;
+        let errors = lint(sql, Rule::RequireTimeoutSettings);
+        assert_ne!(errors.len(), 0);
+        assert_debug_snapshot!(errors, @r#"
+        [
+            Violation {
+                code: RequireTimeoutSettings,
+                message: "Missing `set statement_timeout` before potentially slow operations",
+                text_range: 26..60,
+                help: Some(
+                    "Configure a `statement_timeout` before this statement",
+                ),
+                fix: Some(
+                    Fix {
+                        title: "Add statement timeout",
+                        edits: [
+                            Edit {
+                                text_range: 1..1,
+                                text: Some(
+                                    "set statement_timeout = '5s';\n",
+                                ),
+                            },
+                        ],
+                    },
+                ),
+            },
+        ]
+        "#);
+    }
+
+    #[test]
+    fn ok_both_timeouts_present() {
+        let sql = r#"
+SET lock_timeout = '1s';
+SET statement_timeout = '5s';
+ALTER TABLE t ADD COLUMN c BOOLEAN;
+        "#;
+        let errors = lint(sql, Rule::RequireTimeoutSettings);
+        assert_eq!(errors.len(), 0);
+    }
+
+    #[test]
+    fn ok_both_timeouts_present_casing() {
+        let sql = r#"
+SET Lock_Timeout = '1s';
+SET Statement_Timeout = '5s';
+ALTER TABLE t ADD COLUMN c BOOLEAN;
+        "#;
+        let errors = lint(sql, Rule::RequireTimeoutSettings);
+        assert_eq!(errors.len(), 0);
+    }
+
+    #[test]
+    fn ok_no_ddl_operations() {
+        let sql = r#"
+SELECT * FROM t;
+        "#;
+        let errors = lint(sql, Rule::RequireTimeoutSettings);
+        assert_eq!(errors.len(), 0);
+    }
+
+    #[test]
+    fn err_timeouts_using_schema() {
+        let sql = r#"
+SET foo.lock_timeout = '1s';
+SET foo.statement_timeout = '5s';
+ALTER TABLE t ADD COLUMN c BOOLEAN;
+        "#;
+        let errors = lint(sql, Rule::RequireTimeoutSettings);
+        assert_ne!(errors.len(), 0);
+        assert_debug_snapshot!(errors, @r#"
+        [
+            Violation {
+                code: RequireTimeoutSettings,
+                message: "Missing `set lock_timeout` before potentially slow operations",
+                text_range: 64..98,
+                help: Some(
+                    "Configure a `lock_timeout` before this statement.",
+                ),
+                fix: Some(
+                    Fix {
+                        title: "Add lock timeout",
+                        edits: [
+                            Edit {
+                                text_range: 1..1,
+                                text: Some(
+                                    "set lock_timeout = '1s';\n",
+                                ),
+                            },
+                        ],
+                    },
+                ),
+            },
+            Violation {
+                code: RequireTimeoutSettings,
+                message: "Missing `set statement_timeout` before potentially slow operations",
+                text_range: 64..98,
+                help: Some(
+                    "Configure a `statement_timeout` before this statement",
+                ),
+                fix: Some(
+                    Fix {
+                        title: "Add statement timeout",
+                        edits: [
+                            Edit {
+                                text_range: 1..1,
+                                text: Some(
+                                    "set statement_timeout = '5s';\n",
+                                ),
+                            },
+                        ],
+                    },
+                ),
+            },
+        ]
+        "#);
+    }
+    #[test]
+    fn err_timeouts_after_ddl() {
+        let sql = r#"
+ALTER TABLE t ADD COLUMN c BOOLEAN;
+SET lock_timeout = '1s';
+SET statement_timeout = '5s';
+        "#;
+        let errors = lint(sql, Rule::RequireTimeoutSettings);
+        assert_ne!(errors.len(), 0);
+        assert_debug_snapshot!(errors, @r#"
+        [
+            Violation {
+                code: RequireTimeoutSettings,
+                message: "Missing `set lock_timeout` before potentially slow operations",
+                text_range: 1..35,
+                help: Some(
+                    "Configure a `lock_timeout` before this statement.",
+                ),
+                fix: Some(
+                    Fix {
+                        title: "Add lock timeout",
+                        edits: [
+                            Edit {
+                                text_range: 1..1,
+                                text: Some(
+                                    "set lock_timeout = '1s';\n",
+                                ),
+                            },
+                        ],
+                    },
+                ),
+            },
+            Violation {
+                code: RequireTimeoutSettings,
+                message: "Missing `set statement_timeout` before potentially slow operations",
+                text_range: 1..35,
+                help: Some(
+                    "Configure a `statement_timeout` before this statement",
+                ),
+                fix: Some(
+                    Fix {
+                        title: "Add statement timeout",
+                        edits: [
+                            Edit {
+                                text_range: 1..1,
+                                text: Some(
+                                    "set statement_timeout = '5s';\n",
+                                ),
+                            },
+                        ],
+                    },
+                ),
+            },
+        ]
+        "#);
+    }
+
+    #[test]
+    fn err_other_ddl_operations() {
+        let sql = r#"
+CREATE TYPE mood AS ENUM ('sad', 'ok', 'happy');
+        "#;
+        let errors = lint(sql, Rule::RequireTimeoutSettings);
+        assert_ne!(errors.len(), 0);
+        assert_debug_snapshot!(errors, @r#"
+        [
+            Violation {
+                code: RequireTimeoutSettings,
+                message: "Missing `set lock_timeout` before potentially slow operations",
+                text_range: 1..48,
+                help: Some(
+                    "Configure a `lock_timeout` before this statement.",
+                ),
+                fix: Some(
+                    Fix {
+                        title: "Add lock timeout",
+                        edits: [
+                            Edit {
+                                text_range: 1..1,
+                                text: Some(
+                                    "set lock_timeout = '1s';\n",
+                                ),
+                            },
+                        ],
+                    },
+                ),
+            },
+            Violation {
+                code: RequireTimeoutSettings,
+                message: "Missing `set statement_timeout` before potentially slow operations",
+                text_range: 1..48,
+                help: Some(
+                    "Configure a `statement_timeout` before this statement",
+                ),
+                fix: Some(
+                    Fix {
+                        title: "Add statement timeout",
+                        edits: [
+                            Edit {
+                                text_range: 1..1,
+                                text: Some(
+                                    "set statement_timeout = '5s';\n",
+                                ),
+                            },
+                        ],
+                    },
+                ),
+            },
+        ]
+        "#);
+    }
+
+    #[test]
+    fn ok_other_ddl_with_timeouts() {
+        let sql = r#"
+SET lock_timeout = '1s';
+SET statement_timeout = '5s';
+CREATE FUNCTION add(integer, integer) RETURNS integer
+    AS 'select $1 + $2;'
+    LANGUAGE SQL;
+        "#;
+        let errors = lint(sql, Rule::RequireTimeoutSettings);
+        assert_eq!(errors.len(), 0);
+    }
+
+    #[test]
+    fn fix_add_both_timeouts() {
+        let sql = "ALTER TABLE t ADD COLUMN c BOOLEAN;";
+        let result = fix(sql);
+        assert_snapshot!(result, @r"
+        set statement_timeout = '5s';
+        set lock_timeout = '1s';
+        ALTER TABLE t ADD COLUMN c BOOLEAN;
+        ");
+    }
+
+    #[test]
+    fn fix_add_lock_timeout_only() {
+        let sql = r#"
+SET statement_timeout = '5s';
+ALTER TABLE t ADD COLUMN c BOOLEAN;
+        "#;
+        let result = fix(sql);
+        assert_snapshot!(result, @r"
+        set lock_timeout = '1s';
+        SET statement_timeout = '5s';
+        ALTER TABLE t ADD COLUMN c BOOLEAN;
+        ");
+    }
+
+    #[test]
+    fn fix_add_statement_timeout_only() {
+        let sql = r#"
+SET lock_timeout = '1s';
+ALTER TABLE t ADD COLUMN c BOOLEAN;
+        "#;
+        let result = fix(sql);
+        assert_snapshot!(result, @r"
+        set statement_timeout = '5s';
+        SET lock_timeout = '1s';
+        ALTER TABLE t ADD COLUMN c BOOLEAN;
+        ");
+    }
+
+    #[test]
+    fn fix_with_leading_comments() {
+        let sql = r#"-- leading comment
+-- should be okay
+
+ALTER TABLE users ADD COLUMN email TEXT;"#;
+        let result = fix(sql);
+        assert_snapshot!(result, @r"
+        -- leading comment
+        -- should be okay
+
+        set statement_timeout = '5s';
+        set lock_timeout = '1s';
+        ALTER TABLE users ADD COLUMN email TEXT;
+        ");
+    }
+
+    #[test]
+    fn fix_with_leading_comment_c_style() {
+        let sql = r#"/* foo bar */
+ALTER TABLE users ADD COLUMN email TEXT;"#;
+        let result = fix(sql);
+        assert_snapshot!(result, @r"
+        /* foo bar */
+        set statement_timeout = '5s';
+        set lock_timeout = '1s';
+        ALTER TABLE users ADD COLUMN email TEXT;
+        ");
+    }
+
+    #[test]
+    fn fix_with_prefix_comment_c_style() {
+        let sql = r#"/* boo */ALTER TABLE users ADD COLUMN email TEXT;"#;
+        let result = fix(sql);
+        assert_snapshot!(result, @r"
+        /* boo */set statement_timeout = '5s';
+        set lock_timeout = '1s';
+        ALTER TABLE users ADD COLUMN email TEXT;
+        ");
+    }
+
+    #[test]
+    fn fix_multiple_ddl_statements() {
+        let sql = r#"
+CREATE TABLE users (id SERIAL);
+ALTER TABLE users ADD COLUMN email TEXT;
+        "#;
+        let result = fix(sql);
+        assert_snapshot!(result, @r"
+        set statement_timeout = '5s';
+        set lock_timeout = '1s';
+        CREATE TABLE users (id SERIAL);
+        ALTER TABLE users ADD COLUMN email TEXT;
+        ");
+    }
+}
diff --git a/crates/squawk_server/src/ignore.rs b/crates/squawk_server/src/ignore.rs
index b52c74ac..b09ec8d1 100644
--- a/crates/squawk_server/src/ignore.rs
+++ b/crates/squawk_server/src/ignore.rs
@@ -95,6 +95,8 @@ create table c (
             })
             .collect::<Vec<_>>();
         insta::assert_snapshot!(apply_text_edits(sql, ignore_line_edits), @r"
+        -- squawk-ignore require-timeout-settings
+        -- squawk-ignore require-timeout-settings
         -- squawk-ignore prefer-robust-stmts
         create table a (
         -- squawk-ignore prefer-bigint-over-int
@@ -147,6 +149,8 @@ create table c (
         -- squawk-ignore-file prefer-bigint-over-int
         -- squawk-ignore-file prefer-robust-stmts
         -- squawk-ignore-file prefer-bigint-over-int
+        -- squawk-ignore-file require-timeout-settings
+        -- squawk-ignore-file require-timeout-settings
         -- squawk-ignore-file prefer-robust-stmts
 
         -- some existing comment
diff --git a/crates/squawk_syntax/src/ast/generated/nodes.rs b/crates/squawk_syntax/src/ast/generated/nodes.rs
index c69bfa4f..4bf4d572 100644
--- a/crates/squawk_syntax/src/ast/generated/nodes.rs
+++ b/crates/squawk_syntax/src/ast/generated/nodes.rs
@@ -8497,13 +8497,45 @@ pub struct Set {
 }
 impl Set {
     #[inline]
-    pub fn set_options(&self) -> Option<SetOptions> {
+    pub fn expr(&self) -> Option<Expr> {
+        support::child(&self.syntax)
+    }
+    #[inline]
+    pub fn path(&self) -> Option<Path> {
         support::child(&self.syntax)
     }
     #[inline]
+    pub fn eq_token(&self) -> Option<SyntaxToken> {
+        support::token(&self.syntax, SyntaxKind::EQ)
+    }
+    #[inline]
+    pub fn default_token(&self) -> Option<SyntaxToken> {
+        support::token(&self.syntax, SyntaxKind::DEFAULT_KW)
+    }
+    #[inline]
+    pub fn local_token(&self) -> Option<SyntaxToken> {
+        support::token(&self.syntax, SyntaxKind::LOCAL_KW)
+    }
+    #[inline]
+    pub fn session_token(&self) -> Option<SyntaxToken> {
+        support::token(&self.syntax, SyntaxKind::SESSION_KW)
+    }
+    #[inline]
     pub fn set_token(&self) -> Option<SyntaxToken> {
         support::token(&self.syntax, SyntaxKind::SET_KW)
     }
+    #[inline]
+    pub fn time_token(&self) -> Option<SyntaxToken> {
+        support::token(&self.syntax, SyntaxKind::TIME_KW)
+    }
+    #[inline]
+    pub fn to_token(&self) -> Option<SyntaxToken> {
+        support::token(&self.syntax, SyntaxKind::TO_KW)
+    }
+    #[inline]
+    pub fn zone_token(&self) -> Option<SyntaxToken> {
+        support::token(&self.syntax, SyntaxKind::ZONE_KW)
+    }
 }
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
diff --git a/crates/squawk_syntax/src/postgresql.ungram b/crates/squawk_syntax/src/postgresql.ungram
index c57eaab2..2e20aa77 100644
--- a/crates/squawk_syntax/src/postgresql.ungram
+++ b/crates/squawk_syntax/src/postgresql.ungram
@@ -1602,7 +1602,10 @@ CreateExtension =
   'create' 'extension'
 
 Set =
-  'set' SetOptions
+  'set' 
+  ('session' | 'local')? 
+  ('time' 'zone' | (Path ('to' | '='))) 
+  (Expr | 'local' | 'default')
 
 Show =
   'show'
diff --git a/docs/docs/require-timeout-settings.md b/docs/docs/require-timeout-settings.md
new file mode 100644
index 00000000..4753c325
--- /dev/null
+++ b/docs/docs/require-timeout-settings.md
@@ -0,0 +1,37 @@
+---
+id: require-timeout-settings
+title: require-timeout-settings
+---
+
+## problem
+
+You must configure a `lock_timeout` to safely apply migrations. See (see ["Safety requirements"](./safe_migrations.md#safety-requirements))
+
+Additionally, a statement_timeout also helps prevent long migrations that consume too many database resources.
+
+## solution
+
+Configure both timeout settings at the beginning of your migration file:
+
+```sql
+-- error, missing timeouts
+alter table t add column c boolean;
+```
+
+```sql
+-- ok, timeouts configured before ddl operations
+set lock_timeout = '1s';
+set statement_timeout = '5s';
+alter table t add column c boolean;
+```
+
+### alternatively
+
+If you're database connection is already configured with lock and statement
+timeouts, you can safely ignore this rule.
+
+## links
+
+- [PostgreSQL: SET](https://www.postgresql.org/docs/current/sql-set.html)
+- [PostgreSQL: lock_timeout](https://www.postgresql.org/docs/current/runtime-config-client.html#GUC-LOCK-TIMEOUT)
+- [PostgreSQL: statement_timeout](https://www.postgresql.org/docs/current/runtime-config-client.html#GUC-STATEMENT-TIMEOUT)
diff --git a/docs/docs/safe_migrations.md b/docs/docs/safe_migrations.md
index 0e29f0bd..d25d98c8 100644
--- a/docs/docs/safe_migrations.md
+++ b/docs/docs/safe_migrations.md
@@ -10,7 +10,8 @@ To safely apply a migration you must set a `lock_timeout` in Postgres. See below
 ## safety requirements
 
 1. Use Squawk to lint your migrations. Follow the advice.
-2. Set a short `lock_timeout` (e.g. 2 seconds) within Postgres when running your migrations. If you hit the `lock_timeout`, great, retry your migration until it succeeds.
+2. Set a short `lock_timeout` (e.g. 1 second) within Postgres when running your migrations. If you hit the `lock_timeout`, great, retry your migration until it succeeds.
+3. _Recommended_: Set a `statement_timeout` (e.g. 5 seconds) to prevent runaway migrations from using too many resources & holding locks for too long.
 
 ### `lock_timeout`
 
@@ -29,11 +30,24 @@ SET lock_timeout = '1s';
 ```
 
 ```bash
-PGOPTIONS='-c lock_timeout=10s' ./migrate_db
+PGOPTIONS='-c lock_timeout=1s' ./migrate_db
 ```
 
 With a short `lock_timeout` of 1 second, queries will be blocked for up to 1 second. If your migration hits the lock timeout, it will be cancelled and error, allowing the waiting queries to proceed. You should retry a migration that hits the lock timeout until it succeeds.
 
+### `statement_timeout`
+
+It's recommended to use a `statement_timeout` whenever you're querying your database.
+
+For migrations, you want to ensure there's an upper bound on how long your
+queries take. This prevents runaway migrations from using too many resources.
+
+Some queries will take a while, like concurrently creating an index on a large table, and that's okay, so you may have to tweak this based on your database size:
+
+```sql
+set statement_timeout = '5s';
+```
+
 ### example
 
 This statement requires an `AccessExclusiveLock` lock on `"accounts"`. Reads and writes to `"accounts"` will be blocked while this statement is running.
@@ -46,7 +60,6 @@ If there is a long running query or open transaction, this `ALTER TABLE` stateme
 
 With a short `lock_timeout` of 1 second, queries will be blocked for up to 1 second. If your migration hits the lock timeout, it will be cancelled and error, allowing the waiting queries to proceed. You should retry a migration that hits the lock timeout until it succeeds.
 
-
 ## further reading
 
-Benchling's ["Move fast and migrate things: how we automated migrations in Postgres"](https://benchling.engineering/move-fast-and-migrate-things-how-we-automated-migrations-in-postgres-d60aba0fc3d4) and GoCardless's ["Zero-downtime Postgres migrations - the hard parts"](https://gocardless.com/blog/zero-downtime-postgres-migrations-the-hard-parts/) provide more background on `lock_timeout` and `statement_timeout` in a production environment.
\ No newline at end of file
+Benchling's ["Move fast and migrate things: how we automated migrations in Postgres"](https://benchling.engineering/move-fast-and-migrate-things-how-we-automated-migrations-in-postgres-d60aba0fc3d4) and GoCardless's ["Zero-downtime Postgres migrations - the hard parts"](https://gocardless.com/blog/zero-downtime-postgres-migrations-the-hard-parts/) provide more background on `lock_timeout` and `statement_timeout` in a production environment.
diff --git a/docs/sidebars.js b/docs/sidebars.js
index 66b6ebff..7924200d 100644
--- a/docs/sidebars.js
+++ b/docs/sidebars.js
@@ -32,6 +32,7 @@ module.exports = {
       "ban-alter-domain-with-add-constraint",
       "ban-truncate-cascade",
       "syntax-error",
+      "require-timeout-settings",
       // xtask:new-rule:error-name
     ],
   },
diff --git a/docs/src/pages/index.js b/docs/src/pages/index.js
index ba7ffffc..ff524933 100644
--- a/docs/src/pages/index.js
+++ b/docs/src/pages/index.js
@@ -193,6 +193,11 @@ const rules = [
     tags: ["backwards compatibility"],
     description: "Truncate cascade will recursively truncate all related tables!",
   },
+  {
+    name: "require-timeout-settings",
+    tags: ["locking"],
+    description: "Require lock and statement timeouts",
+  },
   // xtask:new-rule:rule-doc-meta
 ]