Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Create a new emaj development environment without version number. Ada…

…pt the E-Maj components accordingly.
  • Loading branch information...
commit c61b38422a84a65e0b1a5c6a542086e15f18ec70 1 parent 1247c85
@beaud76 authored
Showing with 5,000 additions and 187 deletions.
  1. +7 −1 CHANGES
  2. +3 −3 META.json
  3. +5 −5 README
  4. +1 −1  php/emajParallelRollback.php
  5. +1 −1  sql/demo.sql
  6. +3 −3 sql/{emaj--0.12.0.sql → emaj--next_version.sql}
  7. +4,698 −0 sql/emaj-0.11.1-to-1.0.0.sql
  8. +3 −0  sql/emaj-1.0.0-to-next.sql
  9. +3 −3 sql/emaj.sql
  10. +3 −3 sql/emaj_src.sql
  11. +1 −1  sql/prep-pr.sql
  12. +1 −1  sql/uninstall.sql
  13. +21 −21 tar.index
  14. +7 −7 test/82/expected/instPsql.out
  15. +10 −10 test/82/expected/instPsqlMig.out
  16. +1 −1  test/82/expected/instPsqlPrev.out
  17. +1 −1  test/82/expected/prlb1.out
  18. +1 −1  test/82/expected/prlb2.out
  19. +7 −7 test/83/expected/instPsql.out
  20. +10 −10 test/83/expected/instPsqlMig.out
  21. +1 −1  test/83/expected/instPsqlPrev.out
  22. +1 −1  test/83/expected/prlb1.out
  23. +1 −1  test/83/expected/prlb2.out
  24. +7 −7 test/84/expected/instPsql.out
  25. +10 −10 test/84/expected/instPsqlMig.out
  26. +1 −1  test/84/expected/instPsqlPrev.out
  27. +1 −1  test/84/expected/prlb1.out
  28. +1 −1  test/84/expected/prlb2.out
  29. +7 −7 test/90/expected/instPsql.out
  30. +10 −10 test/90/expected/instPsqlMig.out
  31. +1 −1  test/90/expected/instPsqlPrev.out
  32. +1 −1  test/90/expected/migPsqlLoggingGroup.out
  33. +1 −1  test/90/expected/prlb1.out
  34. +1 −1  test/90/expected/prlb2.out
  35. +7 −7 test/91/expected/instPsql.out
  36. +10 −10 test/91/expected/instPsqlMig.out
  37. +1 −1  test/91/expected/instPsqlPrev.out
  38. +1 −1  test/91/expected/migPsqlLoggingGroup.out
  39. +1 −1  test/91/expected/prlb1.out
  40. +1 −1  test/91/expected/prlb2.out
  41. +7 −7 test/92/expected/instPsql.out
  42. +10 −10 test/92/expected/instPsqlMig.out
  43. +1 −1  test/92/expected/instPsqlPrev.out
  44. +1 −1  test/92/expected/migPsqlLoggingGroup.out
  45. +1 −1  test/92/expected/prlb1.out
  46. +1 −1  test/92/expected/prlb2.out
  47. +1 −1  test/emaj_sched_ext
  48. +1 −1  test/emaj_sched_ext_mig
  49. +2 −2 test/emaj_sched_ext_mx_mig
  50. +1 −1  test/emaj_sched_psql
  51. +1 −1  test/emaj_sched_psql_mig
  52. +2 −2 test/emaj_sched_psql_mx_mig
  53. +2 −2 test/sql/instPsqlMig.sql
  54. +1 −1  test/sql/instPsqlPrev.sql
  55. +1 −1  test/sql/migPsqlLoggingGroup.sql
  56. +0 −1  test/sql/sql
  57. +108 −0 tools/create_version.sh
  58. +2 −3 tools/gen_emaj.pl
  59. +5 −5 tools/regress.sh
View
8 CHANGES
@@ -1,6 +1,12 @@
E-Maj - Release notes
---------------------
-0.12.0
+<NEXT_VERSION>
+------
+Enhancements:
+
+Bug fixes:
+
+1.0.0
------
Enhancements:
- to help managing databases having a large number of tables, it is now
View
6 META.json
@@ -1,15 +1,15 @@
{
"name": "E-Maj",
"abstract": "E-Maj provides a set of functions to 1) log updates performed on groups of tables and 2) rollback these updates if needed",
- "version": "0.12.0",
+ "version": "<NEXT_VERSION>",
"maintainer": "Philippe Beaudoin - phb<dot>emaj<at>free<dot>fr",
"license": "gpl_2",
"tags": [ "emaj", "table log", "log trigger", "archive before journal", "logical rollback", "flashback" ],
"provides": {
"emaj": {
"file": "sql/emaj.sql",
- "docfile": "doc/emaj.0.12.0_doc_en.pdf",
- "version": "0.12.0",
+ "docfile": "doc/emaj.<NEXT_VERSION>_doc_en.pdf",
+ "version": "<NEXT_VERSION>",
"abstract": "Tables updates log and rollback"
}
},
View
10 README
@@ -3,7 +3,7 @@ README
E-Maj: logs and rollbacks table updates
-Version: 0.12.0
+Version: <NEXT_VERSION>
1- License
@@ -50,10 +50,10 @@ In both environments, being able to examine the history of updates performed on
- sql/demo.sql demonstration psql script
- sql/prep-pr.sql psql script to prepare parallel rollback demonstration
-- doc/emaj.0.12.0_doc_en.pdf E-Maj user's guide in English
-- doc/emaj.0.12.0_doc_fr.pdf E-Maj user's guide in French
-- doc/emaj.0.12.0_pres_en.pdf E-Maj presentation in English
-- doc/emaj.0.12.0_pres_fr.pdf E-Maj presentation in French
+- doc/emaj.<NEXT_VERSION>_doc_en.pdf E-Maj user's guide in English
+- doc/emaj.<NEXT_VERSION>_doc_fr.pdf E-Maj user's guide in French
+- doc/emaj.<NEXT_VERSION>_pres_en.pdf E-Maj presentation in English
+- doc/emaj.<NEXT_VERSION>_pres_fr.pdf E-Maj presentation in French
- php/emajParallelRollback.php external client for parallel rollback
View
2  php/emajParallelRollback.php
@@ -9,7 +9,7 @@
// Users must supply the name of the E-Maj group and the number of parallel connections/sessions to use.
// The tables to process are then affected to sessions.
- $EmajVersion='0.12.0';
+ $EmajVersion='<NEXT_VERSION>';
$progName='emajParallelRollback';
// Just asking for help
View
2  sql/demo.sql
@@ -1,4 +1,4 @@
--- demo.sql : V 0.12.0
+-- demo.sql : Version <NEXT_VERSION>
--
-- This test script must be executed with a superuser role.
-- E-Maj extension must have been previously installed.
View
6 sql/emaj--0.12.0.sql → sql/emaj--next_version.sql
@@ -1,5 +1,5 @@
--
--- E-Maj : logs and rollbacks table updates : V 0.12.0
+-- E-Maj : logs and rollbacks table updates : Version <NEXT_VERSION>
--
-- This software is distributed under the GNU General Public License.
--
@@ -304,7 +304,7 @@ $$Represents the structure of rows returned by the internal _verify_groups() fun
-- 'Fixed' parameters --
-- --
------------------------------------
-INSERT INTO emaj.emaj_param (param_key, param_value_text) VALUES ('emaj_version','0.12.0');
+INSERT INTO emaj.emaj_param (param_key, param_value_text) VALUES ('emaj_version','<NEXT_VERSION>');
-- Other parameters are optional. They are set by users if needed.
@@ -5286,7 +5286,7 @@ SELECT pg_catalog.pg_extension_config_dump('emaj_fk','');
SELECT pg_catalog.pg_extension_config_dump('emaj_rlbk_stat','');
-- and insert the init record in the operation history
-INSERT INTO emaj.emaj_hist (hist_function, hist_object, hist_wording) VALUES ('EMAJ_INSTALL','E-Maj 0.12.0', 'Initialisation completed');
+INSERT INTO emaj.emaj_hist (hist_function, hist_object, hist_wording) VALUES ('EMAJ_INSTALL','E-Maj <NEXT_VERSION>', 'Initialisation completed');
-- check the current max_prepared_transactions setting and report a warning if its value is too low for parallel rollback
DO LANGUAGE plpgsql
View
4,698 sql/emaj-0.11.1-to-1.0.0.sql
4,698 additions, 0 deletions not shown
View
3  sql/emaj-1.0.0-to-next.sql
@@ -0,0 +1,3 @@
+--
+-- E-Maj: migration from 1.0.0 to <NEXT_VERSION>
+--
View
6 sql/emaj.sql
@@ -1,5 +1,5 @@
--
--- E-Maj : logs and rollbacks table updates : V 0.12.0
+-- E-Maj : logs and rollbacks table updates : Version <NEXT_VERSION>
--
-- This software is distributed under the GNU General Public License.
--
@@ -380,7 +380,7 @@ $$Represents the structure of rows returned by the internal _verify_groups() fun
-- 'Fixed' parameters --
-- --
------------------------------------
-INSERT INTO emaj.emaj_param (param_key, param_value_text) VALUES ('emaj_version','0.12.0');
+INSERT INTO emaj.emaj_param (param_key, param_value_text) VALUES ('emaj_version','<NEXT_VERSION>');
-- Other parameters are optional. They are set by users if needed.
@@ -5345,7 +5345,7 @@ GRANT EXECUTE ON FUNCTION pg_catalog.pg_database_size(name) TO emaj_adm, emaj_vi
GRANT EXECUTE ON FUNCTION pg_catalog.pg_size_pretty(bigint) TO emaj_adm, emaj_viewer;
-- and insert the init record in the operation history
-INSERT INTO emaj.emaj_hist (hist_function, hist_object, hist_wording) VALUES ('EMAJ_INSTALL','E-Maj 0.12.0', 'Initialisation completed');
+INSERT INTO emaj.emaj_hist (hist_function, hist_object, hist_wording) VALUES ('EMAJ_INSTALL','E-Maj <NEXT_VERSION>', 'Initialisation completed');
-- check the current max_prepared_transactions setting and report a warning if its value is too low for parallel rollback
CREATE OR REPLACE FUNCTION emaj._tmp_check_setting()
View
6 sql/emaj_src.sql
@@ -7,7 +7,7 @@ This file must be processed by tools/gen_emaj.pl perl script to get both usable
#gen_psql_start#
#gen_extension_start#
--
--- E-Maj : logs and rollbacks table updates : V 0.12.0
+-- E-Maj : logs and rollbacks table updates : Version <NEXT_VERSION>
--
-- This software is distributed under the GNU General Public License.
--
@@ -402,7 +402,7 @@ $$Represents the structure of rows returned by the internal _verify_groups() fun
-- 'Fixed' parameters --
-- --
------------------------------------
-INSERT INTO emaj.emaj_param (param_key, param_value_text) VALUES ('emaj_version','0.12.0');
+INSERT INTO emaj.emaj_param (param_key, param_value_text) VALUES ('emaj_version','<NEXT_VERSION>');
-- Other parameters are optional. They are set by users if needed.
@@ -5386,7 +5386,7 @@ SELECT pg_catalog.pg_extension_config_dump('emaj_rlbk_stat','');
#gen_psql_start#
-- and insert the init record in the operation history
-INSERT INTO emaj.emaj_hist (hist_function, hist_object, hist_wording) VALUES ('EMAJ_INSTALL','E-Maj 0.12.0', 'Initialisation completed');
+INSERT INTO emaj.emaj_hist (hist_function, hist_object, hist_wording) VALUES ('EMAJ_INSTALL','E-Maj <NEXT_VERSION>', 'Initialisation completed');
-- check the current max_prepared_transactions setting and report a warning if its value is too low for parallel rollback
#gen_extension_stop#
View
2  sql/prep-pr.sql
@@ -1,4 +1,4 @@
--- prep-pr.sql : V 0.12.0
+-- prep-pr.sql : Version <NEXT_VERSION>
--
-- This script prepares an application and E-Maj context to test parallel rollback
-- using emajParallelRollback PHP module. It must be executed with a superuser role.
View
2  sql/uninstall.sql
@@ -1,5 +1,5 @@
--
--- E-MAJ uninstall script : V 0.12.0
+-- E-MAJ uninstall script : Version <NEXT_VERSION>
--
-- This software is distributed under the GNU General Public License.
--
View
42 tar.index
@@ -1,21 +1,21 @@
-emaj-0.11.1/README
-emaj-0.11.1/CHANGES
-emaj-0.11.1/LICENSE
-emaj-0.11.1/AUTHORS
-emaj-0.11.1/META.json
-emaj-0.11.1/sql/emaj.sql
-emaj-0.11.1/sql/emaj-0.11.1-to-0.12.0.sql
-emaj-0.11.1/sql/emaj-0.11.0-to-0.11.1.sql
-emaj-0.11.1/sql/emaj-0.10.1-to-0.11.0.sql
-emaj-0.11.1/sql/check-0.10.1-to-0.11.0-conditions.sql
-emaj-0.11.1/sql/emaj-0.10.0-to-0.10.1.sql
-emaj-0.11.1/sql/emaj--0.10.0--unpackaged.sql
-emaj-0.11.1/sql/emaj--0.10.1--unpackaged.sql
-emaj-0.11.1/sql/demo.sql
-emaj-0.11.1/sql/prep-pr.sql
-emaj-0.11.1/sql/uninstall.sql
-emaj-0.11.1/doc/Emaj.0.12.0_doc_en.pdf
-emaj-0.11.1/doc/Emaj.0.12.0_doc_fr.pdf
-emaj-0.11.1/doc/Emaj.0.12.0_pres_en.pdf
-emaj-0.11.1/doc/Emaj.0.12.0_pres_fr.pdf
-emaj-0.11.1/php/emajParallelRollback.php
+emaj-1.0.0/README
+emaj-1.0.0/CHANGES
+emaj-1.0.0/LICENSE
+emaj-1.0.0/AUTHORS
+emaj-1.0.0/META.json
+emaj-1.0.0/sql/emaj.sql
+emaj-1.0.0/sql/emaj-0.11.1-to-1.0.0.sql
+emaj-1.0.0/sql/emaj-0.11.0-to-0.11.1.sql
+emaj-1.0.0/sql/emaj-0.10.1-to-0.11.0.sql
+emaj-1.0.0/sql/check-0.10.1-to-0.11.0-conditions.sql
+emaj-1.0.0/sql/emaj-0.10.0-to-0.10.1.sql
+emaj-1.0.0/sql/emaj--0.10.0--unpackaged.sql
+emaj-1.0.0/sql/emaj--0.10.1--unpackaged.sql
+emaj-1.0.0/sql/demo.sql
+emaj-1.0.0/sql/prep-pr.sql
+emaj-1.0.0/sql/uninstall.sql
+emaj-1.0.0/doc/Emaj.1.0.0_doc_en.pdf
+emaj-1.0.0/doc/Emaj.1.0.0_doc_fr.pdf
+emaj-1.0.0/doc/Emaj.1.0.0_pres_en.pdf
+emaj-1.0.0/doc/Emaj.1.0.0_pres_fr.pdf
+emaj-1.0.0/php/emajParallelRollback.php
View
14 test/82/expected/instPsql.out
@@ -32,7 +32,7 @@ DROP FUNCTION public.emaj_tmp();
-----------------------------
\i sql/emaj.sql
--
--- E-Maj : logs and rollbacks table updates : V 0.12.0
+-- E-Maj : logs and rollbacks table updates : Version <NEXT_VERSION>
--
-- This software is distributed under the GNU General Public License.
--
@@ -397,7 +397,7 @@ $$Represents the structure of rows returned by the internal _verify_groups() fun
-- 'Fixed' parameters --
-- --
------------------------------------
-INSERT INTO emaj.emaj_param (param_key, param_value_text) VALUES ('emaj_version','0.12.0');
+INSERT INTO emaj.emaj_param (param_key, param_value_text) VALUES ('emaj_version','<NEXT_VERSION>');
-- Other parameters are optional. They are set by users if needed.
-- The history_retention parameter defines the time interval when a row remains in the emaj history table - default is 1 month
-- INSERT INTO emaj.emaj_param (param_key, param_value_interval) VALUES ('history_retention','1 month'::interval);
@@ -5265,7 +5265,7 @@ GRANT EXECUTE ON FUNCTION emaj.emaj_verify_all() TO emaj_viewer;
GRANT EXECUTE ON FUNCTION pg_catalog.pg_database_size(name) TO emaj_adm, emaj_viewer;
GRANT EXECUTE ON FUNCTION pg_catalog.pg_size_pretty(bigint) TO emaj_adm, emaj_viewer;
-- and insert the init record in the operation history
-INSERT INTO emaj.emaj_hist (hist_function, hist_object, hist_wording) VALUES ('EMAJ_INSTALL','E-Maj 0.12.0', 'Initialisation completed');
+INSERT INTO emaj.emaj_hist (hist_function, hist_object, hist_wording) VALUES ('EMAJ_INSTALL','E-Maj <NEXT_VERSION>', 'Initialisation completed');
-- check the current max_prepared_transactions setting and report a warning if its value is too low for parallel rollback
CREATE OR REPLACE FUNCTION emaj._tmp_check_setting()
RETURNS VOID LANGUAGE plpgsql AS
@@ -5298,15 +5298,15 @@ SET client_min_messages TO default;
SELECT param_value_text FROM emaj.emaj_param WHERE param_key = 'emaj_version';
param_value_text
------------------
- 0.12.0
+ <NEXT_VERSION>
(1 row)
-- check history
select hist_id, hist_function, hist_event, hist_object, regexp_replace(regexp_replace(hist_wording,E'\\d\\d\.\\d\\d\\.\\d\\d\\.\\d\\d\\d','%','g'),E'\\[.+\\]','(timestamp)','g'), hist_user from
(select * from emaj.emaj_hist order by hist_id) as t;
- hist_id | hist_function | hist_event | hist_object | regexp_replace | hist_user
----------+---------------+------------+--------------+--------------------------+-----------
- 1 | EMAJ_INSTALL | | E-Maj 0.12.0 | Initialisation completed | postgres
+ hist_id | hist_function | hist_event | hist_object | regexp_replace | hist_user
+---------+---------------+------------+----------------------+--------------------------+-----------
+ 1 | EMAJ_INSTALL | | E-Maj <NEXT_VERSION> | Initialisation completed | postgres
(1 row)
-- check table list
View
20 test/82/expected/instPsqlMig.out
@@ -1,4 +1,4 @@
--- instPsqlMig.sql: Migrate from E-Maj 0.11.1 to 0.12.0 while groups are not yet created.
+-- instPsqlMig.sql: Migrate from previous to next E-Maj vesrion while groups are not yet created.
-- Install E-Maj as simple psql script (mandatory for postgres version prior 9.1)
--
------------------------------------------------------------
@@ -10,9 +10,9 @@
-----------------------------
-- migrate to the target version
-----------------------------
-\i ../../sql/emaj-0.11.1-to-0.12.0.sql
+\i ../../sql/emaj-0.11.1-to-next.sql
--
--- E-Maj: migration from 0.11.1 to 0.12.0
+-- E-Maj: migration from 0.11.1 to <NEXT_VERSION>
--
-- This software is distributed under the GNU General Public License.
--
@@ -23,8 +23,8 @@
\set QUIET ON
SET client_min_messages TO WARNING;
--SET client_min_messages TO NOTICE;
-\echo 'E-maj upgrade from version 0.11.1 to version 0.12.0'
-E-maj upgrade from version 0.11.1 to version 0.12.0
+\echo 'E-maj upgrade from version 0.11.1 to version <NEXT_VERSION>'
+E-maj upgrade from version 0.11.1 to version <NEXT_VERSION>
\echo 'Checking...'
Checking...
------------------------------------
@@ -4623,13 +4623,13 @@ DROP FUNCTION emaj.tmp();
-- commit migration --
-- --
------------------------------------
-UPDATE emaj.emaj_param SET param_value_text = '0.12.0' WHERE param_key = 'emaj_version';
+UPDATE emaj.emaj_param SET param_value_text = '<NEXT_VERSION>' WHERE param_key = 'emaj_version';
-- and insert the init record in the operation history
-INSERT INTO emaj.emaj_hist (hist_function, hist_object, hist_wording) VALUES ('EMAJ_INSTALL','E-Maj 0.12.0', 'Migration from 0.11.1 completed');
+INSERT INTO emaj.emaj_hist (hist_function, hist_object, hist_wording) VALUES ('EMAJ_INSTALL','E-Maj <NEXT_VERSION>', 'Migration from 0.11.1 completed');
COMMIT;
SET client_min_messages TO default;
-\echo '>>> E-Maj successfully migrated to 0.12.0'
->>> E-Maj successfully migrated to 0.12.0
+\echo '>>> E-Maj successfully migrated to <NEXT_VERSION>'
+>>> E-Maj successfully migrated to <NEXT_VERSION>
-----------------------------
-- check installation
-----------------------------
@@ -4637,6 +4637,6 @@ SET client_min_messages TO default;
SELECT param_value_text FROM emaj.emaj_param WHERE param_key = 'emaj_version';
param_value_text
------------------
- 0.12.0
+ <NEXT_VERSION>
(1 row)
View
2  test/82/expected/instPsqlPrev.out
@@ -1,5 +1,5 @@
-- instPsqlPrev.sql: Install previous version of E-Maj as simple psql script (for postgres version prior 9.1)
--- It installs E-Maj 0.11.0 for migration test.
+-- It installs the previous E-Maj version for migration test.
--
------------------------------------------------------------
-- install dblink
View
2  test/82/expected/prlb1.out
@@ -1,4 +1,4 @@
- E-Maj (version 0.12.0) - launching parallel rollbacks for groups
+ E-Maj (version <NEXT_VERSION>) - launching parallel rollbacks for groups
-------------------------------------------------------------------
3 connected sessions
Number of tables needing rollback for groups 'myGroup1','myGroup2' = 9
View
2  test/82/expected/prlb2.out
@@ -1,4 +1,4 @@
- E-Maj (version 0.12.0) - launching parallel rollbacks for groups
+ E-Maj (version <NEXT_VERSION>) - launching parallel rollbacks for groups
-------------------------------------------------------------------
3 connected sessions
Number of tables needing rollback for groups 'myGroup1' = 3
View
14 test/83/expected/instPsql.out
@@ -32,7 +32,7 @@ DROP FUNCTION public.emaj_tmp();
-----------------------------
\i sql/emaj.sql
--
--- E-Maj : logs and rollbacks table updates : V 0.12.0
+-- E-Maj : logs and rollbacks table updates : Version <NEXT_VERSION>
--
-- This software is distributed under the GNU General Public License.
--
@@ -397,7 +397,7 @@ $$Represents the structure of rows returned by the internal _verify_groups() fun
-- 'Fixed' parameters --
-- --
------------------------------------
-INSERT INTO emaj.emaj_param (param_key, param_value_text) VALUES ('emaj_version','0.12.0');
+INSERT INTO emaj.emaj_param (param_key, param_value_text) VALUES ('emaj_version','<NEXT_VERSION>');
-- Other parameters are optional. They are set by users if needed.
-- The history_retention parameter defines the time interval when a row remains in the emaj history table - default is 1 month
-- INSERT INTO emaj.emaj_param (param_key, param_value_interval) VALUES ('history_retention','1 month'::interval);
@@ -5265,7 +5265,7 @@ GRANT EXECUTE ON FUNCTION emaj.emaj_verify_all() TO emaj_viewer;
GRANT EXECUTE ON FUNCTION pg_catalog.pg_database_size(name) TO emaj_adm, emaj_viewer;
GRANT EXECUTE ON FUNCTION pg_catalog.pg_size_pretty(bigint) TO emaj_adm, emaj_viewer;
-- and insert the init record in the operation history
-INSERT INTO emaj.emaj_hist (hist_function, hist_object, hist_wording) VALUES ('EMAJ_INSTALL','E-Maj 0.12.0', 'Initialisation completed');
+INSERT INTO emaj.emaj_hist (hist_function, hist_object, hist_wording) VALUES ('EMAJ_INSTALL','E-Maj <NEXT_VERSION>', 'Initialisation completed');
-- check the current max_prepared_transactions setting and report a warning if its value is too low for parallel rollback
CREATE OR REPLACE FUNCTION emaj._tmp_check_setting()
RETURNS VOID LANGUAGE plpgsql AS
@@ -5298,15 +5298,15 @@ SET client_min_messages TO default;
SELECT param_value_text FROM emaj.emaj_param WHERE param_key = 'emaj_version';
param_value_text
------------------
- 0.12.0
+ <NEXT_VERSION>
(1 row)
-- check history
select hist_id, hist_function, hist_event, hist_object, regexp_replace(regexp_replace(hist_wording,E'\\d\\d\.\\d\\d\\.\\d\\d\\.\\d\\d\\d','%','g'),E'\\[.+\\]','(timestamp)','g'), hist_user from
(select * from emaj.emaj_hist order by hist_id) as t;
- hist_id | hist_function | hist_event | hist_object | regexp_replace | hist_user
----------+---------------+------------+--------------+--------------------------+-----------
- 1 | EMAJ_INSTALL | | E-Maj 0.12.0 | Initialisation completed | postgres
+ hist_id | hist_function | hist_event | hist_object | regexp_replace | hist_user
+---------+---------------+------------+----------------------+--------------------------+-----------
+ 1 | EMAJ_INSTALL | | E-Maj <NEXT_VERSION> | Initialisation completed | postgres
(1 row)
-- check table list
View
20 test/83/expected/instPsqlMig.out
@@ -1,4 +1,4 @@
--- instPsqlMig.sql: Migrate from E-Maj 0.11.1 to 0.12.0 while groups are not yet created.
+-- instPsqlMig.sql: Migrate from previous to next E-Maj vesrion while groups are not yet created.
-- Install E-Maj as simple psql script (mandatory for postgres version prior 9.1)
--
------------------------------------------------------------
@@ -10,9 +10,9 @@
-----------------------------
-- migrate to the target version
-----------------------------
-\i ../../sql/emaj-0.11.1-to-0.12.0.sql
+\i ../../sql/emaj-0.11.1-to-next.sql
--
--- E-Maj: migration from 0.11.1 to 0.12.0
+-- E-Maj: migration from 0.11.1 to <NEXT_VERSION>
--
-- This software is distributed under the GNU General Public License.
--
@@ -23,8 +23,8 @@
\set QUIET ON
SET client_min_messages TO WARNING;
--SET client_min_messages TO NOTICE;
-\echo 'E-maj upgrade from version 0.11.1 to version 0.12.0'
-E-maj upgrade from version 0.11.1 to version 0.12.0
+\echo 'E-maj upgrade from version 0.11.1 to version <NEXT_VERSION>'
+E-maj upgrade from version 0.11.1 to version <NEXT_VERSION>
\echo 'Checking...'
Checking...
------------------------------------
@@ -4623,13 +4623,13 @@ DROP FUNCTION emaj.tmp();
-- commit migration --
-- --
------------------------------------
-UPDATE emaj.emaj_param SET param_value_text = '0.12.0' WHERE param_key = 'emaj_version';
+UPDATE emaj.emaj_param SET param_value_text = '<NEXT_VERSION>' WHERE param_key = 'emaj_version';
-- and insert the init record in the operation history
-INSERT INTO emaj.emaj_hist (hist_function, hist_object, hist_wording) VALUES ('EMAJ_INSTALL','E-Maj 0.12.0', 'Migration from 0.11.1 completed');
+INSERT INTO emaj.emaj_hist (hist_function, hist_object, hist_wording) VALUES ('EMAJ_INSTALL','E-Maj <NEXT_VERSION>', 'Migration from 0.11.1 completed');
COMMIT;
SET client_min_messages TO default;
-\echo '>>> E-Maj successfully migrated to 0.12.0'
->>> E-Maj successfully migrated to 0.12.0
+\echo '>>> E-Maj successfully migrated to <NEXT_VERSION>'
+>>> E-Maj successfully migrated to <NEXT_VERSION>
-----------------------------
-- check installation
-----------------------------
@@ -4637,6 +4637,6 @@ SET client_min_messages TO default;
SELECT param_value_text FROM emaj.emaj_param WHERE param_key = 'emaj_version';
param_value_text
------------------
- 0.12.0
+ <NEXT_VERSION>
(1 row)
View
2  test/83/expected/instPsqlPrev.out
@@ -1,5 +1,5 @@
-- instPsqlPrev.sql: Install previous version of E-Maj as simple psql script (for postgres version prior 9.1)
--- It installs E-Maj 0.11.0 for migration test.
+-- It installs the previous E-Maj version for migration test.
--
------------------------------------------------------------
-- install dblink
View
2  test/83/expected/prlb1.out
@@ -1,4 +1,4 @@
- E-Maj (version 0.12.0) - launching parallel rollbacks for groups
+ E-Maj (version <NEXT_VERSION>) - launching parallel rollbacks for groups
-------------------------------------------------------------------
3 connected sessions
Number of tables needing rollback for groups 'myGroup1','myGroup2' = 9
View
2  test/83/expected/prlb2.out
@@ -1,4 +1,4 @@
- E-Maj (version 0.12.0) - launching parallel rollbacks for groups
+ E-Maj (version <NEXT_VERSION>) - launching parallel rollbacks for groups
-------------------------------------------------------------------
3 connected sessions
Number of tables needing rollback for groups 'myGroup1' = 3
View
14 test/84/expected/instPsql.out
@@ -32,7 +32,7 @@ DROP FUNCTION public.emaj_tmp();
-----------------------------
\i sql/emaj.sql
--
--- E-Maj : logs and rollbacks table updates : V 0.12.0
+-- E-Maj : logs and rollbacks table updates : Version <NEXT_VERSION>
--
-- This software is distributed under the GNU General Public License.
--
@@ -397,7 +397,7 @@ $$Represents the structure of rows returned by the internal _verify_groups() fun
-- 'Fixed' parameters --
-- --
------------------------------------
-INSERT INTO emaj.emaj_param (param_key, param_value_text) VALUES ('emaj_version','0.12.0');
+INSERT INTO emaj.emaj_param (param_key, param_value_text) VALUES ('emaj_version','<NEXT_VERSION>');
-- Other parameters are optional. They are set by users if needed.
-- The history_retention parameter defines the time interval when a row remains in the emaj history table - default is 1 month
-- INSERT INTO emaj.emaj_param (param_key, param_value_interval) VALUES ('history_retention','1 month'::interval);
@@ -5265,7 +5265,7 @@ GRANT EXECUTE ON FUNCTION emaj.emaj_verify_all() TO emaj_viewer;
GRANT EXECUTE ON FUNCTION pg_catalog.pg_database_size(name) TO emaj_adm, emaj_viewer;
GRANT EXECUTE ON FUNCTION pg_catalog.pg_size_pretty(bigint) TO emaj_adm, emaj_viewer;
-- and insert the init record in the operation history
-INSERT INTO emaj.emaj_hist (hist_function, hist_object, hist_wording) VALUES ('EMAJ_INSTALL','E-Maj 0.12.0', 'Initialisation completed');
+INSERT INTO emaj.emaj_hist (hist_function, hist_object, hist_wording) VALUES ('EMAJ_INSTALL','E-Maj <NEXT_VERSION>', 'Initialisation completed');
-- check the current max_prepared_transactions setting and report a warning if its value is too low for parallel rollback
CREATE OR REPLACE FUNCTION emaj._tmp_check_setting()
RETURNS VOID LANGUAGE plpgsql AS
@@ -5298,15 +5298,15 @@ SET client_min_messages TO default;
SELECT param_value_text FROM emaj.emaj_param WHERE param_key = 'emaj_version';
param_value_text
------------------
- 0.12.0
+ <NEXT_VERSION>
(1 row)
-- check history
select hist_id, hist_function, hist_event, hist_object, regexp_replace(regexp_replace(hist_wording,E'\\d\\d\.\\d\\d\\.\\d\\d\\.\\d\\d\\d','%','g'),E'\\[.+\\]','(timestamp)','g'), hist_user from
(select * from emaj.emaj_hist order by hist_id) as t;
- hist_id | hist_function | hist_event | hist_object | regexp_replace | hist_user
----------+---------------+------------+--------------+--------------------------+-----------
- 1 | EMAJ_INSTALL | | E-Maj 0.12.0 | Initialisation completed | postgres
+ hist_id | hist_function | hist_event | hist_object | regexp_replace | hist_user
+---------+---------------+------------+----------------------+--------------------------+-----------
+ 1 | EMAJ_INSTALL | | E-Maj <NEXT_VERSION> | Initialisation completed | postgres
(1 row)
-- check table list
View
20 test/84/expected/instPsqlMig.out
@@ -1,4 +1,4 @@
--- instPsqlMig.sql: Migrate from E-Maj 0.11.1 to 0.12.0 while groups are not yet created.
+-- instPsqlMig.sql: Migrate from previous to next E-Maj vesrion while groups are not yet created.
-- Install E-Maj as simple psql script (mandatory for postgres version prior 9.1)
--
------------------------------------------------------------
@@ -10,9 +10,9 @@
-----------------------------
-- migrate to the target version
-----------------------------
-\i ../../sql/emaj-0.11.1-to-0.12.0.sql
+\i ../../sql/emaj-0.11.1-to-next.sql
--
--- E-Maj: migration from 0.11.1 to 0.12.0
+-- E-Maj: migration from 0.11.1 to <NEXT_VERSION>
--
-- This software is distributed under the GNU General Public License.
--
@@ -23,8 +23,8 @@
\set QUIET ON
SET client_min_messages TO WARNING;
--SET client_min_messages TO NOTICE;
-\echo 'E-maj upgrade from version 0.11.1 to version 0.12.0'
-E-maj upgrade from version 0.11.1 to version 0.12.0
+\echo 'E-maj upgrade from version 0.11.1 to version <NEXT_VERSION>'
+E-maj upgrade from version 0.11.1 to version <NEXT_VERSION>
\echo 'Checking...'
Checking...
------------------------------------
@@ -4623,13 +4623,13 @@ DROP FUNCTION emaj.tmp();
-- commit migration --
-- --
------------------------------------
-UPDATE emaj.emaj_param SET param_value_text = '0.12.0' WHERE param_key = 'emaj_version';
+UPDATE emaj.emaj_param SET param_value_text = '<NEXT_VERSION>' WHERE param_key = 'emaj_version';
-- and insert the init record in the operation history
-INSERT INTO emaj.emaj_hist (hist_function, hist_object, hist_wording) VALUES ('EMAJ_INSTALL','E-Maj 0.12.0', 'Migration from 0.11.1 completed');
+INSERT INTO emaj.emaj_hist (hist_function, hist_object, hist_wording) VALUES ('EMAJ_INSTALL','E-Maj <NEXT_VERSION>', 'Migration from 0.11.1 completed');
COMMIT;
SET client_min_messages TO default;
-\echo '>>> E-Maj successfully migrated to 0.12.0'
->>> E-Maj successfully migrated to 0.12.0
+\echo '>>> E-Maj successfully migrated to <NEXT_VERSION>'
+>>> E-Maj successfully migrated to <NEXT_VERSION>
-----------------------------
-- check installation
-----------------------------
@@ -4637,6 +4637,6 @@ SET client_min_messages TO default;
SELECT param_value_text FROM emaj.emaj_param WHERE param_key = 'emaj_version';
param_value_text
------------------
- 0.12.0
+ <NEXT_VERSION>
(1 row)
View
2  test/84/expected/instPsqlPrev.out
@@ -1,5 +1,5 @@
-- instPsqlPrev.sql: Install previous version of E-Maj as simple psql script (for postgres version prior 9.1)
--- It installs E-Maj 0.11.0 for migration test.
+-- It installs the previous E-Maj version for migration test.
--
------------------------------------------------------------
-- install dblink
View
2  test/84/expected/prlb1.out
@@ -1,4 +1,4 @@
- E-Maj (version 0.12.0) - launching parallel rollbacks for groups
+ E-Maj (version <NEXT_VERSION>) - launching parallel rollbacks for groups
-------------------------------------------------------------------
3 connected sessions
Number of tables needing rollback for groups 'myGroup1','myGroup2' = 9
View
2  test/84/expected/prlb2.out
@@ -1,4 +1,4 @@
- E-Maj (version 0.12.0) - launching parallel rollbacks for groups
+ E-Maj (version <NEXT_VERSION>) - launching parallel rollbacks for groups
-------------------------------------------------------------------
3 connected sessions
Number of tables needing rollback for groups 'myGroup1' = 3
View
14 test/90/expected/instPsql.out
@@ -32,7 +32,7 @@ DROP FUNCTION public.emaj_tmp();
-----------------------------
\i sql/emaj.sql
--
--- E-Maj : logs and rollbacks table updates : V 0.12.0
+-- E-Maj : logs and rollbacks table updates : Version <NEXT_VERSION>
--
-- This software is distributed under the GNU General Public License.
--
@@ -397,7 +397,7 @@ $$Represents the structure of rows returned by the internal _verify_groups() fun
-- 'Fixed' parameters --
-- --
------------------------------------
-INSERT INTO emaj.emaj_param (param_key, param_value_text) VALUES ('emaj_version','0.12.0');
+INSERT INTO emaj.emaj_param (param_key, param_value_text) VALUES ('emaj_version','<NEXT_VERSION>');
-- Other parameters are optional. They are set by users if needed.
-- The history_retention parameter defines the time interval when a row remains in the emaj history table - default is 1 month
-- INSERT INTO emaj.emaj_param (param_key, param_value_interval) VALUES ('history_retention','1 month'::interval);
@@ -5265,7 +5265,7 @@ GRANT EXECUTE ON FUNCTION emaj.emaj_verify_all() TO emaj_viewer;
GRANT EXECUTE ON FUNCTION pg_catalog.pg_database_size(name) TO emaj_adm, emaj_viewer;
GRANT EXECUTE ON FUNCTION pg_catalog.pg_size_pretty(bigint) TO emaj_adm, emaj_viewer;
-- and insert the init record in the operation history
-INSERT INTO emaj.emaj_hist (hist_function, hist_object, hist_wording) VALUES ('EMAJ_INSTALL','E-Maj 0.12.0', 'Initialisation completed');
+INSERT INTO emaj.emaj_hist (hist_function, hist_object, hist_wording) VALUES ('EMAJ_INSTALL','E-Maj <NEXT_VERSION>', 'Initialisation completed');
-- check the current max_prepared_transactions setting and report a warning if its value is too low for parallel rollback
CREATE OR REPLACE FUNCTION emaj._tmp_check_setting()
RETURNS VOID LANGUAGE plpgsql AS
@@ -5298,15 +5298,15 @@ SET client_min_messages TO default;
SELECT param_value_text FROM emaj.emaj_param WHERE param_key = 'emaj_version';
param_value_text
------------------
- 0.12.0
+ <NEXT_VERSION>
(1 row)
-- check history
select hist_id, hist_function, hist_event, hist_object, regexp_replace(regexp_replace(hist_wording,E'\\d\\d\.\\d\\d\\.\\d\\d\\.\\d\\d\\d','%','g'),E'\\[.+\\]','(timestamp)','g'), hist_user from
(select * from emaj.emaj_hist order by hist_id) as t;
- hist_id | hist_function | hist_event | hist_object | regexp_replace | hist_user
----------+---------------+------------+--------------+--------------------------+-----------
- 1 | EMAJ_INSTALL | | E-Maj 0.12.0 | Initialisation completed | postgres
+ hist_id | hist_function | hist_event | hist_object | regexp_replace | hist_user
+---------+---------------+------------+----------------------+--------------------------+-----------
+ 1 | EMAJ_INSTALL | | E-Maj <NEXT_VERSION> | Initialisation completed | postgres
(1 row)
-- check table list
View
20 test/90/expected/instPsqlMig.out
@@ -1,4 +1,4 @@
--- instPsqlMig.sql: Migrate from E-Maj 0.11.1 to 0.12.0 while groups are not yet created.
+-- instPsqlMig.sql: Migrate from previous to next E-Maj vesrion while groups are not yet created.
-- Install E-Maj as simple psql script (mandatory for postgres version prior 9.1)
--
------------------------------------------------------------
@@ -10,9 +10,9 @@
-----------------------------
-- migrate to the target version
-----------------------------
-\i ../../sql/emaj-0.11.1-to-0.12.0.sql
+\i ../../sql/emaj-0.11.1-to-next.sql
--
--- E-Maj: migration from 0.11.1 to 0.12.0
+-- E-Maj: migration from 0.11.1 to <NEXT_VERSION>
--
-- This software is distributed under the GNU General Public License.
--
@@ -23,8 +23,8 @@
\set QUIET ON
SET client_min_messages TO WARNING;
--SET client_min_messages TO NOTICE;
-\echo 'E-maj upgrade from version 0.11.1 to version 0.12.0'
-E-maj upgrade from version 0.11.1 to version 0.12.0
+\echo 'E-maj upgrade from version 0.11.1 to version <NEXT_VERSION>'
+E-maj upgrade from version 0.11.1 to version <NEXT_VERSION>
\echo 'Checking...'
Checking...
------------------------------------
@@ -4623,13 +4623,13 @@ DROP FUNCTION emaj.tmp();
-- commit migration --
-- --
------------------------------------
-UPDATE emaj.emaj_param SET param_value_text = '0.12.0' WHERE param_key = 'emaj_version';
+UPDATE emaj.emaj_param SET param_value_text = '<NEXT_VERSION>' WHERE param_key = 'emaj_version';
-- and insert the init record in the operation history
-INSERT INTO emaj.emaj_hist (hist_function, hist_object, hist_wording) VALUES ('EMAJ_INSTALL','E-Maj 0.12.0', 'Migration from 0.11.1 completed');
+INSERT INTO emaj.emaj_hist (hist_function, hist_object, hist_wording) VALUES ('EMAJ_INSTALL','E-Maj <NEXT_VERSION>', 'Migration from 0.11.1 completed');
COMMIT;
SET client_min_messages TO default;
-\echo '>>> E-Maj successfully migrated to 0.12.0'
->>> E-Maj successfully migrated to 0.12.0
+\echo '>>> E-Maj successfully migrated to <NEXT_VERSION>'
+>>> E-Maj successfully migrated to <NEXT_VERSION>
-----------------------------
-- check installation
-----------------------------
@@ -4637,6 +4637,6 @@ SET client_min_messages TO default;
SELECT param_value_text FROM emaj.emaj_param WHERE param_key = 'emaj_version';
param_value_text
------------------
- 0.12.0
+ <NEXT_VERSION>
(1 row)
View
2  test/90/expected/instPsqlPrev.out
@@ -1,5 +1,5 @@
-- instPsqlPrev.sql: Install previous version of E-Maj as simple psql script (for postgres version prior 9.1)
--- It installs E-Maj 0.11.0 for migration test.
+-- It installs the previous E-Maj version for migration test.
--
------------------------------------------------------------
-- install dblink
View
2  test/90/expected/migPsqlLoggingGroup.out
@@ -1,4 +1,4 @@
--- migPsqlLoggingGroup.sql: Migrate from E-Maj 0.11.1 to 0.12.0 while groups are in logging state.
+-- migPsqlLoggingGroup.sql: Migrate from previous E-Maj version while groups are in logging state.
-- Install E-Maj as simple psql script (mandatory for postgres version prior 9.1)
--
------------------------------------------------------------
View
2  test/90/expected/prlb1.out
@@ -1,4 +1,4 @@
- E-Maj (version 0.12.0) - launching parallel rollbacks for groups
+ E-Maj (version <NEXT_VERSION>) - launching parallel rollbacks for groups
-------------------------------------------------------------------
3 connected sessions
Number of tables needing rollback for groups 'myGroup1','myGroup2' = 9
View
2  test/90/expected/prlb2.out
@@ -1,4 +1,4 @@
- E-Maj (version 0.12.0) - launching parallel rollbacks for groups
+ E-Maj (version <NEXT_VERSION>) - launching parallel rollbacks for groups
-------------------------------------------------------------------
3 connected sessions
Number of tables needing rollback for groups 'myGroup1' = 3
View
14 test/91/expected/instPsql.out
@@ -32,7 +32,7 @@ DROP FUNCTION public.emaj_tmp();
-----------------------------
\i sql/emaj.sql
--
--- E-Maj : logs and rollbacks table updates : V 0.12.0
+-- E-Maj : logs and rollbacks table updates : Version <NEXT_VERSION>
--
-- This software is distributed under the GNU General Public License.
--
@@ -397,7 +397,7 @@ $$Represents the structure of rows returned by the internal _verify_groups() fun
-- 'Fixed' parameters --
-- --
------------------------------------
-INSERT INTO emaj.emaj_param (param_key, param_value_text) VALUES ('emaj_version','0.12.0');
+INSERT INTO emaj.emaj_param (param_key, param_value_text) VALUES ('emaj_version','<NEXT_VERSION>');
-- Other parameters are optional. They are set by users if needed.
-- The history_retention parameter defines the time interval when a row remains in the emaj history table - default is 1 month
-- INSERT INTO emaj.emaj_param (param_key, param_value_interval) VALUES ('history_retention','1 month'::interval);
@@ -5265,7 +5265,7 @@ GRANT EXECUTE ON FUNCTION emaj.emaj_verify_all() TO emaj_viewer;
GRANT EXECUTE ON FUNCTION pg_catalog.pg_database_size(name) TO emaj_adm, emaj_viewer;
GRANT EXECUTE ON FUNCTION pg_catalog.pg_size_pretty(bigint) TO emaj_adm, emaj_viewer;
-- and insert the init record in the operation history
-INSERT INTO emaj.emaj_hist (hist_function, hist_object, hist_wording) VALUES ('EMAJ_INSTALL','E-Maj 0.12.0', 'Initialisation completed');
+INSERT INTO emaj.emaj_hist (hist_function, hist_object, hist_wording) VALUES ('EMAJ_INSTALL','E-Maj <NEXT_VERSION>', 'Initialisation completed');
-- check the current max_prepared_transactions setting and report a warning if its value is too low for parallel rollback
CREATE OR REPLACE FUNCTION emaj._tmp_check_setting()
RETURNS VOID LANGUAGE plpgsql AS
@@ -5298,15 +5298,15 @@ SET client_min_messages TO default;
SELECT param_value_text FROM emaj.emaj_param WHERE param_key = 'emaj_version';
param_value_text
------------------
- 0.12.0
+ <NEXT_VERSION>
(1 row)
-- check history
select hist_id, hist_function, hist_event, hist_object, regexp_replace(regexp_replace(hist_wording,E'\\d\\d\.\\d\\d\\.\\d\\d\\.\\d\\d\\d','%','g'),E'\\[.+\\]','(timestamp)','g'), hist_user from
(select * from emaj.emaj_hist order by hist_id) as t;
- hist_id | hist_function | hist_event | hist_object | regexp_replace | hist_user
----------+---------------+------------+--------------+--------------------------+-----------
- 1 | EMAJ_INSTALL | | E-Maj 0.12.0 | Initialisation completed | postgres
+ hist_id | hist_function | hist_event | hist_object | regexp_replace | hist_user
+---------+---------------+------------+----------------------+--------------------------+-----------
+ 1 | EMAJ_INSTALL | | E-Maj <NEXT_VERSION> | Initialisation completed | postgres
(1 row)
-- check table list
View
20 test/91/expected/instPsqlMig.out
@@ -1,4 +1,4 @@
--- instPsqlMig.sql: Migrate from E-Maj 0.11.1 to 0.12.0 while groups are not yet created.
+-- instPsqlMig.sql: Migrate from previous to next E-Maj vesrion while groups are not yet created.
-- Install E-Maj as simple psql script (mandatory for postgres version prior 9.1)
--
------------------------------------------------------------
@@ -10,9 +10,9 @@
-----------------------------
-- migrate to the target version
-----------------------------
-\i ../../sql/emaj-0.11.1-to-0.12.0.sql
+\i ../../sql/emaj-0.11.1-to-next.sql
--
--- E-Maj: migration from 0.11.1 to 0.12.0
+-- E-Maj: migration from 0.11.1 to <NEXT_VERSION>
--
-- This software is distributed under the GNU General Public License.
--
@@ -23,8 +23,8 @@
\set QUIET ON
SET client_min_messages TO WARNING;
--SET client_min_messages TO NOTICE;
-\echo 'E-maj upgrade from version 0.11.1 to version 0.12.0'
-E-maj upgrade from version 0.11.1 to version 0.12.0
+\echo 'E-maj upgrade from version 0.11.1 to version <NEXT_VERSION>'
+E-maj upgrade from version 0.11.1 to version <NEXT_VERSION>
\echo 'Checking...'
Checking...
------------------------------------
@@ -4623,13 +4623,13 @@ DROP FUNCTION emaj.tmp();
-- commit migration --
-- --
------------------------------------
-UPDATE emaj.emaj_param SET param_value_text = '0.12.0' WHERE param_key = 'emaj_version';
+UPDATE emaj.emaj_param SET param_value_text = '<NEXT_VERSION>' WHERE param_key = 'emaj_version';
-- and insert the init record in the operation history
-INSERT INTO emaj.emaj_hist (hist_function, hist_object, hist_wording) VALUES ('EMAJ_INSTALL','E-Maj 0.12.0', 'Migration from 0.11.1 completed');
+INSERT INTO emaj.emaj_hist (hist_function, hist_object, hist_wording) VALUES ('EMAJ_INSTALL','E-Maj <NEXT_VERSION>', 'Migration from 0.11.1 completed');
COMMIT;
SET client_min_messages TO default;
-\echo '>>> E-Maj successfully migrated to 0.12.0'
->>> E-Maj successfully migrated to 0.12.0
+\echo '>>> E-Maj successfully migrated to <NEXT_VERSION>'
+>>> E-Maj successfully migrated to <NEXT_VERSION>
-----------------------------
-- check installation
-----------------------------
@@ -4637,6 +4637,6 @@ SET client_min_messages TO default;
SELECT param_value_text FROM emaj.emaj_param WHERE param_key = 'emaj_version';
param_value_text
------------------
- 0.12.0
+ <NEXT_VERSION>
(1 row)
View
2  test/91/expected/instPsqlPrev.out
@@ -1,5 +1,5 @@
-- instPsqlPrev.sql: Install previous version of E-Maj as simple psql script (for postgres version prior 9.1)
--- It installs E-Maj 0.11.0 for migration test.
+-- It installs the previous E-Maj version for migration test.
--
------------------------------------------------------------
-- install dblink
View
2  test/91/expected/migPsqlLoggingGroup.out
@@ -1,4 +1,4 @@
--- migPsqlLoggingGroup.sql: Migrate from E-Maj 0.11.1 to 0.12.0 while groups are in logging state.
+-- migPsqlLoggingGroup.sql: Migrate from previous E-Maj version while groups are in logging state.
-- Install E-Maj as simple psql script (mandatory for postgres version prior 9.1)
--
------------------------------------------------------------
View
2  test/91/expected/prlb1.out
@@ -1,4 +1,4 @@
- E-Maj (version 0.12.0) - launching parallel rollbacks for groups
+ E-Maj (version <NEXT_VERSION>) - launching parallel rollbacks for groups
-------------------------------------------------------------------
3 connected sessions
Number of tables needing rollback for groups 'myGroup1','myGroup2' = 9
View
2  test/91/expected/prlb2.out
@@ -1,4 +1,4 @@
- E-Maj (version 0.12.0) - launching parallel rollbacks for groups
+ E-Maj (version <NEXT_VERSION>) - launching parallel rollbacks for groups
-------------------------------------------------------------------
3 connected sessions
Number of tables needing rollback for groups 'myGroup1' = 3
View
14 test/92/expected/instPsql.out
@@ -32,7 +32,7 @@ DROP FUNCTION public.emaj_tmp();
-----------------------------
\i sql/emaj.sql
--
--- E-Maj : logs and rollbacks table updates : V 0.12.0
+-- E-Maj : logs and rollbacks table updates : Version <NEXT_VERSION>
--
-- This software is distributed under the GNU General Public License.
--
@@ -397,7 +397,7 @@ $$Represents the structure of rows returned by the internal _verify_groups() fun
-- 'Fixed' parameters --
-- --
------------------------------------
-INSERT INTO emaj.emaj_param (param_key, param_value_text) VALUES ('emaj_version','0.12.0');
+INSERT INTO emaj.emaj_param (param_key, param_value_text) VALUES ('emaj_version','<NEXT_VERSION>');
-- Other parameters are optional. They are set by users if needed.
-- The history_retention parameter defines the time interval when a row remains in the emaj history table - default is 1 month
-- INSERT INTO emaj.emaj_param (param_key, param_value_interval) VALUES ('history_retention','1 month'::interval);
@@ -5265,7 +5265,7 @@ GRANT EXECUTE ON FUNCTION emaj.emaj_verify_all() TO emaj_viewer;
GRANT EXECUTE ON FUNCTION pg_catalog.pg_database_size(name) TO emaj_adm, emaj_viewer;
GRANT EXECUTE ON FUNCTION pg_catalog.pg_size_pretty(bigint) TO emaj_adm, emaj_viewer;
-- and insert the init record in the operation history
-INSERT INTO emaj.emaj_hist (hist_function, hist_object, hist_wording) VALUES ('EMAJ_INSTALL','E-Maj 0.12.0', 'Initialisation completed');
+INSERT INTO emaj.emaj_hist (hist_function, hist_object, hist_wording) VALUES ('EMAJ_INSTALL','E-Maj <NEXT_VERSION>', 'Initialisation completed');
-- check the current max_prepared_transactions setting and report a warning if its value is too low for parallel rollback
CREATE OR REPLACE FUNCTION emaj._tmp_check_setting()
RETURNS VOID LANGUAGE plpgsql AS
@@ -5298,15 +5298,15 @@ SET client_min_messages TO default;
SELECT param_value_text FROM emaj.emaj_param WHERE param_key = 'emaj_version';
param_value_text
------------------
- 0.12.0
+ <NEXT_VERSION>
(1 row)
-- check history
select hist_id, hist_function, hist_event, hist_object, regexp_replace(regexp_replace(hist_wording,E'\\d\\d\.\\d\\d\\.\\d\\d\\.\\d\\d\\d','%','g'),E'\\[.+\\]','(timestamp)','g'), hist_user from
(select * from emaj.emaj_hist order by hist_id) as t;
- hist_id | hist_function | hist_event | hist_object | regexp_replace | hist_user
----------+---------------+------------+--------------+--------------------------+-----------
- 1 | EMAJ_INSTALL | | E-Maj 0.12.0 | Initialisation completed | postgres
+ hist_id | hist_function | hist_event | hist_object | regexp_replace | hist_user
+---------+---------------+------------+----------------------+--------------------------+-----------
+ 1 | EMAJ_INSTALL | | E-Maj <NEXT_VERSION> | Initialisation completed | postgres
(1 row)
-- check table list
View
20 test/92/expected/instPsqlMig.out
@@ -1,4 +1,4 @@
--- instPsqlMig.sql: Migrate from E-Maj 0.11.1 to 0.12.0 while groups are not yet created.
+-- instPsqlMig.sql: Migrate from previous to next E-Maj vesrion while groups are not yet created.
-- Install E-Maj as simple psql script (mandatory for postgres version prior 9.1)
--
------------------------------------------------------------
@@ -10,9 +10,9 @@
-----------------------------
-- migrate to the target version
-----------------------------
-\i ../../sql/emaj-0.11.1-to-0.12.0.sql
+\i ../../sql/emaj-0.11.1-to-next.sql
--
--- E-Maj: migration from 0.11.1 to 0.12.0
+-- E-Maj: migration from 0.11.1 to <NEXT_VERSION>
--
-- This software is distributed under the GNU General Public License.
--
@@ -23,8 +23,8 @@
\set QUIET ON
SET client_min_messages TO WARNING;
--SET client_min_messages TO NOTICE;
-\echo 'E-maj upgrade from version 0.11.1 to version 0.12.0'
-E-maj upgrade from version 0.11.1 to version 0.12.0
+\echo 'E-maj upgrade from version 0.11.1 to version <NEXT_VERSION>'
+E-maj upgrade from version 0.11.1 to version <NEXT_VERSION>
\echo 'Checking...'
Checking...
------------------------------------
@@ -4623,13 +4623,13 @@ DROP FUNCTION emaj.tmp();
-- commit migration --
-- --
------------------------------------
-UPDATE emaj.emaj_param SET param_value_text = '0.12.0' WHERE param_key = 'emaj_version';
+UPDATE emaj.emaj_param SET param_value_text = '<NEXT_VERSION>' WHERE param_key = 'emaj_version';
-- and insert the init record in the operation history
-INSERT INTO emaj.emaj_hist (hist_function, hist_object, hist_wording) VALUES ('EMAJ_INSTALL','E-Maj 0.12.0', 'Migration from 0.11.1 completed');
+INSERT INTO emaj.emaj_hist (hist_function, hist_object, hist_wording) VALUES ('EMAJ_INSTALL','E-Maj <NEXT_VERSION>', 'Migration from 0.11.1 completed');
COMMIT;
SET client_min_messages TO default;
-\echo '>>> E-Maj successfully migrated to 0.12.0'
->>> E-Maj successfully migrated to 0.12.0
+\echo '>>> E-Maj successfully migrated to <NEXT_VERSION>'
+>>> E-Maj successfully migrated to <NEXT_VERSION>
-----------------------------
-- check installation
-----------------------------
@@ -4637,6 +4637,6 @@ SET client_min_messages TO default;
SELECT param_value_text FROM emaj.emaj_param WHERE param_key = 'emaj_version';
param_value_text
------------------
- 0.12.0
+ <NEXT_VERSION>
(1 row)
View
2  test/92/expected/instPsqlPrev.out
@@ -1,5 +1,5 @@
-- instPsqlPrev.sql: Install previous version of E-Maj as simple psql script (for postgres version prior 9.1)
--- It installs E-Maj 0.11.0 for migration test.
+-- It installs the previous E-Maj version for migration test.
--
------------------------------------------------------------
-- install dblink
View
2  test/92/expected/migPsqlLoggingGroup.out
@@ -1,4 +1,4 @@
--- migPsqlLoggingGroup.sql: Migrate from E-Maj 0.11.1 to 0.12.0 while groups are in logging state.
+-- migPsqlLoggingGroup.sql: Migrate from previous E-Maj version while groups are in logging state.
-- Install E-Maj as simple psql script (mandatory for postgres version prior 9.1)
--
------------------------------------------------------------
View
2  test/92/expected/prlb1.out
@@ -1,4 +1,4 @@
- E-Maj (version 0.12.0) - launching parallel rollbacks for groups
+ E-Maj (version <NEXT_VERSION>) - launching parallel rollbacks for groups
-------------------------------------------------------------------
3 connected sessions
Number of tables needing rollback for groups 'myGroup1','myGroup2' = 9
View
2  test/92/expected/prlb2.out
@@ -1,4 +1,4 @@
- E-Maj (version 0.12.0) - launching parallel rollbacks for groups
+ E-Maj (version <NEXT_VERSION>) - launching parallel rollbacks for groups
-------------------------------------------------------------------
3 connected sessions
Number of tables needing rollback for groups 'myGroup1' = 3
View
2  test/emaj_sched_ext
@@ -1,4 +1,4 @@
-# E-Maj 0.12.0
+# E-Maj
# Schedule file for regression tests, with E-Maj installed as an extension
# E-Maj installation
View
2  test/emaj_sched_ext_mig
@@ -1,4 +1,4 @@
-# E-Maj 0.12.0
+# E-Maj
# Schedule file for regression tests, with E-Maj installed as an extension, using a migration path
# E-Maj installation
View
4 test/emaj_sched_ext_mx_mig
@@ -1,6 +1,6 @@
-# E-Maj 0.12.0
+# E-Maj
# Schedule file for regression tests, with E-Maj installed as an extension
-# E-Maj 0.10.0 to 0.12.0 migration is performed while groups are in logging stat
+# E-Maj migration is performed while groups are in logging stat
# Previous E-Maj installation
test: instExtPrev
View
2  test/emaj_sched_psql
@@ -1,4 +1,4 @@
-# E-Maj 0.12.0
+# E-Maj
# Schedule file for regression tests, with E-Maj installed as a simple psql script
# E-Maj installation
View
2  test/emaj_sched_psql_mig
@@ -1,4 +1,4 @@
-# E-Maj 0.12.0
+# E-Maj
# Schedule file for regression tests, with E-Maj installed as a simple psql script, using a migration path
# E-Maj installation
View
4 test/emaj_sched_psql_mx_mig
@@ -1,6 +1,6 @@
-# E-Maj 0.12.0
+# E-Maj
# Schedule file for regression tests, with E-Maj installed as a simple psql script
-# E-Maj 0.10.0 to 0.12.0 migration is performed while groups are in logging stat
+# E-Maj migration is performed while groups are in logging stat
# Previous E-Maj installation
test: instPsqlPrev
View
4 test/sql/instPsqlMig.sql
@@ -1,4 +1,4 @@
--- instPsqlMig.sql: Migrate from E-Maj 0.11.1 to 0.12.0 while groups are not yet created.
+-- instPsqlMig.sql: Migrate from previous to next E-Maj vesrion while groups are not yet created.
-- Install E-Maj as simple psql script (mandatory for postgres version prior 9.1)
--
------------------------------------------------------------
@@ -11,7 +11,7 @@
-----------------------------
-- migrate to the target version
-----------------------------
-\i ../../sql/emaj-0.11.1-to-0.12.0.sql
+\i ../../sql/emaj-0.11.1-to-next.sql
-----------------------------
-- check installation
View
2  test/sql/instPsqlPrev.sql
@@ -1,5 +1,5 @@
-- instPsqlPrev.sql: Install previous version of E-Maj as simple psql script (for postgres version prior 9.1)
--- It installs E-Maj 0.11.0 for migration test.
+-- It installs the previous E-Maj version for migration test.
--
------------------------------------------------------------
-- install dblink
View
2  test/sql/migPsqlLoggingGroup.sql
@@ -1,4 +1,4 @@
--- migPsqlLoggingGroup.sql: Migrate from E-Maj 0.11.1 to 0.12.0 while groups are in logging state.
+-- migPsqlLoggingGroup.sql: Migrate from previous E-Maj version while groups are in logging state.
-- Install E-Maj as simple psql script (mandatory for postgres version prior 9.1)
--
------------------------------------------------------------
View
1  test/sql/sql
View
108 tools/create_version.sh
@@ -0,0 +1,108 @@
+#! /bin/sh
+# create_version.sh
+# Tool to create a new version from the un-versionned emaj environment
+# Usage:
+# cd ~/proj
+# sh emaj/tools/create_version <new_version>
+
+# Checks
+# ------
+
+# Get and verify parameters
+ if [ $# -ne 1 ]
+ then
+ echo "Expected syntax is: create_version <new version>"
+ exit 1
+ fi
+ NEW=$1
+
+# Build directory names
+ OLDDIR="emaj"
+ NEWDIR="emaj-"$NEW
+
+# Verify that the new version directory doesn't already exist
+ if [ -d $NEWDIR ]
+ then
+ echo "A $NEWDIR directory already exists !"
+ echo "Remove it with rm -Rf $NEWDIR before reruning this script."
+ exit 1
+ fi
+
+# Automatic emaj changes
+# ----------------------
+ cd $OLDDIR
+
+# Stamp the CHANGES file
+ sed -i "s/<NEXT_VERSION>/${NEW}/" CHANGES
+
+# Adapt and rename the migration script
+ sed -i "s/<NEXT_VERSION>/${NEW}/g" sql/emaj-*-to-next.sql
+ for file in sql/emaj-*-to-next.sql; do
+ git mv $file $(echo $file | sed -r "s/next/${NEW}/")
+ done
+
+# Delete potential remaining temp files
+ find -name "*~" -type f -exec rm '{}' \;
+ cd ..
+
+# tag the new version
+ git tag 'v$NEW'
+
+# Create the new version environment
+# ----------------------------------
+
+# Clone the emaj directory to the new version directory (this also clones the .git directory)
+ echo "Cloning version to $NEW..."
+ cp -R $OLDDIR $NEWDIR
+
+# Adjust the new directory content
+ cd $NEWDIR
+ echo "Adjusting $NEW content..."
+
+# Delete tar files if exist
+ rm *.tar*
+
+# Process doc directory: rename *NEXT_VERSION* with *<new version>*
+ for file in doc/*NEXT_VERSION*; do
+ mv $file $(echo $file | sed -r "s/NEXT_VERSION/${NEW}/")
+ done
+
+# Process sql directory: change version identifiers inside the right files (excluding migration scripts)
+ for file in sql/*; do
+ if [[ ! $file =~ "(--|-to-)" ]]; then
+ sed -i "s/<NEXT_VERSION>/${NEW}/g" $file
+ fi
+ done
+ git mv sql/emaj--next_version.sql sql/emaj--${NEW}.sql
+
+# Change version identifiers inside files from /php + /tools + INFOS, META.json README
+ find php tools INFOS META.json README -type f -exec sed -i "s/<NEXT_VERSION>/${NEW}/g" '{}' \;
+
+# Change version identifiers inside files from /test/sql
+ find test/sql -type f -exec sed -i "s/<NEXT_VERSION>/${NEW}/g" '{}' \;
+ find test/sql -type f -exec sed -i "s/-to-next.sql/-to-${NEW}.sql/g" '{}' \;
+
+# Change environment directory into tools
+ sed -i "s/\/emaj/\/emaj-${NEW}/" tools/copy2Expected.sh tools/regress.sh tools/gen_emaj.pl
+
+ cd ..
+
+# Adjust the emaj directory content
+# ---------------------------------
+ cd $OLDDIR
+# Add a new entry in CHANGES
+ sed -i "3i<NEXT_VERSION>\n------\nEnhancements:\n\nBug fixes:\n" CHANGES
+
+# create a new empty migration script
+ echo "--" >sql/emaj-$NEW-to-next.sql
+ echo "-- E-Maj: migration from $NEW to <NEXT_VERSION>" >>sql/emaj-$NEW-to-next.sql
+ echo "--" >>sql/emaj-$NEW-to-next.sql
+ git add sql/emaj-$NEW-to-next.sql
+
+ cd ..
+
+# End of processing
+# -----------------
+ echo "--> New version $NEW is ready."
+ echo "Don't forget to: git commit -am 'Setup new $NEW version' on both environments..."
+
View
5 tools/gen_emaj.pl
@@ -15,11 +15,10 @@
use warnings; use strict;
# The 2 variables below are to be customized
- my $version = '0.12.0';
- my $dir = "/home/postgres/proj/emaj-0.12.0";
+ my $dir = "/home/postgres/proj/emaj";
my $fic_src = $dir."/sql/emaj_src.sql";
- my $fic_ext = $dir."/sql/emaj--".$version.".sql";
+ my $fic_ext = $dir."/sql/emaj--next_version.sql";
my $fic_psql = $dir."/sql/emaj.sql";
my $line;
my $gen_ext = 0;
View
10 tools/regress.sh
@@ -1,11 +1,11 @@
#!/bin/sh
-# E-Maj 0.12.0
+# E-Maj
# Regression tests
#---------------------------------------------#
# Parameters definition #
#---------------------------------------------#
-EMAJ_HOME="/home/postgres/proj/emaj-0.12.0"
+EMAJ_HOME="/home/postgres/proj/emaj"
PGBIN82="/usr/local/pg8221/bin"
PGPORT82="8221"
@@ -101,9 +101,9 @@ function migrat_test()
cd $EMAJ_HOME
# update the emaj.control files with the proper emaj version
-sed 's/<directory containing installation scripts, if not SHAREDIR>/\/home\/postgres\/proj\/emaj-0.12.0\/sql/' sql/emaj.control_base >/usr/local/pg913/share/postgresql/extension/emaj.control
-sed -i 's/0.12.0/0.10.1/g' /usr/local/pg913/share/postgresql/extension/emaj.control
-cp /usr/local/pg913/share/postgresql/extension/emaj.control /usr/local/pg92beta2/share/postgresql/extension/emaj.control
+#sed 's/<directory containing installation scripts, if not SHAREDIR>/\/home\/postgres\/proj\/emaj\/sql/' sql/emaj.control_base >/usr/local/pg913/share/postgresql/extension/emaj.control
+#sed -i 's/0.12.0/0.10.1/g' /usr/local/pg913/share/postgresql/extension/emaj.control
+#cp /usr/local/pg913/share/postgresql/extension/emaj.control /usr/local/pg921/share/postgresql/extension/emaj.control
# refresh both installation scripts before running tests
echo " "
Please sign in to comment.
Something went wrong with that request. Please try again.