Index: openacs-4/packages/acs-kernel/acs-kernel.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/acs-kernel.info,v diff -u -N -r1.150.2.45 -r1.150.2.46 --- openacs-4/packages/acs-kernel/acs-kernel.info 6 Jul 2022 15:37:55 -0000 1.150.2.45 +++ openacs-4/packages/acs-kernel/acs-kernel.info 22 Jul 2022 17:37:25 -0000 1.150.2.46 @@ -9,15 +9,15 @@ f t - + OpenACS Core Team Routines and data models providing the foundation for OpenACS-based Web services. 2021-09-15 OpenACS The OpenACS kernel contains the core datamodel create and drop scripts for such things as objects, groups, parties and the supporting PL/SQL and PL/pgSQL procedures. 3 - + Index: openacs-4/packages/acs-kernel/sql/oracle/groups-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/oracle/groups-create.sql,v diff -u -N -r1.13.2.2 -r1.13.2.3 --- openacs-4/packages/acs-kernel/sql/oracle/groups-create.sql 13 Feb 2022 13:21:25 -0000 1.13.2.2 +++ openacs-4/packages/acs-kernel/sql/oracle/groups-create.sql 22 Jul 2022 17:37:25 -0000 1.13.2.3 @@ -32,7 +32,7 @@ constraint mr_member_state_nn not null constraint mr_member_state_ck check (member_state in ('merged','approved', 'needs approval', - 'banned', 'rejected', 'deleted')) + 'banned', 'rejected', 'deleted', 'expired')) ); create table admin_rels ( Index: openacs-4/packages/acs-kernel/sql/oracle/upgrade/upgrade-5.10.1d8-5.10.1d9.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/oracle/upgrade/upgrade-5.10.1d8-5.10.1d9.sql,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/acs-kernel/sql/oracle/upgrade/upgrade-5.10.1d8-5.10.1d9.sql 22 Jul 2022 17:37:25 -0000 1.1.2.1 @@ -0,0 +1,9 @@ +-- +-- Add membership "expired" to membership states. "expired" can be +-- used for "dormant" accounts, which are neither "banned" or +-- "deleted". +-- +ALTER TABLE membership_rels DROP CONSTRAINT membership_rels_member_state_ck; +ALTER TABLE membership_rels ADD CONSTRAINT membership_rels_member_state_ck + CHECK (member_state in ('merged','approved', 'needs approval', + 'banned', 'rejected', 'deleted', 'expired')); Index: openacs-4/packages/acs-kernel/sql/postgresql/groups-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/postgresql/groups-create.sql,v diff -u -N -r1.29.2.2 -r1.29.2.3 --- openacs-4/packages/acs-kernel/sql/postgresql/groups-create.sql 5 Jan 2021 08:51:45 -0000 1.29.2.2 +++ openacs-4/packages/acs-kernel/sql/postgresql/groups-create.sql 22 Jul 2022 17:37:25 -0000 1.29.2.3 @@ -33,7 +33,7 @@ -- null means waiting for admin approval member_state varchar(20) constraint membership_rels_member_state_ck check (member_state in ('merged', 'approved', 'needs approval', - 'banned', 'rejected', 'deleted')) + 'banned', 'rejected', 'deleted', 'expired')) ); create table admin_rels ( Index: openacs-4/packages/acs-kernel/sql/postgresql/upgrade/upgrade-5.10.1d8-5.10.1d9.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/postgresql/upgrade/upgrade-5.10.1d8-5.10.1d9.sql,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/acs-kernel/sql/postgresql/upgrade/upgrade-5.10.1d8-5.10.1d9.sql 22 Jul 2022 17:37:25 -0000 1.1.2.1 @@ -0,0 +1,9 @@ +-- +-- Add membership "expired" to membership states. "expired" can be +-- used for "dormant" accounts, which are neither "banned" or +-- "deleted". +-- +ALTER TABLE membership_rels DROP CONSTRAINT membership_rels_member_state_ck; +ALTER TABLE membership_rels ADD CONSTRAINT membership_rels_member_state_ck + CHECK (member_state in ('merged','approved', 'needs approval', + 'banned', 'rejected', 'deleted', 'expired'));