diff --git a/pgmq-extension/pgmq.control b/pgmq-extension/pgmq.control
index 2b145bbf..5fbcabc0 100644
--- a/pgmq-extension/pgmq.control
+++ b/pgmq-extension/pgmq.control
@@ -1,5 +1,5 @@
 comment = 'A lightweight message queue. Like AWS SQS and RSMQ but on Postgres.'
-default_version = '1.4.0'
+default_version = '1.4.1'
 module_pathname = '$libdir/pgmq'
 schema = 'pgmq'
 relocatable = false
diff --git a/pgmq-extension/sql/pgmq--1.4.0--1.4.1.sql b/pgmq-extension/sql/pgmq--1.4.0--1.4.1.sql
new file mode 100644
index 00000000..5ff08ba9
--- /dev/null
+++ b/pgmq-extension/sql/pgmq--1.4.0--1.4.1.sql
@@ -0,0 +1,744 @@
+CREATE OR REPLACE FUNCTION pgmq.read(
+    queue_name TEXT,
+    vt INTEGER,
+    qty INTEGER
+)
+RETURNS SETOF pgmq.message_record AS $$
+DECLARE
+    sql TEXT;
+BEGIN
+    sql := FORMAT(
+        $QUERY$
+        WITH cte AS
+        (
+            SELECT msg_id
+            FROM pgmq.q_%I
+            WHERE vt <= clock_timestamp()
+            ORDER BY msg_id ASC
+            LIMIT $1
+            FOR UPDATE SKIP LOCKED
+        )
+        UPDATE pgmq.q_%I m
+        SET
+            vt = clock_timestamp() + interval '%I seconds',
+            read_ct = read_ct + 1
+        FROM cte
+        WHERE m.msg_id = cte.msg_id
+        RETURNING m.msg_id, m.read_ct, m.enqueued_at, m.vt, m.message;
+        $QUERY$,
+        queue_name, queue_name, vt
+    );
+    RETURN QUERY EXECUTE sql USING qty;
+END;
+$$ LANGUAGE plpgsql;
+
+
+CREATE OR REPLACE FUNCTION pgmq.read_with_poll(
+    queue_name TEXT,
+    vt INTEGER,
+    qty INTEGER,
+    max_poll_seconds INTEGER DEFAULT 5,
+    poll_interval_ms INTEGER DEFAULT 100
+)
+RETURNS SETOF pgmq.message_record AS $$
+DECLARE
+    r pgmq.message_record;
+    stop_at TIMESTAMP;
+    sql TEXT;
+BEGIN
+    stop_at := clock_timestamp() + FORMAT('%I seconds', max_poll_seconds)::interval;
+    LOOP
+      IF (SELECT clock_timestamp() >= stop_at) THEN
+        RETURN;
+      END IF;
+
+      sql := FORMAT(
+          $QUERY$
+          WITH cte AS
+          (
+              SELECT msg_id
+              FROM pgmq.q_%I
+              WHERE vt <= clock_timestamp()
+              ORDER BY msg_id ASC
+              LIMIT $1
+              FOR UPDATE SKIP LOCKED
+          )
+          UPDATE pgmq.q_%I m
+          SET
+              vt = clock_timestamp() + interval '%I seconds',
+              read_ct = read_ct + 1
+          FROM cte
+          WHERE m.msg_id = cte.msg_id
+          RETURNING m.msg_id, m.read_ct, m.enqueued_at, m.vt, m.message;
+          $QUERY$,
+          queue_name, queue_name, vt
+      );
+
+      FOR r IN
+        EXECUTE sql USING qty
+      LOOP
+        RETURN NEXT r;
+      END LOOP;
+      IF FOUND THEN
+        RETURN;
+      ELSE
+        PERFORM pg_sleep(poll_interval_ms / 1000);
+      END IF;
+    END LOOP;
+END;
+$$ LANGUAGE plpgsql;
+
+
+CREATE OR REPLACE FUNCTION pgmq.archive(
+    queue_name TEXT,
+    msg_id BIGINT
+)
+RETURNS BOOLEAN AS $$
+DECLARE
+    sql TEXT;
+    result BIGINT;
+BEGIN
+    sql := FORMAT(
+        $QUERY$
+        WITH archived AS (
+            DELETE FROM pgmq.q_%I
+            WHERE msg_id = $1
+            RETURNING msg_id, vt, read_ct, enqueued_at, message
+        )
+        INSERT INTO pgmq.a_%I (msg_id, vt, read_ct, enqueued_at, message)
+        SELECT msg_id, vt, read_ct, enqueued_at, message
+        FROM archived
+        RETURNING msg_id;
+        $QUERY$,
+        queue_name, queue_name
+    );
+    EXECUTE sql USING msg_id INTO result;
+    RETURN NOT (result IS NULL);
+END;
+$$ LANGUAGE plpgsql;
+
+
+CREATE OR REPLACE FUNCTION pgmq.archive(
+    queue_name TEXT,
+    msg_ids BIGINT[]
+)
+RETURNS SETOF BIGINT AS $$
+DECLARE
+    sql TEXT;
+BEGIN
+    sql := FORMAT(
+        $QUERY$
+        WITH archived AS (
+            DELETE FROM pgmq.q_%I
+            WHERE msg_id = ANY($1)
+            RETURNING msg_id, vt, read_ct, enqueued_at, message
+        )
+        INSERT INTO pgmq.a_%I (msg_id, vt, read_ct, enqueued_at, message)
+        SELECT msg_id, vt, read_ct, enqueued_at, message
+        FROM archived
+        RETURNING msg_id;
+        $QUERY$,
+        queue_name, queue_name
+    );
+    RETURN QUERY EXECUTE sql USING msg_ids;
+END;
+$$ LANGUAGE plpgsql;
+
+
+CREATE OR REPLACE FUNCTION pgmq.delete(
+    queue_name TEXT,
+    msg_id BIGINT
+)
+RETURNS BOOLEAN AS $$
+DECLARE
+    sql TEXT;
+    result BIGINT;
+BEGIN
+    sql := FORMAT(
+        $QUERY$
+        DELETE FROM pgmq.q_%I
+        WHERE msg_id = $1
+        RETURNING msg_id
+        $QUERY$,
+        queue_name
+    );
+    EXECUTE sql USING msg_id INTO result;
+    RETURN NOT (result IS NULL);
+END;
+$$ LANGUAGE plpgsql;
+
+
+CREATE OR REPLACE FUNCTION pgmq.delete(
+    queue_name TEXT,
+    msg_ids BIGINT[]
+)
+RETURNS SETOF BIGINT AS $$
+DECLARE
+    sql TEXT;
+BEGIN
+    sql := FORMAT(
+        $QUERY$
+        DELETE FROM pgmq.q_%I
+        WHERE msg_id = ANY($1)
+        RETURNING msg_id
+        $QUERY$,
+        queue_name
+    );
+    RETURN QUERY EXECUTE sql USING msg_ids;
+END;
+$$ LANGUAGE plpgsql;
+
+
+CREATE OR REPLACE FUNCTION pgmq.send(
+    queue_name TEXT,
+    msg JSONB,
+    delay INTEGER DEFAULT 0
+) RETURNS SETOF BIGINT AS $$
+DECLARE
+    sql TEXT;
+BEGIN
+    sql := FORMAT(
+        $QUERY$
+        INSERT INTO pgmq.q_%I (vt, message)
+        VALUES ((clock_timestamp() + interval '%I seconds'), $1)
+        RETURNING msg_id;
+        $QUERY$,
+        queue_name, delay
+    );
+    RETURN QUERY EXECUTE sql USING msg;
+END;
+$$ LANGUAGE plpgsql;
+
+
+CREATE OR REPLACE FUNCTION pgmq.send_batch(
+    queue_name TEXT,
+    msgs JSONB[],
+    delay INTEGER DEFAULT 0
+) RETURNS SETOF BIGINT AS $$
+DECLARE
+    sql TEXT;
+BEGIN
+    sql := FORMAT(
+        $QUERY$
+        INSERT INTO pgmq.q_%I (vt, message)
+        SELECT clock_timestamp() + interval '%I seconds', unnest($1)
+        RETURNING msg_id;
+        $QUERY$,
+        queue_name, delay
+    );
+    RETURN QUERY EXECUTE sql USING msgs;
+END;
+$$ LANGUAGE plpgsql;
+
+
+CREATE OR REPLACE FUNCTION pgmq.metrics(queue_name TEXT)
+RETURNS pgmq.metrics_result AS $$
+DECLARE
+    result_row pgmq.metrics_result;
+    query TEXT;
+BEGIN
+    query := FORMAT(
+        $QUERY$
+        WITH q_summary AS (
+            SELECT
+                count(*) as queue_length,
+                EXTRACT(epoch FROM (NOW() - max(enqueued_at)))::int as newest_msg_age_sec,
+                EXTRACT(epoch FROM (NOW() - min(enqueued_at)))::int as oldest_msg_age_sec,
+                NOW() as scrape_time
+            FROM pgmq.q_%I
+        ),
+        all_metrics AS (
+            SELECT CASE
+                WHEN is_called THEN last_value ELSE 0
+                END as total_messages
+            FROM pgmq.q_%I_msg_id_seq
+        )
+        SELECT
+            '%I' as queue_name,
+            q_summary.queue_length,
+            q_summary.newest_msg_age_sec,
+            q_summary.oldest_msg_age_sec,
+            all_metrics.total_messages,
+            q_summary.scrape_time
+        FROM q_summary, all_metrics
+        $QUERY$,
+        queue_name, queue_name, queue_name
+    );
+    EXECUTE query INTO result_row;
+    RETURN result_row;
+END;
+$$ LANGUAGE plpgsql;
+
+
+CREATE OR REPLACE FUNCTION pgmq."purge_queue"(queue_name TEXT)
+RETURNS BIGINT AS $$
+DECLARE
+  deleted_count INTEGER;
+BEGIN
+  EXECUTE format('DELETE FROM pgmq.q_%I', queue_name);
+  GET DIAGNOSTICS deleted_count = ROW_COUNT;
+  RETURN deleted_count;
+END
+$$ LANGUAGE plpgsql;
+
+
+CREATE OR REPLACE FUNCTION pgmq."detach_archive"(queue_name TEXT)
+RETURNS VOID AS $$
+BEGIN
+  EXECUTE format('ALTER EXTENSION pgmq DROP TABLE pgmq.a_%I', queue_name);
+END
+$$ LANGUAGE plpgsql;
+
+-- pop a single message
+CREATE OR REPLACE FUNCTION pgmq.pop(queue_name TEXT)
+RETURNS SETOF pgmq.message_record AS $$
+DECLARE
+    sql TEXT;
+    result pgmq.message_record;
+BEGIN
+    sql := FORMAT(
+        $QUERY$
+        WITH cte AS
+            (
+                SELECT msg_id
+                FROM pgmq.q_%I
+                WHERE vt <= now()
+                ORDER BY msg_id ASC
+                LIMIT 1
+                FOR UPDATE SKIP LOCKED
+            )
+        DELETE from pgmq.q_%I
+        WHERE msg_id = (select msg_id from cte)
+        RETURNING *;
+        $QUERY$,
+        queue_name, queue_name
+    );
+    RETURN QUERY EXECUTE sql;
+END;
+$$ LANGUAGE plpgsql;
+
+
+CREATE OR REPLACE FUNCTION pgmq.set_vt(queue_name TEXT, msg_id BIGINT, vt INTEGER)
+RETURNS SETOF pgmq.message_record AS $$
+DECLARE
+    sql TEXT;
+    result pgmq.message_record;
+BEGIN
+    sql := FORMAT(
+        $QUERY$
+        UPDATE pgmq.q_%I
+        SET vt = (now() + interval '%I seconds')
+        WHERE msg_id = %I
+        RETURNING *;
+        $QUERY$,
+        queue_name, vt, msg_id
+    );
+    RETURN QUERY EXECUTE sql;
+END;
+$$ LANGUAGE plpgsql;
+
+
+CREATE OR REPLACE FUNCTION pgmq.drop_queue(queue_name TEXT, partitioned BOOLEAN DEFAULT FALSE)
+RETURNS BOOLEAN AS $$
+BEGIN
+    EXECUTE FORMAT(
+        $QUERY$
+        ALTER EXTENSION pgmq DROP TABLE pgmq.q_%I
+        $QUERY$,
+        queue_name
+    );
+
+    EXECUTE FORMAT(
+        $QUERY$
+        ALTER EXTENSION pgmq DROP TABLE pgmq.a_%I
+        $QUERY$,
+        queue_name
+    );
+
+    EXECUTE FORMAT(
+        $QUERY$
+        DROP TABLE IF EXISTS pgmq.q_%I
+        $QUERY$,
+        queue_name
+    );
+
+    EXECUTE FORMAT(
+        $QUERY$
+        DROP TABLE IF EXISTS pgmq.a_%I
+        $QUERY$,
+        queue_name
+    );
+
+     IF EXISTS (
+          SELECT 1
+          FROM information_schema.tables
+          WHERE table_name = 'meta' and table_schema = 'pgmq'
+     ) THEN
+        EXECUTE FORMAT(
+            $QUERY$
+            DELETE FROM pgmq.meta WHERE queue_name = '%I'
+            $QUERY$,
+            queue_name
+        );
+     END IF;
+
+     IF partitioned THEN
+        EXECUTE FORMAT(
+          $QUERY$
+          DELETE FROM public.part_config where parent_table = '%I'
+          $QUERY$,
+          queue_name
+        );
+     END IF;
+
+    RETURN TRUE;
+END;
+$$ LANGUAGE plpgsql;
+
+
+CREATE OR REPLACE FUNCTION pgmq.validate_queue_name(queue_name TEXT)
+RETURNS void AS $$
+BEGIN
+  IF length(queue_name) >= 48 THEN
+    RAISE EXCEPTION 'queue name is too long, maximum length is 48 characters';
+  END IF;
+END;
+$$ LANGUAGE plpgsql;
+
+CREATE OR REPLACE FUNCTION pgmq._belongs_to_pgmq(table_name TEXT)
+RETURNS BOOLEAN AS $$
+DECLARE
+    sql TEXT;
+    result BOOLEAN;
+BEGIN
+  SELECT EXISTS (
+    SELECT 1
+    FROM pg_depend
+    WHERE refobjid = (SELECT oid FROM pg_extension WHERE extname = 'pgmq')
+    AND objid = (
+        SELECT oid
+        FROM pg_class
+        WHERE relname = table_name
+    )
+  ) INTO result;
+  RETURN result;
+END;
+$$ LANGUAGE plpgsql;
+
+
+CREATE OR REPLACE FUNCTION pgmq.create_non_partitioned(queue_name TEXT)
+RETURNS void AS $$
+BEGIN
+  PERFORM pgmq.validate_queue_name(queue_name);
+
+  EXECUTE FORMAT(
+    $QUERY$
+    CREATE TABLE IF NOT EXISTS pgmq.q_%I (
+        msg_id BIGINT PRIMARY KEY GENERATED ALWAYS AS IDENTITY,
+        read_ct INT DEFAULT 0 NOT NULL,
+        enqueued_at TIMESTAMP WITH TIME ZONE DEFAULT now() NOT NULL,
+        vt TIMESTAMP WITH TIME ZONE NOT NULL,
+        message JSONB
+    )
+    $QUERY$,
+    queue_name
+  );
+
+  EXECUTE FORMAT(
+    $QUERY$
+    CREATE TABLE IF NOT EXISTS pgmq.a_%I (
+      msg_id BIGINT PRIMARY KEY,
+      read_ct INT DEFAULT 0 NOT NULL,
+      enqueued_at TIMESTAMP WITH TIME ZONE DEFAULT now() NOT NULL,
+      archived_at TIMESTAMP WITH TIME ZONE DEFAULT now() NOT NULL,
+      vt TIMESTAMP WITH TIME ZONE NOT NULL,
+      message JSONB
+    );
+    $QUERY$,
+    queue_name
+  );
+
+  IF NOT pgmq._belongs_to_pgmq(FORMAT('q_%I', queue_name)) THEN
+      EXECUTE FORMAT('ALTER EXTENSION pgmq ADD TABLE pgmq.q_%I', queue_name);
+  END IF;
+
+  IF NOT pgmq._belongs_to_pgmq(FORMAT('a_%I', queue_name)) THEN
+      EXECUTE FORMAT('ALTER EXTENSION pgmq ADD TABLE pgmq.a_%I', queue_name);
+  END IF;
+
+  EXECUTE FORMAT(
+    $QUERY$
+    CREATE INDEX IF NOT EXISTS q_%I_vt_idx ON pgmq.q_%I (vt ASC);
+    $QUERY$,
+    queue_name, queue_name
+  );
+
+  EXECUTE FORMAT(
+    $QUERY$
+    CREATE INDEX IF NOT EXISTS archived_at_idx_%I ON pgmq.a_%I (archived_at);
+    $QUERY$,
+    queue_name, queue_name
+  );
+
+  EXECUTE FORMAT(
+    $QUERY$
+    INSERT INTO pgmq.meta (queue_name, is_partitioned, is_unlogged)
+    VALUES ('%I', false, false)
+    ON CONFLICT
+    DO NOTHING;
+    $QUERY$,
+    queue_name
+  );
+END;
+$$ LANGUAGE plpgsql;
+
+
+CREATE OR REPLACE FUNCTION pgmq.create_unlogged(queue_name TEXT)
+RETURNS void AS $$
+BEGIN
+  PERFORM pgmq.validate_queue_name(queue_name);
+
+  EXECUTE FORMAT(
+    $QUERY$
+    CREATE UNLOGGED TABLE IF NOT EXISTS pgmq.q_%I (
+        msg_id BIGINT PRIMARY KEY GENERATED ALWAYS AS IDENTITY,
+        read_ct INT DEFAULT 0 NOT NULL,
+        enqueued_at TIMESTAMP WITH TIME ZONE DEFAULT now() NOT NULL,
+        vt TIMESTAMP WITH TIME ZONE NOT NULL,
+        message JSONB
+    )
+    $QUERY$,
+    queue_name
+  );
+
+  EXECUTE FORMAT(
+    $QUERY$
+    CREATE TABLE IF NOT EXISTS pgmq.a_%I (
+      msg_id BIGINT PRIMARY KEY,
+      read_ct INT DEFAULT 0 NOT NULL,
+      enqueued_at TIMESTAMP WITH TIME ZONE DEFAULT now() NOT NULL,
+      archived_at TIMESTAMP WITH TIME ZONE DEFAULT now() NOT NULL,
+      vt TIMESTAMP WITH TIME ZONE NOT NULL,
+      message JSONB
+    );
+    $QUERY$,
+    queue_name
+  );
+
+  IF NOT pgmq._belongs_to_pgmq(FORMAT('q_%I', queue_name)) THEN
+      EXECUTE FORMAT('ALTER EXTENSION pgmq ADD TABLE pgmq.q_%I', queue_name);
+  END IF;
+
+  IF NOT pgmq._belongs_to_pgmq(FORMAT('a_%I', queue_name)) THEN
+      EXECUTE FORMAT('ALTER EXTENSION pgmq ADD TABLE pgmq.a_%I', queue_name);
+  END IF;
+
+  EXECUTE FORMAT(
+    $QUERY$
+    CREATE INDEX IF NOT EXISTS q_%I_vt_idx ON pgmq.q_%I (vt ASC);
+    $QUERY$,
+    queue_name, queue_name
+  );
+
+  EXECUTE FORMAT(
+    $QUERY$
+    CREATE INDEX IF NOT EXISTS archived_at_idx_%I ON pgmq.a_%I (archived_at);
+    $QUERY$,
+    queue_name, queue_name
+  );
+
+  EXECUTE FORMAT(
+    $QUERY$
+    INSERT INTO pgmq.meta (queue_name, is_partitioned, is_unlogged)
+    VALUES ('%I', false, true)
+    ON CONFLICT
+    DO NOTHING;
+    $QUERY$,
+    queue_name
+  );
+END;
+$$ LANGUAGE plpgsql;
+
+
+CREATE OR REPLACE FUNCTION pgmq.create_partitioned(
+  queue_name TEXT,
+  partition_interval TEXT DEFAULT '10000',
+  retention_interval TEXT DEFAULT '100000'
+)
+RETURNS void AS $$
+DECLARE
+  partition_col TEXT;
+  a_partition_col TEXT;
+BEGIN
+  PERFORM pgmq.validate_queue_name(queue_name);
+  PERFORM pgmq._ensure_pg_partman_installed();
+  SELECT pgmq._get_partition_col(partition_interval) INTO partition_col;
+
+  EXECUTE FORMAT(
+    $QUERY$
+    CREATE TABLE IF NOT EXISTS pgmq.q_%I (
+        msg_id BIGINT GENERATED ALWAYS AS IDENTITY,
+        read_ct INT DEFAULT 0 NOT NULL,
+        enqueued_at TIMESTAMP WITH TIME ZONE DEFAULT now() NOT NULL,
+        vt TIMESTAMP WITH TIME ZONE NOT NULL,
+        message JSONB
+    ) PARTITION BY RANGE (%I)
+    $QUERY$,
+    queue_name, partition_col
+  );
+
+  IF NOT pgmq._belongs_to_pgmq(FORMAT('q_%I', queue_name)) THEN
+      EXECUTE FORMAT('ALTER EXTENSION pgmq ADD TABLE pgmq.q_%I', queue_name);
+  END IF;
+
+  EXECUTE FORMAT(
+    $QUERY$
+    SELECT public.create_parent('pgmq.q_%I', '%I', 'native', '%I');
+    $QUERY$,
+    queue_name, partition_col, partition_interval
+  );
+
+  EXECUTE FORMAT(
+    $QUERY$
+    CREATE INDEX IF NOT EXISTS q_%I_part_idx ON pgmq.q_%I (%I);
+    $QUERY$,
+    queue_name, queue_name, partition_col
+  );
+
+  EXECUTE FORMAT(
+    $QUERY$
+    UPDATE public.part_config
+    SET
+        retention = '%I',
+        retention_keep_table = false,
+        retention_keep_index = true,
+        automatic_maintenance = 'on'
+    WHERE parent_table = 'pgmq.q_%I';
+    $QUERY$,
+    retention_interval, queue_name
+  );
+
+  EXECUTE FORMAT(
+    $QUERY$
+    INSERT INTO pgmq.meta (queue_name, is_partitioned, is_unlogged)
+    VALUES ('%I', true, false)
+    ON CONFLICT
+    DO NOTHING;
+    $QUERY$,
+    queue_name
+  );
+
+  IF partition_col = 'enqueued_at' THEN
+    a_partition_col := 'archived_at';
+  ELSE
+    a_partition_col := partition_col;
+  END IF;
+
+  EXECUTE FORMAT(
+    $QUERY$
+    CREATE TABLE IF NOT EXISTS pgmq.a_%I (
+      msg_id BIGINT,
+      read_ct INT DEFAULT 0 NOT NULL,
+      enqueued_at TIMESTAMP WITH TIME ZONE DEFAULT now() NOT NULL,
+      archived_at TIMESTAMP WITH TIME ZONE DEFAULT now() NOT NULL,
+      vt TIMESTAMP WITH TIME ZONE NOT NULL,
+      message JSONB
+    ) PARTITION BY RANGE (%I);
+    $QUERY$,
+    queue_name, a_partition_col
+  );
+
+  IF NOT pgmq._belongs_to_pgmq(FORMAT('a_%I', queue_name)) THEN
+      EXECUTE FORMAT('ALTER EXTENSION pgmq ADD TABLE pgmq.a_%I', queue_name);
+  END IF;
+
+  EXECUTE FORMAT(
+    $QUERY$
+    SELECT public.create_parent('pgmq.a_%I', '%I', 'native', '%I');
+    $QUERY$,
+    queue_name, a_partition_col, partition_interval
+  );
+
+  EXECUTE FORMAT(
+    $QUERY$
+    UPDATE public.part_config
+    SET
+        retention = '%I',
+        retention_keep_table = false,
+        retention_keep_index = true,
+        automatic_maintenance = 'on'
+    WHERE parent_table = 'pgmq.a_%I';
+    $QUERY$,
+    retention_interval, queue_name
+  );
+
+  EXECUTE FORMAT(
+    $QUERY$
+    CREATE INDEX IF NOT EXISTS archived_at_idx_%I ON pgmq.a_%I (archived_at);
+    $QUERY$,
+    queue_name, queue_name
+  );
+
+END;
+$$ LANGUAGE plpgsql;
+
+
+CREATE OR REPLACE FUNCTION pgmq.create(queue_name TEXT)
+RETURNS void AS $$
+BEGIN
+    PERFORM pgmq.create_non_partitioned(queue_name);
+END;
+$$ LANGUAGE plpgsql;
+
+CREATE FUNCTION pgmq.convert_archive_partitioned(table_name TEXT,
+                                                 partition_interval TEXT DEFAULT '10000',
+                                                 retention_interval TEXT DEFAULT '100000',
+                                                 leading_partition INT DEFAULT 10)
+RETURNS void AS $$
+DECLARE
+a_table_name TEXT := 'a_' || table_name;
+a_table_name_old TEXT := 'a_'|| table_name || '_old';
+qualified_a_table_name TEXT := format('%I.%I', 'pgmq', 'a_' || table_name);
+qualified_a_table_name_old TEXT := format ('%I.%I', 'pgmq', 'a_' || table_name || '_old');
+BEGIN
+
+  PERFORM c.relkind
+    FROM pg_class c
+    JOIN pg_namespace n ON n.oid = c.relnamespace
+    WHERE c.relname = a_table_name
+    AND c.relkind = 'p';
+
+  IF FOUND THEN
+    RAISE NOTICE 'Table %I is already partitioned', a_table_name;
+    RETURN;
+  END IF;
+
+  PERFORM c.relkind
+    FROM pg_class c
+    JOIN pg_namespace n ON n.oid = c.relnamespace
+    WHERE c.relname = a_table_name
+    AND c.relkind = 'r';
+
+  IF NOT FOUND THEN
+    RAISE NOTICE 'Table %I doesnot exists', a_table_name;
+    RETURN;
+  END IF;
+
+  EXECUTE 'ALTER TABLE ' || qualified_a_table_name || ' RENAME TO ' || a_table_name_old;
+
+  EXECUTE format( 'CREATE TABLE pgmq.%I (LIKE pgmq.%I including all) PARTITION BY RANGE (msg_id)', 'a_' || table_name, 'a_'|| table_name || '_old' );
+
+  EXECUTE 'ALTER INDEX pgmq.archived_at_idx_' || table_name || ' RENAME TO archived_at_idx_' || table_name || '_old';
+  EXECUTE 'CREATE INDEX archived_at_idx_'|| table_name || ' ON ' || qualified_a_table_name ||'(archived_at)';
+
+  PERFORM create_parent(qualified_a_table_name, 'msg_id', 'native',  partition_interval,
+                         p_premake := leading_partition);
+
+  UPDATE part_config
+    SET retention = retention_interval,
+    retention_keep_table = false,
+    retention_keep_index = false,
+    infinite_time_partitions = true
+    WHERE parent_table = qualified_a_table_name;
+END;
+$$ LANGUAGE plpgsql;
diff --git a/pgmq-extension/sql/pgmq.sql b/pgmq-extension/sql/pgmq.sql
index 46d3cd8b..6bdb8a72 100644
--- a/pgmq-extension/sql/pgmq.sql
+++ b/pgmq-extension/sql/pgmq.sql
@@ -55,15 +55,15 @@ BEGIN
         WITH cte AS
         (
             SELECT msg_id
-            FROM pgmq.q_%s
+            FROM pgmq.q_%I
             WHERE vt <= clock_timestamp()
             ORDER BY msg_id ASC
             LIMIT $1
             FOR UPDATE SKIP LOCKED
         )
-        UPDATE pgmq.q_%s m
+        UPDATE pgmq.q_%I m
         SET
-            vt = clock_timestamp() + interval '%s seconds',
+            vt = clock_timestamp() + interval '%I seconds',
             read_ct = read_ct + 1
         FROM cte
         WHERE m.msg_id = cte.msg_id
@@ -90,7 +90,7 @@ DECLARE
     stop_at TIMESTAMP;
     sql TEXT;
 BEGIN
-    stop_at := clock_timestamp() + FORMAT('%s seconds', max_poll_seconds)::interval;
+    stop_at := clock_timestamp() + FORMAT('%I seconds', max_poll_seconds)::interval;
     LOOP
       IF (SELECT clock_timestamp() >= stop_at) THEN
         RETURN;
@@ -101,15 +101,15 @@ BEGIN
           WITH cte AS
           (
               SELECT msg_id
-              FROM pgmq.q_%s
+              FROM pgmq.q_%I
               WHERE vt <= clock_timestamp()
               ORDER BY msg_id ASC
               LIMIT $1
               FOR UPDATE SKIP LOCKED
           )
-          UPDATE pgmq.q_%s m
+          UPDATE pgmq.q_%I m
           SET
-              vt = clock_timestamp() + interval '%s seconds',
+              vt = clock_timestamp() + interval '%I seconds',
               read_ct = read_ct + 1
           FROM cte
           WHERE m.msg_id = cte.msg_id
@@ -147,11 +147,11 @@ BEGIN
     sql := FORMAT(
         $QUERY$
         WITH archived AS (
-            DELETE FROM pgmq.q_%s
+            DELETE FROM pgmq.q_%I
             WHERE msg_id = $1
             RETURNING msg_id, vt, read_ct, enqueued_at, message
         )
-        INSERT INTO pgmq.a_%s (msg_id, vt, read_ct, enqueued_at, message)
+        INSERT INTO pgmq.a_%I (msg_id, vt, read_ct, enqueued_at, message)
         SELECT msg_id, vt, read_ct, enqueued_at, message
         FROM archived
         RETURNING msg_id;
@@ -177,11 +177,11 @@ BEGIN
     sql := FORMAT(
         $QUERY$
         WITH archived AS (
-            DELETE FROM pgmq.q_%s
+            DELETE FROM pgmq.q_%I
             WHERE msg_id = ANY($1)
             RETURNING msg_id, vt, read_ct, enqueued_at, message
         )
-        INSERT INTO pgmq.a_%s (msg_id, vt, read_ct, enqueued_at, message)
+        INSERT INTO pgmq.a_%I (msg_id, vt, read_ct, enqueued_at, message)
         SELECT msg_id, vt, read_ct, enqueued_at, message
         FROM archived
         RETURNING msg_id;
@@ -205,7 +205,7 @@ DECLARE
 BEGIN
     sql := FORMAT(
         $QUERY$
-        DELETE FROM pgmq.q_%s
+        DELETE FROM pgmq.q_%I
         WHERE msg_id = $1
         RETURNING msg_id
         $QUERY$,
@@ -228,7 +228,7 @@ DECLARE
 BEGIN
     sql := FORMAT(
         $QUERY$
-        DELETE FROM pgmq.q_%s
+        DELETE FROM pgmq.q_%I
         WHERE msg_id = ANY($1)
         RETURNING msg_id
         $QUERY$,
@@ -250,8 +250,8 @@ DECLARE
 BEGIN
     sql := FORMAT(
         $QUERY$
-        INSERT INTO pgmq.q_%s (vt, message)
-        VALUES ((clock_timestamp() + interval '%s seconds'), $1)
+        INSERT INTO pgmq.q_%I (vt, message)
+        VALUES ((clock_timestamp() + interval '%I seconds'), $1)
         RETURNING msg_id;
         $QUERY$,
         queue_name, delay
@@ -272,8 +272,8 @@ DECLARE
 BEGIN
     sql := FORMAT(
         $QUERY$
-        INSERT INTO pgmq.q_%s (vt, message)
-        SELECT clock_timestamp() + interval '%s seconds', unnest($1)
+        INSERT INTO pgmq.q_%I (vt, message)
+        SELECT clock_timestamp() + interval '%I seconds', unnest($1)
         RETURNING msg_id;
         $QUERY$,
         queue_name, delay
@@ -307,16 +307,16 @@ BEGIN
                 EXTRACT(epoch FROM (NOW() - max(enqueued_at)))::int as newest_msg_age_sec,
                 EXTRACT(epoch FROM (NOW() - min(enqueued_at)))::int as oldest_msg_age_sec,
                 NOW() as scrape_time
-            FROM pgmq.q_%s
+            FROM pgmq.q_%I
         ),
         all_metrics AS (
             SELECT CASE
                 WHEN is_called THEN last_value ELSE 0
                 END as total_messages
-            FROM pgmq.q_%s_msg_id_seq
+            FROM pgmq.q_%I_msg_id_seq
         )
         SELECT
-            '%s' as queue_name,
+            '%I' as queue_name,
             q_summary.queue_length,
             q_summary.newest_msg_age_sec,
             q_summary.oldest_msg_age_sec,
@@ -359,7 +359,7 @@ RETURNS BIGINT AS $$
 DECLARE
   deleted_count INTEGER;
 BEGIN
-  EXECUTE format('DELETE FROM pgmq.q_%s', queue_name);
+  EXECUTE format('DELETE FROM pgmq.q_%I', queue_name);
   GET DIAGNOSTICS deleted_count = ROW_COUNT;
   RETURN deleted_count;
 END
@@ -369,7 +369,7 @@ $$ LANGUAGE plpgsql;
 CREATE FUNCTION pgmq."detach_archive"(queue_name TEXT)
 RETURNS VOID AS $$
 BEGIN
-  EXECUTE format('ALTER EXTENSION pgmq DROP TABLE pgmq.a_%s', queue_name);
+  EXECUTE format('ALTER EXTENSION pgmq DROP TABLE pgmq.a_%I', queue_name);
 END
 $$ LANGUAGE plpgsql;
 
@@ -385,13 +385,13 @@ BEGIN
         WITH cte AS
             (
                 SELECT msg_id
-                FROM pgmq.q_%s
+                FROM pgmq.q_%I
                 WHERE vt <= now()
                 ORDER BY msg_id ASC
                 LIMIT 1
                 FOR UPDATE SKIP LOCKED
             )
-        DELETE from pgmq.q_%s
+        DELETE from pgmq.q_%I
         WHERE msg_id = (select msg_id from cte)
         RETURNING *;
         $QUERY$,
@@ -410,9 +410,9 @@ DECLARE
 BEGIN
     sql := FORMAT(
         $QUERY$
-        UPDATE pgmq.q_%s
-        SET vt = (now() + interval '%s seconds')
-        WHERE msg_id = %s
+        UPDATE pgmq.q_%I
+        SET vt = (now() + interval '%I seconds')
+        WHERE msg_id = %I
         RETURNING *;
         $QUERY$,
         queue_name, vt, msg_id
@@ -426,28 +426,28 @@ RETURNS BOOLEAN AS $$
 BEGIN
     EXECUTE FORMAT(
         $QUERY$
-        ALTER EXTENSION pgmq DROP TABLE pgmq.q_%s
+        ALTER EXTENSION pgmq DROP TABLE pgmq.q_%I
         $QUERY$,
         queue_name
     );
 
     EXECUTE FORMAT(
         $QUERY$
-        ALTER EXTENSION pgmq DROP TABLE pgmq.a_%s
+        ALTER EXTENSION pgmq DROP TABLE pgmq.a_%I
         $QUERY$,
         queue_name
     );
 
     EXECUTE FORMAT(
         $QUERY$
-        DROP TABLE IF EXISTS pgmq.q_%s
+        DROP TABLE IF EXISTS pgmq.q_%I
         $QUERY$,
         queue_name
     );
 
     EXECUTE FORMAT(
         $QUERY$
-        DROP TABLE IF EXISTS pgmq.a_%s
+        DROP TABLE IF EXISTS pgmq.a_%I
         $QUERY$,
         queue_name
     );
@@ -459,7 +459,7 @@ BEGIN
      ) THEN
         EXECUTE FORMAT(
             $QUERY$
-            DELETE FROM pgmq.meta WHERE queue_name = '%s'
+            DELETE FROM pgmq.meta WHERE queue_name = '%I'
             $QUERY$,
             queue_name
         );
@@ -468,7 +468,7 @@ BEGIN
      IF partitioned THEN
         EXECUTE FORMAT(
           $QUERY$
-          DELETE FROM public.part_config where parent_table = '%s'
+          DELETE FROM public.part_config where parent_table = '%I'
           $QUERY$,
           queue_name
         );
@@ -514,7 +514,7 @@ BEGIN
 
   EXECUTE FORMAT(
     $QUERY$
-    CREATE TABLE IF NOT EXISTS pgmq.q_%s (
+    CREATE TABLE IF NOT EXISTS pgmq.q_%I (
         msg_id BIGINT PRIMARY KEY GENERATED ALWAYS AS IDENTITY,
         read_ct INT DEFAULT 0 NOT NULL,
         enqueued_at TIMESTAMP WITH TIME ZONE DEFAULT now() NOT NULL,
@@ -527,7 +527,7 @@ BEGIN
 
   EXECUTE FORMAT(
     $QUERY$
-    CREATE TABLE IF NOT EXISTS pgmq.a_%s (
+    CREATE TABLE IF NOT EXISTS pgmq.a_%I (
       msg_id BIGINT PRIMARY KEY,
       read_ct INT DEFAULT 0 NOT NULL,
       enqueued_at TIMESTAMP WITH TIME ZONE DEFAULT now() NOT NULL,
@@ -539,24 +539,24 @@ BEGIN
     queue_name
   );
 
-  IF NOT pgmq._belongs_to_pgmq(FORMAT('q_%s', queue_name)) THEN
-      EXECUTE FORMAT('ALTER EXTENSION pgmq ADD TABLE pgmq.q_%s', queue_name);
+  IF NOT pgmq._belongs_to_pgmq(FORMAT('q_%I', queue_name)) THEN
+      EXECUTE FORMAT('ALTER EXTENSION pgmq ADD TABLE pgmq.q_%I', queue_name);
   END IF;
 
-  IF NOT pgmq._belongs_to_pgmq(FORMAT('a_%s', queue_name)) THEN
-      EXECUTE FORMAT('ALTER EXTENSION pgmq ADD TABLE pgmq.a_%s', queue_name);
+  IF NOT pgmq._belongs_to_pgmq(FORMAT('a_%I', queue_name)) THEN
+      EXECUTE FORMAT('ALTER EXTENSION pgmq ADD TABLE pgmq.a_%I', queue_name);
   END IF;
 
   EXECUTE FORMAT(
     $QUERY$
-    CREATE INDEX IF NOT EXISTS q_%s_vt_idx ON pgmq.q_%s (vt ASC);
+    CREATE INDEX IF NOT EXISTS q_%I_vt_idx ON pgmq.q_%I (vt ASC);
     $QUERY$,
     queue_name, queue_name
   );
 
   EXECUTE FORMAT(
     $QUERY$
-    CREATE INDEX IF NOT EXISTS archived_at_idx_%s ON pgmq.a_%s (archived_at);
+    CREATE INDEX IF NOT EXISTS archived_at_idx_%I ON pgmq.a_%I (archived_at);
     $QUERY$,
     queue_name, queue_name
   );
@@ -564,7 +564,7 @@ BEGIN
   EXECUTE FORMAT(
     $QUERY$
     INSERT INTO pgmq.meta (queue_name, is_partitioned, is_unlogged)
-    VALUES ('%s', false, false)
+    VALUES ('%I', false, false)
     ON CONFLICT
     DO NOTHING;
     $QUERY$,
@@ -580,7 +580,7 @@ BEGIN
 
   EXECUTE FORMAT(
     $QUERY$
-    CREATE UNLOGGED TABLE IF NOT EXISTS pgmq.q_%s (
+    CREATE UNLOGGED TABLE IF NOT EXISTS pgmq.q_%I (
         msg_id BIGINT PRIMARY KEY GENERATED ALWAYS AS IDENTITY,
         read_ct INT DEFAULT 0 NOT NULL,
         enqueued_at TIMESTAMP WITH TIME ZONE DEFAULT now() NOT NULL,
@@ -593,7 +593,7 @@ BEGIN
 
   EXECUTE FORMAT(
     $QUERY$
-    CREATE TABLE IF NOT EXISTS pgmq.a_%s (
+    CREATE TABLE IF NOT EXISTS pgmq.a_%I (
       msg_id BIGINT PRIMARY KEY,
       read_ct INT DEFAULT 0 NOT NULL,
       enqueued_at TIMESTAMP WITH TIME ZONE DEFAULT now() NOT NULL,
@@ -605,24 +605,24 @@ BEGIN
     queue_name
   );
 
-  IF NOT pgmq._belongs_to_pgmq(FORMAT('q_%s', queue_name)) THEN
-      EXECUTE FORMAT('ALTER EXTENSION pgmq ADD TABLE pgmq.q_%s', queue_name);
+  IF NOT pgmq._belongs_to_pgmq(FORMAT('q_%I', queue_name)) THEN
+      EXECUTE FORMAT('ALTER EXTENSION pgmq ADD TABLE pgmq.q_%I', queue_name);
   END IF;
 
-  IF NOT pgmq._belongs_to_pgmq(FORMAT('a_%s', queue_name)) THEN
-      EXECUTE FORMAT('ALTER EXTENSION pgmq ADD TABLE pgmq.a_%s', queue_name);
+  IF NOT pgmq._belongs_to_pgmq(FORMAT('a_%I', queue_name)) THEN
+      EXECUTE FORMAT('ALTER EXTENSION pgmq ADD TABLE pgmq.a_%I', queue_name);
   END IF;
 
   EXECUTE FORMAT(
     $QUERY$
-    CREATE INDEX IF NOT EXISTS q_%s_vt_idx ON pgmq.q_%s (vt ASC);
+    CREATE INDEX IF NOT EXISTS q_%I_vt_idx ON pgmq.q_%I (vt ASC);
     $QUERY$,
     queue_name, queue_name
   );
 
   EXECUTE FORMAT(
     $QUERY$
-    CREATE INDEX IF NOT EXISTS archived_at_idx_%s ON pgmq.a_%s (archived_at);
+    CREATE INDEX IF NOT EXISTS archived_at_idx_%I ON pgmq.a_%I (archived_at);
     $QUERY$,
     queue_name, queue_name
   );
@@ -630,7 +630,7 @@ BEGIN
   EXECUTE FORMAT(
     $QUERY$
     INSERT INTO pgmq.meta (queue_name, is_partitioned, is_unlogged)
-    VALUES ('%s', false, true)
+    VALUES ('%I', false, true)
     ON CONFLICT
     DO NOTHING;
     $QUERY$,
@@ -687,31 +687,31 @@ BEGIN
 
   EXECUTE FORMAT(
     $QUERY$
-    CREATE TABLE IF NOT EXISTS pgmq.q_%s (
+    CREATE TABLE IF NOT EXISTS pgmq.q_%I (
         msg_id BIGINT GENERATED ALWAYS AS IDENTITY,
         read_ct INT DEFAULT 0 NOT NULL,
         enqueued_at TIMESTAMP WITH TIME ZONE DEFAULT now() NOT NULL,
         vt TIMESTAMP WITH TIME ZONE NOT NULL,
         message JSONB
-    ) PARTITION BY RANGE (%s)
+    ) PARTITION BY RANGE (%I)
     $QUERY$,
     queue_name, partition_col
   );
 
-  IF NOT pgmq._belongs_to_pgmq(FORMAT('q_%s', queue_name)) THEN
-      EXECUTE FORMAT('ALTER EXTENSION pgmq ADD TABLE pgmq.q_%s', queue_name);
+  IF NOT pgmq._belongs_to_pgmq(FORMAT('q_%I', queue_name)) THEN
+      EXECUTE FORMAT('ALTER EXTENSION pgmq ADD TABLE pgmq.q_%I', queue_name);
   END IF;
 
   EXECUTE FORMAT(
     $QUERY$
-    SELECT public.create_parent('pgmq.q_%s', '%s', 'native', '%s');
+    SELECT public.create_parent('pgmq.q_%I', '%I', 'native', '%I');
     $QUERY$,
     queue_name, partition_col, partition_interval
   );
 
   EXECUTE FORMAT(
     $QUERY$
-    CREATE INDEX IF NOT EXISTS q_%s_part_idx ON pgmq.q_%s (%s);
+    CREATE INDEX IF NOT EXISTS q_%I_part_idx ON pgmq.q_%I (%I);
     $QUERY$,
     queue_name, queue_name, partition_col
   );
@@ -720,11 +720,11 @@ BEGIN
     $QUERY$
     UPDATE public.part_config
     SET
-        retention = '%s',
+        retention = '%I',
         retention_keep_table = false,
         retention_keep_index = true,
         automatic_maintenance = 'on'
-    WHERE parent_table = 'pgmq.q_%s';
+    WHERE parent_table = 'pgmq.q_%I';
     $QUERY$,
     retention_interval, queue_name
   );
@@ -732,7 +732,7 @@ BEGIN
   EXECUTE FORMAT(
     $QUERY$
     INSERT INTO pgmq.meta (queue_name, is_partitioned, is_unlogged)
-    VALUES ('%s', true, false)
+    VALUES ('%I', true, false)
     ON CONFLICT
     DO NOTHING;
     $QUERY$,
@@ -747,25 +747,25 @@ BEGIN
 
   EXECUTE FORMAT(
     $QUERY$
-    CREATE TABLE IF NOT EXISTS pgmq.a_%s (
+    CREATE TABLE IF NOT EXISTS pgmq.a_%I (
       msg_id BIGINT,
       read_ct INT DEFAULT 0 NOT NULL,
       enqueued_at TIMESTAMP WITH TIME ZONE DEFAULT now() NOT NULL,
       archived_at TIMESTAMP WITH TIME ZONE DEFAULT now() NOT NULL,
       vt TIMESTAMP WITH TIME ZONE NOT NULL,
       message JSONB
-    ) PARTITION BY RANGE (%s);
+    ) PARTITION BY RANGE (%I);
     $QUERY$,
     queue_name, a_partition_col
   );
 
-  IF NOT pgmq._belongs_to_pgmq(FORMAT('a_%s', queue_name)) THEN
-      EXECUTE FORMAT('ALTER EXTENSION pgmq ADD TABLE pgmq.a_%s', queue_name);
+  IF NOT pgmq._belongs_to_pgmq(FORMAT('a_%I', queue_name)) THEN
+      EXECUTE FORMAT('ALTER EXTENSION pgmq ADD TABLE pgmq.a_%I', queue_name);
   END IF;
 
   EXECUTE FORMAT(
     $QUERY$
-    SELECT public.create_parent('pgmq.a_%s', '%s', 'native', '%s');
+    SELECT public.create_parent('pgmq.a_%I', '%I', 'native', '%I');
     $QUERY$,
     queue_name, a_partition_col, partition_interval
   );
@@ -774,18 +774,18 @@ BEGIN
     $QUERY$
     UPDATE public.part_config
     SET
-        retention = '%s',
+        retention = '%I',
         retention_keep_table = false,
         retention_keep_index = true,
         automatic_maintenance = 'on'
-    WHERE parent_table = 'pgmq.a_%s';
+    WHERE parent_table = 'pgmq.a_%I';
     $QUERY$,
     retention_interval, queue_name
   );
 
   EXECUTE FORMAT(
     $QUERY$
-    CREATE INDEX IF NOT EXISTS archived_at_idx_%s ON pgmq.a_%s (archived_at);
+    CREATE INDEX IF NOT EXISTS archived_at_idx_%I ON pgmq.a_%I (archived_at);
     $QUERY$,
     queue_name, queue_name
   );
@@ -820,7 +820,7 @@ BEGIN
     AND c.relkind = 'p';
 
   IF FOUND THEN
-    RAISE NOTICE 'Table %s is already partitioned', a_table_name;
+    RAISE NOTICE 'Table %I is already partitioned', a_table_name;
     RETURN;
   END IF;
 
@@ -831,7 +831,7 @@ BEGIN
     AND c.relkind = 'r';
 
   IF NOT FOUND THEN
-    RAISE NOTICE 'Table %s doesnot exists', a_table_name;
+    RAISE NOTICE 'Table %I doesnot exists', a_table_name;
     RETURN;
   END IF;