Prepare a new empty upgrade script and adjust the regression test env…

…ironment for the new version. Add PG15 to the versions covered by E-Maj upgrade tests.
dalibo · Nov 12, 2022 · df60cb1 · df60cb1
1 parent 3220274
commit df60cb1
Show file tree

Hide file tree

Showing 21 changed files with 531 additions and 295 deletions.
diff --git a/sql/emaj--4.1.0--devel.sql b/sql/emaj--4.1.0--devel.sql
@@ -94,7 +94,13 @@ SELECT emaj._disable_event_triggers();
 
 
 --<begin_functions>                              pattern used by the tool that extracts and insert the functions definition
+------------------------------------------------------------------
+-- drop obsolete functions or functions with modified interface --
+------------------------------------------------------------------
 
+------------------------------------------------------------------
+-- create new or modified functions                             --
+------------------------------------------------------------------
 --<end_functions>                                pattern used by the tool that extracts and insert the functions definition
 ------------------------------------------
 --                                      --

diff --git a/test/10/expected/after_upg_while_logging.out b/test/10/expected/after_upg_while_logging.out
@@ -363,7 +363,7 @@ select hist_function, hist_event, hist_object,
   order by hist_id;
       hist_function       |     hist_event     |                            hist_object                            |                                        regexp_replace                                         | hist_user 
 --------------------------+--------------------+-------------------------------------------------------------------+-----------------------------------------------------------------------------------------------+-----------
- EMAJ_INSTALL             |                    | E-Maj 4.0.1                                                       | Initialisation completed                                                                      | postgres
+ EMAJ_INSTALL             |                    | E-Maj 4.1.0                                                       | Initialisation completed                                                                      | postgres
  CREATE_GROUP             | BEGIN              | myGroup1                                                          | rollbackable                                                                                  | postgres
  CREATE_GROUP             | END                | myGroup1                                                          |                                                                                               | postgres
  CREATE_GROUP             | BEGIN              | myGroup2                                                          | rollbackable                                                                                  | postgres
@@ -539,8 +539,8 @@ select hist_function, hist_event, hist_object,
  SET_MARK_GROUP           | BEGIN              | myGroup6                                                          | STOP_%                                                                                        | postgres
  SET_MARK_GROUP           | END                | myGroup6                                                          | STOP_%                                                                                        | postgres
  STOP_GROUP               | END                | myGroup6                                                          | 3 tables/sequences processed                                                                  | postgres
- EMAJ_INSTALL             | BEGIN              | E-Maj <devel>                                                     | Upgrade from 4.0.1 started                                                                    | postgres
- EMAJ_INSTALL             | END                | E-Maj <devel>                                                     | Upgrade from 4.0.1 completed                                                                  | postgres
+ EMAJ_INSTALL             | BEGIN              | E-Maj <devel>                                                     | Upgrade from 4.1.0 started                                                                    | postgres
+ EMAJ_INSTALL             | END                | E-Maj <devel>                                                     | Upgrade from 4.1.0 completed                                                                  | postgres
  UNPROTECT_GROUP          |                    | myGroup1                                                          | Status 1                                                                                      | postgres
  ROLLBACK_GROUPS          | BEGIN              | myGroup1,myGroup2                                                 | Unlogged rollback to mark Common (timestamp)                                                  | postgres
  DBLINK_OPEN_CNX          |                    | rlbk#1                                                            | Status = -5                                                                                   | postgres

diff --git a/test/10/expected/install_previous.out b/test/10/expected/install_previous.out
@@ -13,28 +13,28 @@ SET default_tablespace TO tspemaj;
 ------------------------------------------------------------
 -- emaj installation in its previous version as an extension
 ------------------------------------------------------------
-CREATE EXTENSION emaj VERSION '4.0.1';
+CREATE EXTENSION emaj VERSION '4.1.0';
 ------------------------------------------------------------
 -- check installation
 ------------------------------------------------------------
 -- check impact in catalog
 select extname, extversion from pg_extension where extname = 'emaj';
  extname | extversion 
 ---------+------------
- emaj    | 4.0.1
+ emaj    | 4.1.0
 (1 row)
 
 -- check the emaj_param content
 SELECT param_value_text FROM emaj.emaj_param WHERE param_key = 'emaj_version';
  param_value_text 
 ------------------
- 4.0.1
+ 4.1.0
 (1 row)
 
 -- check history
 select hist_id, hist_function, hist_event, hist_object, hist_wording, hist_user from emaj.emaj_hist order by hist_id;
  hist_id | hist_function | hist_event | hist_object |       hist_wording       | hist_user 
 ---------+---------------+------------+-------------+--------------------------+-----------
-       1 | EMAJ_INSTALL  |            | E-Maj 4.0.1 | Initialisation completed | postgres
+       1 | EMAJ_INSTALL  |            | E-Maj 4.1.0 | Initialisation completed | postgres
 (1 row)