fix: support other 'booly' values for opts bool

Cargo.toml

@@ -23,6 +23,7 @@ serde = { version = "1.0.215", features = ["derive"] }
 serde_json = "1.0"
 serde_plain = "1.0"
 serde_repr = "0.1"
+regex = "1.11.1"
 simplelog = "0.12.0"
 structopt = "0.3"
 tempfile = "3.2.0"

crates/squawk_parser/src/grammar.rs

@@ -4644,7 +4644,9 @@ fn string_literal(p: &mut Parser<'_>) {
 
 fn opt_bool_literal(p: &mut Parser<'_>) -> bool {
     let m = p.start();
-    if p.eat(TRUE_KW) || p.eat(FALSE_KW) {
+    // TOOD: we might want to check if its 1 or 0 specificially, not just `INT_NUMBER`
+    // https://www.postgresql.org/docs/current/sql-explain.html
+    if p.eat(TRUE_KW) || p.eat(FALSE_KW) || p.eat(OFF_KW) || p.eat(ON_KW) || p.eat(INT_NUMBER) {
         m.complete(p, LITERAL);
         true
     } else {

crates/squawk_parser/tests/data/ok/explain.sql

@@ -8,9 +8,9 @@ explain analyze select a from t;
 explain (
   analyze,
   verbose,
-  costs, 
-  costs true, 
-  costs false, 
+  costs,
+  costs true,
+  costs false,
   settings,
   generic_plan,
   buffers,
@@ -69,3 +69,14 @@ explain analyze (((((select 1)))));
 -- parens_values
 explain analyze (((((values (1))))));
 
+-- boolean off
+EXPLAIN (COSTS OFF) SELECT * FROM foo WHERE i = 4;
+
+-- boolean on
+EXPLAIN (COSTS ON) SELECT * FROM foo WHERE i = 4;
+
+-- boolean 1
+EXPLAIN (COSTS 1) SELECT * FROM foo WHERE i = 4;
+
+-- boolean 0
+EXPLAIN (COSTS 0) SELECT * FROM foo WHERE i = 4;

crates/squawk_parser/tests/data/regression_suite/advisory_lock.sql

@@ -0,0 +1,148 @@
+--
+-- ADVISORY LOCKS
+--
+
+SELECT oid AS datoid FROM pg_database WHERE datname = current_database() ;
+
+BEGIN;
+
+SELECT
+	pg_advisory_xact_lock(1), pg_advisory_xact_lock_shared(2),
+	pg_advisory_xact_lock(1, 1), pg_advisory_xact_lock_shared(2, 2);
+
+SELECT locktype, classid, objid, objsubid, mode, granted
+	FROM pg_locks WHERE locktype = 'advisory' AND database = 'datoid'
+	ORDER BY classid, objid, objsubid;
+
+
+-- pg_advisory_unlock_all() shouldn't release xact locks
+SELECT pg_advisory_unlock_all();
+
+SELECT count(*) FROM pg_locks WHERE locktype = 'advisory' AND database = 'datoid';
+
+
+-- can't unlock xact locks
+SELECT
+	pg_advisory_unlock(1), pg_advisory_unlock_shared(2),
+	pg_advisory_unlock(1, 1), pg_advisory_unlock_shared(2, 2);
+
+
+-- automatically release xact locks at commit
+COMMIT;
+
+SELECT count(*) FROM pg_locks WHERE locktype = 'advisory' AND database = 'datoid';
+
+
+BEGIN;
+
+-- holding both session and xact locks on the same objects, xact first
+SELECT
+	pg_advisory_xact_lock(1), pg_advisory_xact_lock_shared(2),
+	pg_advisory_xact_lock(1, 1), pg_advisory_xact_lock_shared(2, 2);
+
+SELECT locktype, classid, objid, objsubid, mode, granted
+	FROM pg_locks WHERE locktype = 'advisory' AND database = 'datoid'
+	ORDER BY classid, objid, objsubid;
+
+SELECT
+	pg_advisory_lock(1), pg_advisory_lock_shared(2),
+	pg_advisory_lock(1, 1), pg_advisory_lock_shared(2, 2);
+
+ROLLBACK;
+
+SELECT locktype, classid, objid, objsubid, mode, granted
+	FROM pg_locks WHERE locktype = 'advisory' AND database = 'datoid'
+	ORDER BY classid, objid, objsubid;
+
+
+-- unlocking session locks
+SELECT
+	pg_advisory_unlock(1), pg_advisory_unlock(1),
+	pg_advisory_unlock_shared(2), pg_advisory_unlock_shared(2),
+	pg_advisory_unlock(1, 1), pg_advisory_unlock(1, 1),
+	pg_advisory_unlock_shared(2, 2), pg_advisory_unlock_shared(2, 2);
+
+SELECT count(*) FROM pg_locks WHERE locktype = 'advisory' AND database = 'datoid';
+
+
+BEGIN;
+
+-- holding both session and xact locks on the same objects, session first
+SELECT
+	pg_advisory_lock(1), pg_advisory_lock_shared(2),
+	pg_advisory_lock(1, 1), pg_advisory_lock_shared(2, 2);
+
+SELECT locktype, classid, objid, objsubid, mode, granted
+	FROM pg_locks WHERE locktype = 'advisory' AND database = 'datoid'
+	ORDER BY classid, objid, objsubid;
+
+SELECT
+	pg_advisory_xact_lock(1), pg_advisory_xact_lock_shared(2),
+	pg_advisory_xact_lock(1, 1), pg_advisory_xact_lock_shared(2, 2);
+
+ROLLBACK;
+
+SELECT locktype, classid, objid, objsubid, mode, granted
+	FROM pg_locks WHERE locktype = 'advisory' AND database = 'datoid'
+	ORDER BY classid, objid, objsubid;
+
+
+-- releasing all session locks
+SELECT pg_advisory_unlock_all();
+
+SELECT count(*) FROM pg_locks WHERE locktype = 'advisory' AND database = 'datoid';
+
+
+BEGIN;
+
+-- grabbing txn locks multiple times
+
+SELECT
+	pg_advisory_xact_lock(1), pg_advisory_xact_lock(1),
+	pg_advisory_xact_lock_shared(2), pg_advisory_xact_lock_shared(2),
+	pg_advisory_xact_lock(1, 1), pg_advisory_xact_lock(1, 1),
+	pg_advisory_xact_lock_shared(2, 2), pg_advisory_xact_lock_shared(2, 2);
+
+SELECT locktype, classid, objid, objsubid, mode, granted
+	FROM pg_locks WHERE locktype = 'advisory' AND database = 'datoid'
+	ORDER BY classid, objid, objsubid;
+
+COMMIT;
+
+SELECT count(*) FROM pg_locks WHERE locktype = 'advisory' AND database = 'datoid';
+
+-- grabbing session locks multiple times
+
+SELECT
+	pg_advisory_lock(1), pg_advisory_lock(1),
+	pg_advisory_lock_shared(2), pg_advisory_lock_shared(2),
+	pg_advisory_lock(1, 1), pg_advisory_lock(1, 1),
+	pg_advisory_lock_shared(2, 2), pg_advisory_lock_shared(2, 2);
+
+SELECT locktype, classid, objid, objsubid, mode, granted
+	FROM pg_locks WHERE locktype = 'advisory' AND database = 'datoid'
+	ORDER BY classid, objid, objsubid;
+
+SELECT
+	pg_advisory_unlock(1), pg_advisory_unlock(1),
+	pg_advisory_unlock_shared(2), pg_advisory_unlock_shared(2),
+	pg_advisory_unlock(1, 1), pg_advisory_unlock(1, 1),
+	pg_advisory_unlock_shared(2, 2), pg_advisory_unlock_shared(2, 2);
+
+SELECT count(*) FROM pg_locks WHERE locktype = 'advisory' AND database = 'datoid';
+
+-- .. and releasing them all at once
+
+SELECT
+	pg_advisory_lock(1), pg_advisory_lock(1),
+	pg_advisory_lock_shared(2), pg_advisory_lock_shared(2),
+	pg_advisory_lock(1, 1), pg_advisory_lock(1, 1),
+	pg_advisory_lock_shared(2, 2), pg_advisory_lock_shared(2, 2);
+
+SELECT locktype, classid, objid, objsubid, mode, granted
+	FROM pg_locks WHERE locktype = 'advisory' AND database = 'datoid'
+	ORDER BY classid, objid, objsubid;
+
+SELECT pg_advisory_unlock_all();
+
+SELECT count(*) FROM pg_locks WHERE locktype = 'advisory' AND database = 'datoid';