Index: openacs-4/packages/acs-kernel/sql/postgresql/acs-logs-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/postgresql/acs-logs-create.sql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-kernel/sql/postgresql/acs-logs-create.sql 14 Mar 2001 04:39:10 -0000 1.1 +++ openacs-4/packages/acs-kernel/sql/postgresql/acs-logs-create.sql 14 Apr 2001 05:12:22 -0000 1.2 @@ -15,9 +15,9 @@ constraint acs_logs_pk primary key, log_date timestamp default now() not null, - log_level varchar(20) + log_level varchar(20) not null constraint acs_logs_log_level_ck - check (log_level in ('notice', 'warn', 'error', + check (log_level in ('', 'notice', 'warn', 'error', 'debug')), log_key varchar(100) not null, message text not null Index: openacs-4/packages/acs-kernel/sql/postgresql/acs-metadata-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/postgresql/acs-metadata-create.sql,v diff -u -r1.4 -r1.5 --- openacs-4/packages/acs-kernel/sql/postgresql/acs-metadata-create.sql 9 Apr 2001 04:55:14 -0000 1.4 +++ openacs-4/packages/acs-kernel/sql/postgresql/acs-metadata-create.sql 14 Apr 2001 05:12:22 -0000 1.5 @@ -613,7 +613,7 @@ v_name_method := create_type__name_method; end if; - if create_type__package_name is null then + if create_type__package_name is null or create_type__package_name = '''' then v_package_name := create_type__object_type; else v_package_name := create_type__package_name; Index: openacs-4/packages/acs-kernel/sql/postgresql/acs-objects-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/postgresql/acs-objects-create.sql,v diff -u -r1.16 -r1.17 --- openacs-4/packages/acs-kernel/sql/postgresql/acs-objects-create.sql 8 Apr 2001 16:13:53 -0000 1.16 +++ openacs-4/packages/acs-kernel/sql/postgresql/acs-objects-create.sql 14 Apr 2001 05:12:22 -0000 1.17 @@ -753,7 +753,7 @@ and o1.tree_sortkey like (o2.tree_sortkey || ''%'') order by o2.tree_sortkey desc loop - if obj_type.name_method is not null then + if obj_type.name_method != '''' then -- Execute the first name_method we find (since we''re traversing -- up the type hierarchy from the object''s exact type) using @@ -856,7 +856,7 @@ -- If there is no specific table name for this attribute, -- figure it out based on the object type - if v_table_name is null then + if v_table_name is null or v_table_name = '''' then -- Determine the appropriate table name if v_storage = ''generic'' then @@ -906,7 +906,7 @@ end if; end if; - if v_column is null then + if v_column is null or v_column = '''' then if v_storage = ''generic'' then v_column := ''attr_value''; @@ -916,7 +916,7 @@ end if; - if v_key_sql is null then + if v_key_sql is null or v_key_sql = '''' then if v_static = ''f'' then v_key_sql := v_id_column || '' = '' || object_id_in ; else Index: openacs-4/packages/acs-kernel/sql/postgresql/apm-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/postgresql/apm-create.sql,v diff -u -r1.6 -r1.7 --- openacs-4/packages/acs-kernel/sql/postgresql/apm-create.sql 5 Apr 2001 18:23:38 -0000 1.6 +++ openacs-4/packages/acs-kernel/sql/postgresql/apm-create.sql 14 Apr 2001 05:12:22 -0000 1.7 @@ -27,10 +27,10 @@ package_uri varchar(1500) constraint apm_packages_types_p_uri_nn not null constraint apm_packages_types_p_uri_un unique, - package_type varchar(300) + package_type varchar(300) default '' not null constraint apm_packages_pack_type_ck - check (package_type in ('apm_application', 'apm_service')), - spec_file_path varchar(1500), + check (package_type in ('', 'apm_application', 'apm_service')), + spec_file_path varchar(1500) default '' not null, spec_file_mtime integer, singleton_p boolean default 'f' not null ); @@ -241,9 +241,9 @@ constraint apm_package_vers_ver_uri_nn not null constraint apm_package_vers_ver_uri_un unique, summary varchar(3000) default '' not null, - description_format varchar(100) + description_format varchar(100) default '' not null constraint apm_package_vers_desc_for_ck - check (description_format in ('text/html', 'text/plain')), + check (description_format in ('', 'text/html', 'text/plain')), description text default '' not null, release_date timestamp, vendor varchar(500) default '' not null, @@ -1842,7 +1842,7 @@ from apm_parameters p left outer join apm_parameter_values v using (parameter_id), apm_packages ap where p.package_key = ap.package_key - and v.attr_value is null + and v.attr_value = '''' and p.package_key = register_parameter__package_key loop PERFORM apm__set_value( @@ -2106,7 +2106,7 @@ new__creation_ip, new__context_id ); - if new__instance_name is null then + if new__instance_name is null or new__instance_name = '''' then v_instance_name := new__package_key || '' '' || v_package_id; else v_instance_name := new__instance_name; Index: openacs-4/packages/acs-kernel/sql/postgresql/groups-body-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/postgresql/groups-body-create.sql,v diff -u -r1.7 -r1.8 --- openacs-4/packages/acs-kernel/sql/postgresql/groups-body-create.sql 21 Mar 2001 05:46:40 -0000 1.7 +++ openacs-4/packages/acs-kernel/sql/postgresql/groups-body-create.sql 14 Apr 2001 05:12:22 -0000 1.8 @@ -727,7 +727,7 @@ v_join_policy := new__join_policy; -- if join policy was not specified, select the default based on group type - if v_join_policy is null then + if v_join_policy is null or v_join_policy = '''' then select count(*) into v_group_type_exists_p from group_types where group_type = new__object_type; 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 -r1.6 -r1.7 --- openacs-4/packages/acs-kernel/sql/postgresql/groups-create.sql 22 Mar 2001 00:09:24 -0000 1.6 +++ openacs-4/packages/acs-kernel/sql/postgresql/groups-create.sql 14 Apr 2001 05:12:22 -0000 1.7 @@ -29,8 +29,8 @@ constraint membership_rel_rel_id_pk primary key, -- null means waiting for admin approval - member_state varchar(20) constraint membership_rel_mem_ck - check (member_state in ('approved', 'needs approval', + member_state varchar(20) default '' not null constraint membership_rel_mem_ck + check (member_state in ('', 'approved', 'needs approval', 'banned', 'rejected', 'deleted')) ); Index: openacs-4/packages/acs-kernel/sql/postgresql/rel-constraints-body-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/postgresql/rel-constraints-body-create.sql,v diff -u -r1.4 -r1.5 --- openacs-4/packages/acs-kernel/sql/postgresql/rel-constraints-body-create.sql 23 Mar 2001 00:21:50 -0000 1.4 +++ openacs-4/packages/acs-kernel/sql/postgresql/rel-constraints-body-create.sql 14 Apr 2001 05:12:22 -0000 1.5 @@ -87,7 +87,7 @@ returns varchar as ' declare violation__rel_id alias for $1; - v_error varchar(4000); + v_error text; constraint_violated record; begin @@ -136,7 +136,7 @@ declare violation_if_removed__rel_id alias for $1; v_count integer; - v_error varchar(4000); + v_error text; constraint_violated record; begin v_error := null; Index: openacs-4/packages/acs-kernel/sql/postgresql/site-nodes-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/postgresql/site-nodes-create.sql,v diff -u -r1.8 -r1.9 --- openacs-4/packages/acs-kernel/sql/postgresql/site-nodes-create.sql 9 Apr 2001 04:55:14 -0000 1.8 +++ openacs-4/packages/acs-kernel/sql/postgresql/site-nodes-create.sql 14 Apr 2001 05:12:22 -0000 1.9 @@ -43,7 +43,7 @@ primary key, parent_id integer constraint site_nodes_parent_id_fk references site_nodes (node_id), - name varchar(100) + name varchar(100) default '' not null constraint site_nodes_name_ck check (name not like '%/%'), constraint site_nodes_un Index: openacs-4/packages/acs-kernel/sql/postgresql/test/rel-constraints-test.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/postgresql/test/rel-constraints-test.sql,v diff -u -r1.3 -r1.4 --- openacs-4/packages/acs-kernel/sql/postgresql/test/rel-constraints-test.sql 24 Mar 2001 00:34:53 -0000 1.3 +++ openacs-4/packages/acs-kernel/sql/postgresql/test/rel-constraints-test.sql 14 Apr 2001 05:12:22 -0000 1.4 @@ -261,7 +261,7 @@ insert into groups_test_segs values (side_two_constraint,1,''side_two_constraint''); insert into groups_test_segs values (side_one_constraint,2,''side_one_constraint''); - +/* side_two_constraint := rel_constraint__new( null, ''rel_constraint'', @@ -297,7 +297,7 @@ insert into groups_test_segs values (side_two_constraint,3,''side_two_constraint 1''); insert into groups_test_segs values (side_one_constraint,4,''side_one_constraint 1''); - +*/ delete from acs_logs; -- Make a couple of memberships.