refactor: use 'idempotent migration' instead of incremental one

timescale · Feb 15, 2025 · b4ccdc1 · b4ccdc1
1 parent 1b594dd
commit b4ccdc1
Show file tree

Hide file tree

Showing 6 changed files with 217 additions and 206 deletions.
diff --git a/projects/extension/sql/idempotent/012-vectorizer-int.sql b/projects/extension/sql/idempotent/012-vectorizer-int.sql
@@ -461,7 +461,6 @@ $func$
 language plpgsql volatile security invoker
 set search_path to pg_catalog, pg_temp
 ;
-
 -------------------------------------------------------------------------------
 -- _vectorizer_create_source_trigger
 create or replace function ai._vectorizer_create_source_trigger
@@ -508,41 +507,40 @@ begin
     into strict _pk_change_check
     from pg_catalog.jsonb_to_recordset(source_pk) x(attnum int, attname name);
 
-    -- Create the trigger function with direct string construction
-    _sql := format(
-        $sql$
-        create function %I.%I() returns trigger as
-        $plpgsql$
-        begin
-            if (TG_OP = 'DELETE') then
-                execute %L using old;
-                return old;
-            elsif (TG_OP = 'UPDATE') then
-                if %s then
-                    execute %L using old;
-                end if;
-
-                insert into %I.%I (%s)
-                values (%s);
-                return new;
-            else  -- INSERT
-                insert into %I.%I (%s)
-                values (%s);
-                return new;
+    -- Create the trigger function
+    _sql := $create_func$
+    create function $QUEUE_SCHEMA$.$TRIGGER_NAME$() returns trigger as 
+    $trigger_func$
+    begin
+        if (TG_OP = 'DELETE') then
+            execute '$delete_statement$' using old;
+            return old;
+        elsif (TG_OP = 'UPDATE') then
+            if $pk_change_check$ then
+                execute '$delete_statement$' using old;
             end if;
-        end;
-        $plpgsql$ language plpgsql volatile parallel safe security definer
-        set search_path to pg_catalog, pg_temp
-        $sql$,
-        queue_schema, trigger_name,         -- Function name (1,2)
-        _delete_statement,                  -- DELETE case (3)
-        _pk_change_check,                   -- UPDATE check condition (4)
-        _delete_statement,                  -- UPDATE delete statement (5)
-        queue_schema, queue_table,          -- Queue table for UPDATE (6,7)
-        _pk_columns, _pk_values,           -- Columns and values for UPDATE (8,9)
-        queue_schema, queue_table,          -- Queue table for INSERT (10,11)
-        _pk_columns, _pk_values            -- Columns and values for INSERT (12,13)
-    );
+
+            insert into $QUEUE_SCHEMA$.$QUEUE_TABLE$ ($PK_COLUMNS$)
+            values ($PK_VALUES$);
+            return new;
+        else  -- INSERT
+            insert into $QUEUE_SCHEMA$.$QUEUE_TABLE$ ($PK_COLUMNS$)
+            values ($PK_VALUES$);
+            return new;
+        end if;
+    end;
+    $trigger_func$ language plpgsql volatile parallel safe security definer
+    set search_path to pg_catalog, pg_temp
+    $create_func$;
+
+    -- Replace the placeholders with actual values
+    _sql := replace(_sql, '$QUEUE_SCHEMA$', quote_ident(queue_schema));
+    _sql := replace(_sql, '$TRIGGER_NAME$', quote_ident(trigger_name));
+    _sql := replace(_sql, '$delete_statement$', _delete_statement);
+    _sql := replace(_sql, '$pk_change_check$', _pk_change_check);
+    _sql := replace(_sql, '$QUEUE_TABLE$', quote_ident(queue_table));
+    _sql := replace(_sql, '$PK_COLUMNS$', _pk_columns);
+    _sql := replace(_sql, '$PK_VALUES$', _pk_values);
 
     execute _sql;
 
@@ -573,6 +571,68 @@ language plpgsql volatile security invoker
 set search_path to pg_catalog, pg_temp
 ;
 
+do $upgrade_block$
+declare
+    _vec record;
+    _version text;
+    _new_version text := '0.9.0';  -- Version after upgrade
+begin
+    -- Find all vectorizers with version < 0.9.0
+    for _vec in (
+        select 
+            v.id,
+            v.source_schema,
+            v.source_table,
+            v.source_pk,
+            v.target_schema,
+            v.target_table,
+            v.trigger_name,
+            v.queue_schema,
+            v.queue_table,
+            v.config
+        from ai.vectorizer v
+        where (v.config->>'version')::text ~ '^0\.8\.'
+    )
+    loop
+        raise notice 'Upgrading trigger for vectorizer ID % from version %', _vec.id, _vec.config->>'version';
+
+        -- Drop existing trigger
+        execute format(
+            'drop trigger if exists %I on %I.%I',
+            _vec.trigger_name,
+            _vec.source_schema,
+            _vec.source_table
+        );
+
+        -- Drop existing trigger function
+        execute format(
+            'drop function if exists %I.%I()',
+            _vec.queue_schema,
+            _vec.trigger_name
+        );
+
+        -- Create new trigger
+        perform ai._vectorizer_create_source_trigger(
+            _vec.trigger_name,
+            _vec.queue_schema,
+            _vec.queue_table,
+            _vec.source_schema,
+            _vec.source_table,
+            _vec.target_schema,
+            _vec.target_table,
+            _vec.source_pk
+        );
+
+        -- Update the version in the config
+        update ai.vectorizer 
+        set config = jsonb_set(config, '{version}', format('"%s"', _new_version)::jsonb)
+        where id = _vec.id;
+
+        raise notice 'Successfully upgraded trigger for vectorizer ID % to version %', _vec.id, _new_version;
+    end loop;
+end;
+$upgrade_block$;
+
 -------------------------------------------------------------------------------
 -- _vectorizer_vector_index_exists
 create or replace function ai._vectorizer_vector_index_exists

diff --git a/projects/extension/sql/incremental/018-add-delete-handling-to-trigger.sql b/projects/extension/sql/incremental/018-add-delete-handling-to-trigger.sql
diff --git a/projects/extension/tests/contents/output16.expected b/projects/extension/tests/contents/output16.expected
@@ -81,7 +81,7 @@ CREATE EXTENSION
  function ai._validate_scheduling(jsonb)
  function ai._vectorizer_create_dependencies(integer)
  function ai._vectorizer_create_queue_table(name,name,jsonb,name[])
- function ai._vectorizer_create_source_trigger(name,name,name,name,name,jsonb)
+ function ai._vectorizer_create_source_trigger(name,name,name,name,name,name,name,jsonb)
  function ai._vectorizer_create_target_table(name,name,jsonb,name,name,integer,name[])
  function ai._vectorizer_create_vector_index(name,name,jsonb)
  function ai._vectorizer_create_view(name,name,name,name,jsonb,name,name,name[])

diff --git a/projects/extension/tests/contents/output17.expected b/projects/extension/tests/contents/output17.expected
@@ -81,7 +81,7 @@ CREATE EXTENSION
  function ai._validate_scheduling(jsonb)
  function ai._vectorizer_create_dependencies(integer)
  function ai._vectorizer_create_queue_table(name,name,jsonb,name[])
- function ai._vectorizer_create_source_trigger(name,name,name,name,name,jsonb)
+ function ai._vectorizer_create_source_trigger(name,name,name,name,name,name,name,jsonb)
  function ai._vectorizer_create_target_table(name,name,jsonb,name,name,integer,name[])
  function ai._vectorizer_create_vector_index(name,name,jsonb)
  function ai._vectorizer_create_view(name,name,name,name,jsonb,name,name,name[])

diff --git a/projects/extension/tests/privileges/function.expected b/projects/extension/tests/privileges/function.expected
@@ -52,10 +52,10 @@
  f       | bob   | execute   | no      | ai     | _vectorizer_create_queue_table(queue_schema name, queue_table name, source_pk jsonb, grant_to name[])
  f       | fred  | execute   | no      | ai     | _vectorizer_create_queue_table(queue_schema name, queue_table name, source_pk jsonb, grant_to name[])
  f       | jill  | execute   | YES     | ai     | _vectorizer_create_queue_table(queue_schema name, queue_table name, source_pk jsonb, grant_to name[])
- f       | alice | execute   | YES     | ai     | _vectorizer_create_source_trigger(trigger_name name, queue_schema name, queue_table name, source_schema name, source_table name, source_pk jsonb)
- f       | bob   | execute   | no      | ai     | _vectorizer_create_source_trigger(trigger_name name, queue_schema name, queue_table name, source_schema name, source_table name, source_pk jsonb)
- f       | fred  | execute   | no      | ai     | _vectorizer_create_source_trigger(trigger_name name, queue_schema name, queue_table name, source_schema name, source_table name, source_pk jsonb)
- f       | jill  | execute   | YES     | ai     | _vectorizer_create_source_trigger(trigger_name name, queue_schema name, queue_table name, source_schema name, source_table name, source_pk jsonb)
+ f       | alice | execute   | YES     | ai     | _vectorizer_create_source_trigger(trigger_name name, queue_schema name, queue_table name, source_schema name, source_table name, target_schema name, target_table name, source_pk jsonb)
+ f       | bob   | execute   | no      | ai     | _vectorizer_create_source_trigger(trigger_name name, queue_schema name, queue_table name, source_schema name, source_table name, target_schema name, target_table name, source_pk jsonb)
+ f       | fred  | execute   | no      | ai     | _vectorizer_create_source_trigger(trigger_name name, queue_schema name, queue_table name, source_schema name, source_table name, target_schema name, target_table name, source_pk jsonb)
+ f       | jill  | execute   | YES     | ai     | _vectorizer_create_source_trigger(trigger_name name, queue_schema name, queue_table name, source_schema name, source_table name, target_schema name, target_table name, source_pk jsonb)
  f       | alice | execute   | YES     | ai     | _vectorizer_create_target_table(source_schema name, source_table name, source_pk jsonb, target_schema name, target_table name, dimensions integer, grant_to name[])
  f       | bob   | execute   | no      | ai     | _vectorizer_create_target_table(source_schema name, source_table name, source_pk jsonb, target_schema name, target_table name, dimensions integer, grant_to name[])
  f       | fred  | execute   | no      | ai     | _vectorizer_create_target_table(source_schema name, source_table name, source_pk jsonb, target_schema name, target_table name, dimensions integer, grant_to name[])