chore: trim functions before comparing

Author: darcyYe

.scripts/compare-database.js

@@ -84,6 +84,18 @@ export const deepSort = (obj) => {
   return obj;
 };
 
+// Function to normalize function/trigger definitions by stripping whitespace from each line
+export const normalizeDefinition = (definition) => {
+  if (typeof definition !== 'string') {
+    return definition;
+  }
+  
+  return definition
+    .split('\n')
+    .map(line => line.trim())
+    .join('\n');
+};
+
 const schemas = ['cloud', 'public'];
 const schemasArray = `(${schemas.map((schema) => `'${schema}'`).join(', ')})`;
 
@@ -236,6 +248,18 @@ const queryDatabaseManifest = async (database) => {
     return { policyname, ...rest };
   };
 
+  // Normalize function definitions by stripping whitespace from each line
+  const normalizeFuncDefinition = ({ definition, ...rest }) => ({
+    ...rest,
+    definition: normalizeDefinition(definition),
+  });
+
+  // Normalize trigger action statements by stripping whitespace from each line
+  const normalizeTriggerAction = ({ action_statement, ...rest }) => ({
+    ...rest,
+    action_statement: normalizeDefinition(action_statement),
+  });
+
   // Omit generated ids and values
   return {
     tables: omitArray(tables, 'table_catalog'),
@@ -270,8 +294,8 @@ const queryDatabaseManifest = async (database) => {
       'conexclop'
     ),
     indexes,
-    funcs,
-    triggers: omitArray(triggers, 'trigger_catalog', 'event_object_catalog'),
+    funcs: funcs.map(normalizeFuncDefinition),
+    triggers: omitArray(triggers, 'trigger_catalog', 'event_object_catalog').map(normalizeTriggerAction),
     policies: policies.map(normalizeRoles).map(normalizePolicyname),
     columnGrants: omitArray(columnGrants, 'table_catalog').map(
       normalizeGrantee

.scripts/compare-database.test.js

@@ -8,7 +8,7 @@
  */
 
 import assert from 'node:assert';
-import { autoCompare, deepSort } from './compare-database.js';
+import { autoCompare, deepSort, normalizeDefinition } from './compare-database.js';
 
 // Test helper function
 const runTest = (testName, testFn) => {
@@ -212,3 +212,101 @@ runTest('deepSort - mixed types in array', () => {
 
   assert.deepStrictEqual(result, expected);
 });
+
+// Test cases for normalizeDefinition function
+runTest('normalizeDefinition - single line without leading/trailing spaces', () => {
+  const input = 'CREATE FUNCTION test() RETURNS void';
+  const expected = 'CREATE FUNCTION test() RETURNS void';
+  const result = normalizeDefinition(input);
+  
+  assert.strictEqual(result, expected);
+});
+
+runTest('normalizeDefinition - single line with leading/trailing spaces', () => {
+  const input = '  CREATE FUNCTION test() RETURNS void  ';
+  const expected = 'CREATE FUNCTION test() RETURNS void';
+  const result = normalizeDefinition(input);
+  
+  assert.strictEqual(result, expected);
+});
+
+runTest('normalizeDefinition - multi-line with various indentation', () => {
+  const input = `CREATE OR REPLACE FUNCTION test_function()
+    RETURNS trigger
+    LANGUAGE plpgsql
+  AS $function$
+    BEGIN
+      IF NEW.status IS NULL THEN
+        NEW.status := 'active';
+      END IF;
+      RETURN NEW;
+    END;
+  $function$`;
+  
+  const expected = `CREATE OR REPLACE FUNCTION test_function()
+RETURNS trigger
+LANGUAGE plpgsql
+AS $function$
+BEGIN
+IF NEW.status IS NULL THEN
+NEW.status := 'active';
+END IF;
+RETURN NEW;
+END;
+$function$`;
+  
+  const result = normalizeDefinition(input);
+  assert.strictEqual(result, expected);
+});
+
+runTest('normalizeDefinition - trigger action statement', () => {
+  const input = `  BEGIN
+    UPDATE table1 SET updated_at = NOW() WHERE id = NEW.id;
+    INSERT INTO audit_log (table_name, action) VALUES ('table1', 'UPDATE');
+      RETURN NEW;
+  END  `;
+  
+  const expected = `BEGIN
+UPDATE table1 SET updated_at = NOW() WHERE id = NEW.id;
+INSERT INTO audit_log (table_name, action) VALUES ('table1', 'UPDATE');
+RETURN NEW;
+END`;
+  
+  const result = normalizeDefinition(input);
+  assert.strictEqual(result, expected);
+});
+
+runTest('normalizeDefinition - empty lines and mixed spacing', () => {
+  const input = `  CREATE FUNCTION complex_func()
+
+    RETURNS TABLE(id integer, name text)
+  AS $$
+    SELECT id, name
+      FROM users
+        WHERE active = true;
+  $$`;
+  
+  const expected = `CREATE FUNCTION complex_func()
+
+RETURNS TABLE(id integer, name text)
+AS $$
+SELECT id, name
+FROM users
+WHERE active = true;
+$$`;
+  
+  const result = normalizeDefinition(input);
+  assert.strictEqual(result, expected);
+});
+
+runTest('normalizeDefinition - non-string input', () => {
+  assert.strictEqual(normalizeDefinition(null), null);
+  assert.strictEqual(normalizeDefinition(undefined), undefined);
+  assert.strictEqual(normalizeDefinition(123), 123);
+  assert.deepStrictEqual(normalizeDefinition({ key: 'value' }), { key: 'value' });
+});
+
+runTest('normalizeDefinition - empty string', () => {
+  assert.strictEqual(normalizeDefinition(''), '');
+  assert.strictEqual(normalizeDefinition('   '), '');
+});