Use quoted column names in targetlist of subquery substituting modified table

Fix a bug introduced by 5b8b2f0, which built targetlist of subquery substituting
modified table. When a table has a column whose name includes a capital letter,
incremental view maintenance failed because crafted targetlist contains incorrect
column name which was parsed as lower case.

Isseu #124

.gitignore

@@ -1,30 +1,8 @@
-# Object files
-*.o
-
-# Coverage files
-*.gcno
-*.gcda
-
-# Libraries
-*.lib
-*.a
-
-# LLVM bitcode
+# Global excludes across all subdirectories
 *.bc
-
-# Shared objects (inc. Windows DLLs)
-*.dll
+*.o
 *.so
-*.so.*
-*.dylib
-
-# Executables
-*.exe
-*.app
-
-# Dependencies
-.deps
+regression.*
 
 # Generated subdirectories
 /results/
-/output_iso/

Makefile

@@ -18,8 +18,7 @@ DATA = pg_ivm--1.0.sql \
        pg_ivm--1.3--1.4.sql pg_ivm--1.4--1.5.sql pg_ivm--1.5--1.6.sql \
        pg_ivm--1.6--1.7.sql pg_ivm--1.7--1.8.sql pg_ivm--1.8--1.9.sql \
        pg_ivm--1.9--1.10.sql \
-       pg_ivm--1.10.sql \
-       pg_ivm--1.10--1.11.sql pg_ivm--1.11--1.12.sql
+	   pg_ivm--1.10.sql
 
 REGRESS = pg_ivm create_immv refresh_immv
 

README.md

@@ -2,7 +2,7 @@
 
 The `pg_ivm` module provides Incremental View Maintenance (IVM) feature for PostgreSQL.
 
-The extension is compatible with PostgreSQL 13, 14, 15, 16, 17, and 18.
+The extension is compatible with PostgreSQL 13, 14, 15, 16, and 17.
 
 ## Description
 
@@ -101,7 +101,7 @@ When `pg_ivm` is installed, the 'pgivm' schema is created, along with the follow
 
 Use `create_immv` function to create IMMV.
 ```
-pgivm.create_immv(immv_name text, view_definition text) RETURNS bigint
+pgivim.create_immv(immv_name text, view_definition text) RETURNS bigint
 ```
 `create_immv` defines a new IMMV of a query. A table of the name `immv_name` is created and a query specified by `view_definition` is executed and used to populate the IMMV. The query is stored in `pg_ivm_immv`, so that it can be refreshed later upon incremental view maintenance. `create_immv` returns the number of rows in the created IMMV.
 
@@ -120,7 +120,7 @@ pgivm.refresh_immv(immv_name text, with_data bool) RETURNS bigint
 
 `refresh_immv` completely replaces the contents of an IMMV as `REFRESH MATERIALIZED VIEW` command does for a materialized view. To execute this function you must be the owner of the IMMV (with PostgreSQL 16 or earlier) or have the `MAINTAIN` privilege on the IMMV (with PostgreSQL 17 or later).  The old contents are discarded.
 
-The with_data flag is corresponding to `WITH [NO] DATA` option of `REFRESH MATERIALIZED VIEW` command. If with_data is true, the backing query is executed to provide the new data, and if the IMMV is unpopulated, triggers for maintaining the view are created. Also, a unique index is created for IMMV if it is possible and the view doesn't have that yet. If with_data is false, no new data is generated and the IMMV become unpopulated, and the triggers are dropped from the IMMV. Note that unpopulated IMMV is still scannable although the result is empty. This behaviour may be changed in future to raise an error when an unpopulated IMMV is scanned.
+The with_data flag is corresponding to `WITH [NO] DATA` option of REFRESH MATERIALIZED VIEW` command. If with_data is true, the backing query is executed to provide the new data, and if the IMMV is unpopulated, triggers for maintaining the view are created. Also, a unique index is created for IMMV if it is possible and the view doesn't have that yet. If with_data is false, no new data is generated and the IMMV become unpopulated, and the triggers are dropped from the IMMV. Note that unpopulated IMMV is still scannable although the result is empty. This behaviour may be changed in future to raise an error when an unpopulated IMMV is scanned.
 
 `refresh_immv` acquires `AccessExclusiveLock` on the view. However, even if we are able to acquire the lock, a concurrent transaction may have already incrementally updated and committed the view before we can acquire the lock.  In `REPEATABLE READ` or `SERIALIZABLE` isolation level, this could lead to an inconsistent state of the view. Therefore, an error is raised to prevent anomalies when this situation is detected.
 
@@ -300,7 +300,7 @@ test=# SELECT immvrelid AS immv, pgivm.get_immv_def(immvrelid) AS immv_def FROM
 An IMMV can be dropped using the `DROP TABLE` command. Once an IMMV is dropped, its entry is automatically removed from the `pg_ivm_immv` catalog.
 
 ```sql
-test=# DROP TABLE immv
+test=# DROP TABLE immv;
 DROP TABLE
 
 test=# SELECT immvrelid AS immv, pgivm.get_immv_def(immvrelid) AS immv_def FROM pgivm.pg_ivm_immv;
@@ -316,27 +316,6 @@ test=# SELECT immvrelid AS immv, pgivm.get_immv_def(immvrelid) AS immv_def FROM
 (1 row)
 ```
 
-### Renaming an IMMV
-
-An IMMV can be renamed using the `ALTER TABLE` command.
-
-```sql
-test=# ALTER TABLE immv_agg RENAME TO immv_agg2;
-ALTER TABLE
-
-test=# SELECT immvrelid AS immv, pgivm.get_immv_def(immvrelid) AS immv_def FROM pgivm.pg_ivm_immv;
-   immv    |                  immv_def
------------+--------------------------------------------
- immv_agg2 |  SELECT pgbench_accounts.bid,             +
-           |     count(*) AS count,                    +
-           |     sum(pgbench_accounts.abalance) AS sum,+
-           |     avg(pgbench_accounts.abalance) AS avg +
-           |    FROM (pgbench_accounts                 +
-           |      JOIN pgbench_branches USING (bid))   +
-           |   GROUP BY pgbench_accounts.bid
-(1 row)
-```
-
 ## `pg_dump` and `pg_upgrade`
 
 After restoring data from a `pg_dump` backup or upgrading `PostgreSQL` using `pg_upgrade`, all IMMVs must be manually dropped and recreated.
@@ -418,7 +397,7 @@ Even if we are able to acquire a lock, a concurrent transaction may have already
 
 ### Row Level Security
 
-If some base tables have row level security policy, rows that are not visible to the materialized view's owner are excluded from the result.  In addition, such rows are excluded as well when views are incrementally maintained.  However, if a new policy is defined or policies are changed after the materialized view was created, the new policy will not be applied to the view contents.  To apply the new policy, you need to refresh or recreate the IMMV.
+If some base tables have row level security policy, rows that are not visible to the materialized view's owner are excluded from the result.  In addition, such rows are excluded as well when views are incrementally maintained.  However, if a new policy is defined or policies are changed after the materialized view was created, the new policy will not be applied to the view contents.  To apply the new policy, you need to recreate IMMV.
 
 ### How to Disable or Enable Immediate Maintenance
 

createas.c

@@ -101,11 +101,7 @@ create_immv_internal(List *attrList, IntoClause *into)
 	CreateStmt *create = makeNode(CreateStmt);
 	char		relkind;
 	Datum		toast_options;
-#if defined(PG_VERSION_NUM) && (PG_VERSION_NUM >= 180000)
-	const char *const validnsps[] = HEAP_RELOPT_NAMESPACES;
-#else
 	static char *validnsps[] = HEAP_RELOPT_NAMESPACES;
-#endif
 	ObjectAddress intoRelationAddr;
 
 	/* This code supports both CREATE TABLE AS and CREATE MATERIALIZED VIEW */
@@ -152,12 +148,7 @@ create_immv_internal(List *attrList, IntoClause *into)
 	NewRelationCreateToastTable(intoRelationAddr.objectId, toast_options);
 
 	/* Create the "view" part of an IMMV. */
-#if defined(PG_VERSION_NUM) && (PG_VERSION_NUM >= 180000)
-	StoreImmvQuery(intoRelationAddr.objectId, into->viewQuery);
-#else
 	StoreImmvQuery(intoRelationAddr.objectId, (Query *) into->viewQuery);
-#endif
-
 	CommandCounterIncrement();
 
 	return intoRelationAddr;
@@ -1523,18 +1514,10 @@ CreateIndexOnIMMV(Query *query, Relation matviewRel)
 
 		indexRel = index_open(indexoid, AccessShareLock);
 
-#if defined(PG_VERSION_NUM) && (PG_VERSION_NUM >= 180000)
-		if (CheckIndexCompatible(indexRel->rd_id,
-								index->accessMethod,
-								index->indexParams,
-								index->excludeOpNames,
-								false))
-#else
 		if (CheckIndexCompatible(indexRel->rd_id,
 								index->accessMethod,
 								index->indexParams,
 								index->excludeOpNames))
-#endif
 			hasCompatibleIndex = true;
 
 		index_close(indexRel, AccessShareLock);
@@ -1740,7 +1723,6 @@ StoreImmvQuery(Oid viewOid, Query *viewQuery)
 	values[Anum_pg_ivm_immv_immvrelid -1 ] = ObjectIdGetDatum(viewOid);
 	values[Anum_pg_ivm_immv_ispopulated -1 ] = BoolGetDatum(false);
 	values[Anum_pg_ivm_immv_viewdef -1 ] = CStringGetTextDatum(querytree);
-	isNulls[Anum_pg_ivm_immv_lastivmupdate -1 ] = true;
 
 	pgIvmImmv = table_open(PgIvmImmvRelationId(), RowExclusiveLock);
 

expected/pg_ivm.out

@@ -1395,8 +1395,6 @@ CREATE FUNCTION mytype_out(mytype)
  RETURNS cstring AS 'int4out'
  LANGUAGE INTERNAL STRICT IMMUTABLE;
 NOTICE:  argument type mytype is only a shell
-LINE 1: CREATE FUNCTION mytype_out(mytype)
-                                   ^
 CREATE TYPE mytype (
  LIKE = int4,
  INPUT = mytype_in,
@@ -1533,17 +1531,17 @@ ERROR:  VALUES is not supported on incrementally maintainable materialized view
 SELECT pgivm.create_immv('mv_ivm_only_values2',  'SELECT * FROM (values(1)) AS tmp');
 ERROR:  VALUES is not supported on incrementally maintainable materialized view
 -- views containing base tables with Row Level Security
-DROP USER IF EXISTS regress_ivm_admin;
-NOTICE:  role "regress_ivm_admin" does not exist, skipping
-DROP USER IF EXISTS regress_ivm_user;
-NOTICE:  role "regress_ivm_user" does not exist, skipping
-CREATE USER regress_ivm_admin;
-CREATE USER regress_ivm_user;
+DROP USER IF EXISTS ivm_admin;
+NOTICE:  role "ivm_admin" does not exist, skipping
+DROP USER IF EXISTS ivm_user;
+NOTICE:  role "ivm_user" does not exist, skipping
+CREATE USER ivm_admin;
+CREATE USER ivm_user;
 --- create a table with RLS
-SET SESSION AUTHORIZATION regress_ivm_admin;
+SET SESSION AUTHORIZATION ivm_admin;
 CREATE TABLE rls_tbl(id int, data text, owner name);
 INSERT INTO rls_tbl VALUES
-  (1,'foo','regress_ivm_user'),
+  (1,'foo','ivm_user'),
   (2,'bar','postgres');
 CREATE TABLE num_tbl(id int, num text);
 INSERT INTO num_tbl VALUES
@@ -1558,8 +1556,8 @@ CREATE POLICY rls_tbl_policy ON rls_tbl FOR SELECT TO PUBLIC USING(owner = curre
 ALTER TABLE rls_tbl ENABLE ROW LEVEL SECURITY;
 GRANT ALL on rls_tbl TO PUBLIC;
 GRANT ALL on num_tbl TO PUBLIC;
---- create a view owned by regress_ivm_user
-SET SESSION AUTHORIZATION regress_ivm_user;
+--- create a view owned by ivm_user
+SET SESSION AUTHORIZATION ivm_user;
 SELECT pgivm.create_immv('ivm_rls', 'SELECT * FROM rls_tbl');
 NOTICE:  could not create an index on immv "ivm_rls" automatically
 DETAIL:  This target list does not have all the primary key columns, or this view does not contain GROUP BY or DISTINCT clause.
@@ -1570,42 +1568,42 @@ HINT:  Create an index on the immv for efficient incremental maintenance.
 (1 row)
 
 SELECT id, data, owner FROM ivm_rls ORDER BY 1,2,3;
- id | data |      owner       
-----+------+------------------
-  1 | foo  | regress_ivm_user
+ id | data |  owner   
+----+------+----------
+  1 | foo  | ivm_user
 (1 row)
 
 RESET SESSION AUTHORIZATION;
 --- inserts rows owned by different users
 INSERT INTO rls_tbl VALUES
-  (3,'baz','regress_ivm_user'),
+  (3,'baz','ivm_user'),
   (4,'qux','postgres');
 SELECT id, data, owner FROM ivm_rls ORDER BY 1,2,3;
- id | data |      owner       
-----+------+------------------
-  1 | foo  | regress_ivm_user
-  3 | baz  | regress_ivm_user
+ id | data |  owner   
+----+------+----------
+  1 | foo  | ivm_user
+  3 | baz  | ivm_user
 (2 rows)
 
 --- combination of diffent kinds of commands
 WITH
- i AS (INSERT INTO rls_tbl VALUES(5,'quux','postgres'), (6,'corge','regress_ivm_user')),
+ i AS (INSERT INTO rls_tbl VALUES(5,'quux','postgres'), (6,'corge','ivm_user')),
  u AS (UPDATE rls_tbl SET owner = 'postgres' WHERE id = 1),
- u2 AS (UPDATE rls_tbl SET owner = 'regress_ivm_user' WHERE id = 2)
+ u2 AS (UPDATE rls_tbl SET owner = 'ivm_user' WHERE id = 2)
 SELECT;
 --
 (1 row)
 
 SELECT id, data, owner FROM ivm_rls ORDER BY 1,2,3;
- id | data  |      owner       
-----+-------+------------------
-  2 | bar   | regress_ivm_user
-  3 | baz   | regress_ivm_user
-  6 | corge | regress_ivm_user
+ id | data  |  owner   
+----+-------+----------
+  2 | bar   | ivm_user
+  3 | baz   | ivm_user
+  6 | corge | ivm_user
 (3 rows)
 
 ---
-SET SESSION AUTHORIZATION regress_ivm_user;
+SET SESSION AUTHORIZATION ivm_user;
 SELECT pgivm.create_immv('ivm_rls2', 'SELECT * FROM rls_tbl JOIN num_tbl USING(id)');
 NOTICE:  could not create an index on immv "ivm_rls2" automatically
 DETAIL:  This target list does not have all the primary key columns, or this view does not contain GROUP BY or DISTINCT clause.
@@ -1624,11 +1622,11 @@ SELECT;
 (1 row)
 
 SELECT * FROM ivm_rls2 ORDER BY 1,2,3;
- id | data  |      owner       |   num   
-----+-------+------------------+---------
-  2 | bar   | regress_ivm_user | two
-  3 | baz_2 | regress_ivm_user | three_2
-  6 | corge | regress_ivm_user | six
+ id | data  |  owner   |   num   
+----+-------+----------+---------
+  2 | bar   | ivm_user | two
+  3 | baz_2 | ivm_user | three_2
+  6 | corge | ivm_user | six
 (3 rows)
 
 DROP TABLE rls_tbl CASCADE;
@@ -1636,8 +1634,8 @@ NOTICE:  drop cascades to 2 other objects
 DETAIL:  drop cascades to table ivm_rls
 drop cascades to table ivm_rls2
 DROP TABLE num_tbl CASCADE;
-DROP USER regress_ivm_user;
-DROP USER regress_ivm_admin;
+DROP USER ivm_user;
+DROP USER ivm_admin;
 -- automatic index creation
 BEGIN;
 CREATE TABLE base_a (i int primary key, j int);

matview.c

@@ -617,11 +617,7 @@ refresh_immv_datafill(DestReceiver *dest, Query *query,
 	ExecutorStart(queryDesc, 0);
 
 	/* run the plan */
-#if PG_VERSION_NUM < 180000
 	ExecutorRun(queryDesc, ForwardScanDirection, 0, true);
-#else
-	ExecutorRun(queryDesc, ForwardScanDirection, 0);
-#endif
 
 	processed = queryDesc->estate->es_processed;
 

meson.build

@@ -1,101 +0,0 @@
-project('pg_ivm', ['c'])
-
-pg_config = find_program('pg_config')
-
-bindir = run_command(pg_config, '--bindir', check: true).stdout().strip()
-includedir_server = run_command(pg_config, '--includedir-server', check: true).stdout().strip()
-includedir = run_command(pg_config, '--includedir', check: true).stdout().strip()
-pkglibdir = run_command(pg_config, '--pkglibdir', check: true).stdout().strip()
-sharedir = run_command(pg_config, '--sharedir', check: true).stdout().strip()
-libdir = run_command(pg_config, '--libdir', check: true).stdout().strip()
-
-module_name = meson.project_name()
-
-# ruleutils.c includes ruleutils_13.c or ruleutils_14.c based on PostgreSQL version
-# Note: We don't need to explicitly add these files since they're included by ruleutils.c
-pg_ivm_sources = files(
-  'createas.c',
-  'matview.c',
-  'pg_ivm.c',
-  'ruleutils.c',
-  'subselect.c',
-)
-
-if meson.get_compiler('c').get_id() == 'msvc'
-  incdir = [includedir_server / 'port/win32_msvc',
-            includedir_server / 'port/win32',
-            includedir_server,
-            includedir]
-  postgres_lib = meson.get_compiler('c').find_library(
-                                           'postgres',
-                                            dirs: libdir,
-                                            static: true,
-                                            required: true
-                                         )
-else
-  incdir = [ includedir_server ]
-  postgres_lib = []
-endif
-
-shared_module(module_name,
-  pg_ivm_sources,
-  include_directories: incdir,
-  install: true,
-  install_dir: pkglibdir,
-  name_prefix: '',
-  dependencies: postgres_lib,
-)
-
-install_data(
-  'pg_ivm--1.0.sql',
-  'pg_ivm--1.0--1.1.sql',
-  'pg_ivm--1.1--1.2.sql',
-  'pg_ivm--1.2--1.3.sql',
-  'pg_ivm--1.3--1.4.sql',
-  'pg_ivm--1.4--1.5.sql',
-  'pg_ivm--1.5--1.6.sql',
-  'pg_ivm--1.6--1.7.sql',
-  'pg_ivm--1.7--1.8.sql', 
-  'pg_ivm--1.8--1.9.sql',
-  'pg_ivm--1.9--1.10.sql',
-  'pg_ivm--1.10.sql',
-  'pg_ivm--1.10--1.11.sql',
-  'pg_ivm--1.11--1.12.sql',
-  'pg_ivm.control',
-  install_dir: sharedir / 'extension',
-) 
-
-pg_regress = find_program('pg_regress',
-  dirs: [pkglibdir / 'pgxs/src/test/regress']
-)
-
-regress_tests = ['pg_ivm', 'create_immv', 'refresh_immv']
-
-test('regress',
- pg_regress,
- args: ['--bindir', bindir,
-        '--inputdir', meson.current_source_dir(),
-       ] + regress_tests,
-)
-
-pg_isolation_regress = find_program('pg_isolation_regress',
-  dirs: [pkglibdir / 'pgxs/src/test/isolation']
-)
-
-isolation_tests = [
- 'create_insert', 'refresh_insert', 'insert_insert',
- 'create_insert2', 'refresh_insert2', 'insert_insert2',
- 'create_insert3', 'refresh_insert3', 'insert_insert3'
-]
-
-isolation_opts = [
-  '--load-extension','pg_ivm',
-]
-
-test('isolation',
- pg_isolation_regress,
- args: ['--bindir', bindir,
-        '--inputdir', meson.current_source_dir(),
-        '--outputdir', 'output_iso',
-       ] + isolation_opts + isolation_tests,
-)

pg_ivm.c

@@ -224,14 +224,10 @@ create_immv(PG_FUNCTION_ARGS)
 	ctas->into->options = NIL;
 	ctas->into->onCommit = ONCOMMIT_NOOP;
 	ctas->into->tableSpaceName = NULL;
-#if defined(PG_VERSION_NUM) && (PG_VERSION_NUM >= 180000)
-	ctas->into->viewQuery = (Query *) parsetree->stmt;
-#else
 	ctas->into->viewQuery = parsetree->stmt;
-#endif
 	ctas->into->skipData = false;
 
-	query = transformStmt(pstate, (Node *) ctas);
+	query = transformStmt(pstate, (Node *)ctas);
 	Assert(query->commandType == CMD_UTILITY && IsA(query->utilityStmt, CreateTableAsStmt));
 
 	ExecCreateImmv(pstate, (CreateTableAsStmt *) query->utilityStmt, &qc);

pg_ivm.control

@@ -1,6 +1,6 @@
-# incremental view maintenance extension
+# incremental view maintenance extension_
 comment = 'incremental view maintenance on PostgreSQL'
-default_version = '1.12'
+default_version = '1.10'
 module_pathname = '$libdir/pg_ivm'
 relocatable = false 
 schema = pg_catalog

pg_ivm.h

@@ -52,10 +52,10 @@ extern ObjectAddress ExecRefreshImmv(const RangeVar *relation, bool skipData,
 extern ObjectAddress RefreshImmvByOid(Oid matviewOid, bool is_create, bool skipData,
 									  const char *queryString, QueryCompletion *qc);
 extern bool ImmvIncrementalMaintenanceIsEnabled(void);
-extern PGDLLEXPORT Datum IVM_immediate_before(PG_FUNCTION_ARGS);
-extern PGDLLEXPORT Datum IVM_immediate_maintenance(PG_FUNCTION_ARGS);
+extern Datum IVM_immediate_before(PG_FUNCTION_ARGS);
+extern Datum IVM_immediate_maintenance(PG_FUNCTION_ARGS);
 extern Query* rewrite_query_for_exists_subquery(Query *query);
-extern PGDLLEXPORT Datum ivm_visible_in_prestate(PG_FUNCTION_ARGS);
+extern Datum ivm_visible_in_prestate(PG_FUNCTION_ARGS);
 extern void AtAbort_IVM(SubTransactionId subtxid);
 extern void AtPreCommit_IVM(void);
 extern char *getColumnNameStartWith(RangeTblEntry *rte, char *str, int *attnum);

rpm/pg_ivm.spec

@@ -1,6 +1,6 @@
 # How to build RPM:
 #
-#   rpmbuild -bb pg_ivm.spec --define "pgmajorversion 18" --define "pginstdir /usr/pgsql-18"
+#   rpmbuild -bb pg_ivm.spec --define "pgmajorversion 17" --define "pginstdir /usr/pgsql-17"
 
 %global sname pg_ivm
 
@@ -8,11 +8,11 @@
 %global llvm  1
 %endif
 
-Summary:	Incremental View Maintenance (IVM) feature for PostgreSQL.
+Summary:	PostgreSQL-based distributed RDBMS
 Name:		%{sname}_%{pgmajorversion}
-Version:	1.12
+Version:	1.10
 Release:	1%{dist}
-License:    PostgreSQL
+License:    BSD
 Vendor:     IVM Development Group
 URL:		https://github.com/sraoss/%{sname}
 Source0:	https://github.com/sraoss/%{sname}/archive/v%{version}.tar.gz
@@ -55,11 +55,7 @@ PATH=%{pginstdir}/bin:$PATH %{__make} %{?_smp_mflags} INSTALL_PREFIX=%{buildroot
 %endif
 
 %changelog
-* Mon Sep 4 2025 - Yugo Nagata <nagata@sraoss.co.jp> 1.12-1
-- Update to 1.12
-* Mon May 25 2025 - Yugo Nagata <nagata@sraoss.co.jp> 1.11-1
-- Update to 1.11
-* Tue Mar 11 2025 - Yugo Nagata <nagata@sraoss.co.jp> 1.10-1
+* xxxxx - Yugo Nagata <nagata@sraoss.co.jp> 1.10-1
 - Update to 1.10
 * Fri Jul 31 2024 - Yugo Nagata <nagata@sraoss.co.jp> 1.9-1
 - Update to 1.9

sql/pg_ivm.sql

@@ -596,16 +596,16 @@ SELECT pgivm.create_immv('mv_ivm_only_values2',  'SELECT * FROM (values(1)) AS t
 
 
 -- views containing base tables with Row Level Security
-DROP USER IF EXISTS regress_ivm_admin;
-DROP USER IF EXISTS regress_ivm_user;
-CREATE USER regress_ivm_admin;
-CREATE USER regress_ivm_user;
+DROP USER IF EXISTS ivm_admin;
+DROP USER IF EXISTS ivm_user;
+CREATE USER ivm_admin;
+CREATE USER ivm_user;
 
 --- create a table with RLS
-SET SESSION AUTHORIZATION regress_ivm_admin;
+SET SESSION AUTHORIZATION ivm_admin;
 CREATE TABLE rls_tbl(id int, data text, owner name);
 INSERT INTO rls_tbl VALUES
-  (1,'foo','regress_ivm_user'),
+  (1,'foo','ivm_user'),
   (2,'bar','postgres');
 CREATE TABLE num_tbl(id int, num text);
 INSERT INTO num_tbl VALUES
@@ -622,28 +622,28 @@ ALTER TABLE rls_tbl ENABLE ROW LEVEL SECURITY;
 GRANT ALL on rls_tbl TO PUBLIC;
 GRANT ALL on num_tbl TO PUBLIC;
 
---- create a view owned by regress_ivm_user
-SET SESSION AUTHORIZATION regress_ivm_user;
+--- create a view owned by ivm_user
+SET SESSION AUTHORIZATION ivm_user;
 SELECT pgivm.create_immv('ivm_rls', 'SELECT * FROM rls_tbl');
 SELECT id, data, owner FROM ivm_rls ORDER BY 1,2,3;
 RESET SESSION AUTHORIZATION;
 
 --- inserts rows owned by different users
 INSERT INTO rls_tbl VALUES
-  (3,'baz','regress_ivm_user'),
+  (3,'baz','ivm_user'),
   (4,'qux','postgres');
 SELECT id, data, owner FROM ivm_rls ORDER BY 1,2,3;
 
 --- combination of diffent kinds of commands
 WITH
- i AS (INSERT INTO rls_tbl VALUES(5,'quux','postgres'), (6,'corge','regress_ivm_user')),
+ i AS (INSERT INTO rls_tbl VALUES(5,'quux','postgres'), (6,'corge','ivm_user')),
  u AS (UPDATE rls_tbl SET owner = 'postgres' WHERE id = 1),
- u2 AS (UPDATE rls_tbl SET owner = 'regress_ivm_user' WHERE id = 2)
+ u2 AS (UPDATE rls_tbl SET owner = 'ivm_user' WHERE id = 2)
 SELECT;
 SELECT id, data, owner FROM ivm_rls ORDER BY 1,2,3;
 
 ---
-SET SESSION AUTHORIZATION regress_ivm_user;
+SET SESSION AUTHORIZATION ivm_user;
 SELECT pgivm.create_immv('ivm_rls2', 'SELECT * FROM rls_tbl JOIN num_tbl USING(id)');
 RESET SESSION AUTHORIZATION;
 
@@ -656,8 +656,8 @@ SELECT * FROM ivm_rls2 ORDER BY 1,2,3;
 DROP TABLE rls_tbl CASCADE;
 DROP TABLE num_tbl CASCADE;
 
-DROP USER regress_ivm_user;
-DROP USER regress_ivm_admin;
+DROP USER ivm_user;
+DROP USER ivm_admin;
 
 -- automatic index creation
 BEGIN;