updates for tests

Author: pyramation

__fixtures__/generated/generated.json

@@ -1,4 +1,19 @@
 {
+  "pretty/selects-1.sql": "SELECT 1",
+  "pretty/selects-2.sql": "SELECT 'abc'::text",
+  "pretty/selects-3.sql": "SELECT now() AT TIME ZONE 'UTC'",
+  "pretty/selects-4.sql": "SELECT\n  1,\n  2",
+  "pretty/selects-5.sql": "SELECT\n  id,\n  name,\n  email\nFROM users",
+  "pretty/selects-6.sql": "SELECT DISTINCT id FROM users",
+  "pretty/selects-7.sql": "SELECT DISTINCT\n  id,\n  name\nFROM users",
+  "pretty/selects-8.sql": "SELECT\n  id,\n  upper(name) AS name_upper,\n  created_at + interval '1 day' AS expires_at\nFROM accounts",
+  "pretty/selects-9.sql": "SELECT (SELECT max(score) FROM results)",
+  "pretty/selects-10.sql": "SELECT\n  count(*) OVER (),\n  u.id\nFROM users u",
+  "pretty/selects-11.sql": "SELECT\n  name\nFROM customers\nUNION\nALL\nSELECT\n  name\nFROM suppliers\nORDER BY\n  name",
+  "pretty/selects-12.sql": "SELECT\n  u.id,\n  u.name,\n  u.email,\n  p.title\nFROM users AS u\nJOIN profiles AS p ON u.id = p.user_id\nLEFT JOIN orders AS o ON u.id = o.user_id\nRIGHT JOIN addresses AS a ON u.id = a.user_id\nWHERE\n  u.active = true",
+  "pretty/selects-13.sql": "SELECT\n  id,\n  name\nFROM users\nWHERE\n  id IN (SELECT\n  user_id\nFROM orders\nWHERE\n  total > 100)",
+  "pretty/selects-14.sql": "SELECT\n  id,\n  name,\n  email\nFROM users\nWHERE\n  active = true",
+  "pretty/selects-15.sql": "SELECT\n  u.id,\n  u.name,\n  u.email,\n  p.title\nFROM users AS u\nJOIN profiles AS p ON u.id = p.user_id\nWHERE\n  u.active = true\n  AND u.created_at > '2023-01-01'\nGROUP BY\n  u.id,\n  u.name,\n  u.email,\n  p.title\nHAVING\n  count(*) > 1\nORDER BY\n  u.created_at DESC,\n  u.name ASC\nLIMIT 10\nOFFSET 5",
   "pretty/select_statements-1.sql": "SELECT id, name, email FROM users WHERE active = true",
   "pretty/select_statements-2.sql": "SELECT \n  u.id,\n  u.name,\n  u.email,\n  p.title as profile_title\nFROM users u\nJOIN profiles p ON u.id = p.user_id\nWHERE u.active = true\n  AND u.created_at > '2023-01-01'\nGROUP BY u.id, u.name, u.email, p.title\nHAVING COUNT(*) > 1\nORDER BY u.created_at DESC, u.name ASC\nLIMIT 10\nOFFSET 5",
   "pretty/select_statements-3.sql": "SELECT id, name FROM users WHERE id IN (\n  SELECT user_id FROM orders WHERE total > 100\n)",
@@ -18,6 +33,9 @@
   "pretty/misc-11.sql": "SELECT *\nFROM users u,\nLATERAL (\n  SELECT \n    (CASE \n      WHEN u.is_admin THEN 'admin_dashboard'\n      ELSE 'user_dashboard'\n    END) AS dashboard_view\n) AS derived",
   "pretty/misc-12.sql": "SELECT \n  id,\n  (SELECT \n     CASE \n       WHEN COUNT(*) > 5 THEN 'frequent'\n       ELSE 'occasional'\n     END\n   FROM purchases p WHERE p.user_id = u.id) AS purchase_freq\nFROM users u",
   "pretty/misc-13.sql": "SELECT \n  id,\n  CASE \n    WHEN rank() OVER (ORDER BY score DESC) = 1 THEN 'top'\n    ELSE 'normal'\n  END AS tier\nFROM players",
+  "pretty/misc-14.sql": "CREATE TRIGGER decrease_job_queue_count_on_delete \n AFTER DELETE ON dashboard_jobs.jobs \n FOR EACH ROW\n WHEN ( OLD.queue_name IS NOT NULL ) \n EXECUTE PROCEDURE dashboard_jobs.tg_decrease_job_queue_count ()",
+  "pretty/misc-15.sql": "ALTER DEFAULT PRIVILEGES IN SCHEMA dashboard_jobs \n GRANT EXECUTE ON FUNCTIONS  TO administrator",
+  "pretty/misc-16.sql": "GRANT EXECUTE ON FUNCTION dashboard_private.uuid_generate_seeded_uuid TO PUBLIC",
   "pretty/create_table-1.sql": "CREATE TABLE users (\n  id SERIAL PRIMARY KEY,\n  name TEXT NOT NULL,\n  email TEXT UNIQUE\n)",
   "pretty/create_table-2.sql": "CREATE TABLE products (\n  id SERIAL PRIMARY KEY,\n  name VARCHAR(255) NOT NULL,\n  price DECIMAL(10,2) CHECK (price > 0),\n  category_id INTEGER,\n  description TEXT,\n  created_at TIMESTAMP DEFAULT now(),\n  updated_at TIMESTAMP,\n  UNIQUE (name, category_id),\n  FOREIGN KEY (category_id) REFERENCES categories(id)\n)",
   "pretty/create_table-3.sql": "CREATE TABLE orders (\n  id SERIAL PRIMARY KEY,\n  subtotal DECIMAL(10,2) NOT NULL,\n  tax_rate DECIMAL(5,4) DEFAULT 0.0825,\n  tax_amount DECIMAL(10,2) GENERATED ALWAYS AS (subtotal * tax_rate) STORED,\n  total DECIMAL(10,2) GENERATED ALWAYS AS (subtotal + tax_amount) STORED\n)",

__fixtures__/kitchen-sink/pretty/misc.sql

@@ -212,3 +212,20 @@ SELECT
     ELSE 'normal'
   END AS tier
 FROM players;
+
+-- 14. A trigger
+
+CREATE TRIGGER decrease_job_queue_count_on_delete 
+ AFTER DELETE ON dashboard_jobs.jobs 
+ FOR EACH ROW
+ WHEN ( OLD.queue_name IS NOT NULL ) 
+ EXECUTE PROCEDURE dashboard_jobs.tg_decrease_job_queue_count ();
+
+-- 15. default privileges
+
+ALTER DEFAULT PRIVILEGES IN SCHEMA dashboard_jobs 
+ GRANT EXECUTE ON FUNCTIONS  TO administrator;
+
+-- 16. grant execute on function
+
+GRANT EXECUTE ON FUNCTION dashboard_private.uuid_generate_seeded_uuid TO PUBLIC;

__fixtures__/kitchen-sink/pretty/selects.sql

@@ -0,0 +1,118 @@
+-- 1. Single simple target (no newline)
+SELECT 1;
+
+-- 2. Single casted literal (no newline)
+SELECT 'abc'::text;
+
+-- 3. Single function call with operator (no newline)
+SELECT now() AT TIME ZONE 'UTC';
+
+-- 4. Multiple literals (newline format)
+SELECT
+  1,
+  2;
+
+-- 5. Multiple identifiers (newline format)
+SELECT
+  id,
+  name,
+  email
+FROM users;
+
+-- 6. SELECT with DISTINCT and single target (no newline)
+SELECT DISTINCT id FROM users;
+
+-- 7. SELECT with DISTINCT and multiple targets (newline format)
+SELECT DISTINCT
+  id,
+  name
+FROM users;
+
+-- 8. SELECT with aliasing and expressions (newline format)
+SELECT
+  id,
+  upper(name) AS name_upper,
+  created_at + interval '1 day' AS expires_at
+FROM accounts;
+
+-- 9. SELECT with subselect (single target, no newline)
+SELECT (SELECT max(score) FROM results);
+
+-- 10. SELECT with function and window (multiple targets, newline format)
+SELECT
+  count(*) OVER (),
+  u.id
+FROM users u;
+
+
+-- 11. Union query combining customer and supplier names with ALL modifier
+SELECT
+  name
+FROM customers
+UNION
+ALL
+SELECT
+  name
+FROM suppliers
+ORDER BY
+  name;
+
+
+-- 12. Complex join query demonstrating multiple join types (INNER, LEFT, RIGHT)
+SELECT
+  u.id,
+  u.name,
+  u.email,
+  p.title
+FROM users AS u
+JOIN profiles AS p ON u.id = p.user_id
+LEFT JOIN orders AS o ON u.id = o.user_id
+RIGHT JOIN addresses AS a ON u.id = a.user_id
+WHERE
+  u.active = true;
+
+-- 13. Subquery in WHERE clause using IN operator
+SELECT
+  id,
+  name
+FROM users
+WHERE
+  id IN (SELECT
+  user_id
+FROM orders
+WHERE
+  total > 100);
+
+
+-- 14. Basic SELECT with WHERE clause filtering active users
+SELECT
+  id,
+  name,
+  email
+FROM users
+WHERE
+  active = true;
+  
+-- 15. Complex query with JOIN, WHERE, GROUP BY, HAVING, ORDER BY, LIMIT and OFFSET
+SELECT
+  u.id,
+  u.name,
+  u.email,
+  p.title
+FROM users AS u
+JOIN profiles AS p ON u.id = p.user_id
+WHERE
+  u.active = true
+  AND u.created_at > '2023-01-01'
+GROUP BY
+  u.id,
+  u.name,
+  u.email,
+  p.title
+HAVING
+  count(*) > 1
+ORDER BY
+  u.created_at DESC,
+  u.name ASC
+LIMIT 10
+OFFSET 5;

packages/deparser/__tests__/kitchen-sink/pretty-misc.test.ts

@@ -16,6 +16,9 @@ it('pretty-misc', async () => {
   "pretty/misc-10.sql",
   "pretty/misc-11.sql",
   "pretty/misc-12.sql",
-  "pretty/misc-13.sql"
+  "pretty/misc-13.sql",
+  "pretty/misc-14.sql",
+  "pretty/misc-15.sql",
+  "pretty/misc-16.sql"
 ]);
 });

packages/deparser/__tests__/kitchen-sink/pretty-selects.test.ts

@@ -0,0 +1,23 @@
+
+import { FixtureTestUtils } from '../../test-utils';
+const fixtures = new FixtureTestUtils();
+
+it('pretty-selects', async () => {
+  await fixtures.runFixtureTests([
+  "pretty/selects-1.sql",
+  "pretty/selects-2.sql",
+  "pretty/selects-3.sql",
+  "pretty/selects-4.sql",
+  "pretty/selects-5.sql",
+  "pretty/selects-6.sql",
+  "pretty/selects-7.sql",
+  "pretty/selects-8.sql",
+  "pretty/selects-9.sql",
+  "pretty/selects-10.sql",
+  "pretty/selects-11.sql",
+  "pretty/selects-12.sql",
+  "pretty/selects-13.sql",
+  "pretty/selects-14.sql",
+  "pretty/selects-15.sql"
+]);
+});

packages/deparser/__tests__/pretty/__snapshots__/create-policy-pretty.test.ts.snap

@@ -30,7 +30,7 @@ exports[`Pretty CREATE POLICY formatting should format simple CREATE POLICY with
   ON posts
   AS PERMISSIVE
   FOR SELECT
-  TO public
+  TO PUBLIC
   USING (
     published = true
   );"