Index: openacs-4/packages/acs-admin/www/apm/package-add-2.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/package-add-2.xql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/acs-admin/www/apm/package-add-2.xql 27 Apr 2001 01:41:12 -0000 1.1 +++ openacs-4/packages/acs-admin/www/apm/package-add-2.xql 28 Apr 2001 17:35:30 -0000 1.2 @@ -3,7 +3,7 @@ - select case when count(*) > 0 then 0 else 1 end from apm_package_types + select case when count(*) = 0 then 0 else 1 end from apm_package_types where pretty_plural = :pretty_plural @@ -12,7 +12,7 @@ - select case when count(*) > 0 then 0 else 1 end from apm_package_types + select case when count(*) = 0 then 0 else 1 end from apm_package_types where pretty_name = :pretty_name @@ -21,7 +21,7 @@ - select case when count(*) > 0 then 0 else 1 end from apm_package_types + select case when count(*) = 0 then 0 else 1 end from apm_package_types where package_uri = :package_uri @@ -30,7 +30,7 @@ - select case when count(*) > 0 then 0 else 1 end from apm_package_versions + select case when count(*) = 0 then 0 else 1 end from apm_package_versions where version_uri = :version_uri @@ -39,7 +39,7 @@ - select case when count(*) > 0 then 0 else 1 end from apm_package_versions + select case when count(*) = 0 then 0 else 1 end from apm_package_versions where version_id = :version_id Index: openacs-4/packages/acs-admin/www/apm/parameter-add-2.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/parameter-add-2.xql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/acs-admin/www/apm/parameter-add-2.xql 27 Apr 2001 01:41:12 -0000 1.1 +++ openacs-4/packages/acs-admin/www/apm/parameter-add-2.xql 28 Apr 2001 17:35:30 -0000 1.2 @@ -3,7 +3,7 @@ - select case when count(*) > 0 then 0 else 1 end + select case when count(*) = 0 then 0 else 1 end from apm_parameters where parameter_name = :parameter_name Index: openacs-4/packages/acs-admin/www/apm/version-dependencies-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-dependencies-postgresql.xql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/acs-admin/www/apm/version-dependencies-postgresql.xql 27 Apr 2001 01:41:12 -0000 1.1 +++ openacs-4/packages/acs-admin/www/apm/version-dependencies-postgresql.xql 28 Apr 2001 17:35:30 -0000 1.2 @@ -24,5 +24,19 @@ + + + + select t.pretty_name as dep_pretty_name, v.version_name as dep_version_name, + v.version_id as dep_version_id + from apm_package_versions v, apm_package_dependencies d, apm_package_types t + where d.service_uri = :service_uri + and d.dependency_type = :other_dependency_type_prep + and d.version_id = v.version_id + and t.package_key = v.package_key + and apm_package_version__sortable_version_name(d.service_version) $sign + apm_package_version__sortable_version_name(:service_version) + + Index: openacs-4/packages/acs-admin/www/apm/version-dependency-add-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-dependency-add-postgresql.xql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/acs-admin/www/apm/version-dependency-add-postgresql.xql 27 Apr 2001 01:41:12 -0000 1.1 +++ openacs-4/packages/acs-admin/www/apm/version-dependency-add-postgresql.xql 28 Apr 2001 17:35:30 -0000 1.2 @@ -4,8 +4,9 @@ - select distinct service_uri, service_version - from apm_package_dependencies + select distinct service_uri, service_version, + apm_package_version__sortable_version_name(service_version) + from apm_package_dependencies order by service_uri, apm_package_version__sortable_version_name(service_version) Index: openacs-4/packages/acs-admin/www/apm/version-edit-2.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-edit-2.xql,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/acs-admin/www/apm/version-edit-2.xql 27 Apr 2001 17:39:15 -0000 1.2 +++ openacs-4/packages/acs-admin/www/apm/version-edit-2.xql 28 Apr 2001 17:35:30 -0000 1.3 @@ -3,7 +3,7 @@ - select case when count(*) > 0 then 0 else 1 end from apm_package_versions + select case when count(*) = 0 then 0 else 1 end from apm_package_versions where version_uri = :version_uri Index: openacs-4/packages/acs-bootstrap-installer/bootstrap.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-bootstrap-installer/bootstrap.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/acs-bootstrap-installer/bootstrap.tcl 12 Apr 2001 18:36:20 -0000 1.2 +++ openacs-4/packages/acs-bootstrap-installer/bootstrap.tcl 28 Apr 2001 17:35:30 -0000 1.3 @@ -128,15 +128,15 @@ nsv_set apm_enabled_package $package_key 1 } + # Load up the Queries (OpenACS, ben@mit.edu) + ns_log Notice "Loading QUERIES!! OpenACS - ben" + apm_load_queries + # Load *-procs.tcl and *-init.tcl files for enabled packages. ns_log Notice "Loading Tcl library files..." apm_load_libraries -procs ns_log Notice "Loading Tcl Initialization files..." apm_load_libraries -init - - # Load up the Queries (OpenACS, ben@mit.edu) - ns_log Notice "Loading QUERIES!! OpenACS - ben" - apm_load_queries if { ![nsv_exists rp_properties request_count] } { # security-init.tcl has not been invoked, so it's safe to say that the Index: openacs-4/packages/acs-developer-support/acs-developer-support.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-developer-support/acs-developer-support.info,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/acs-developer-support/acs-developer-support.info 23 Apr 2001 19:43:04 -0000 1.2 +++ openacs-4/packages/acs-developer-support/acs-developer-support.info 28 Apr 2001 17:35:30 -0000 1.3 @@ -14,16 +14,18 @@ Lars Pind Joseph Bank Routines used to aggregate request/response information for debugging. - 2001-01-24 + 2001-01-24 00:00:00-08 ArsDigita Corporation + + - + @@ -33,13 +35,13 @@ - - - - - - + + + + + + Index: openacs-4/packages/acs-developer-support/tcl/acs-developer-support-procs-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-developer-support/tcl/Attic/acs-developer-support-procs-oracle.xql,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/acs-developer-support/tcl/acs-developer-support-procs-oracle.xql 28 Apr 2001 17:35:30 -0000 1.1 @@ -0,0 +1,37 @@ + + + + oracle8.1.6 + + + + + select package_id from apm_packages + where package_key = 'acs-developer-support' + and rownum=1 + + + + + + + + select acs_object.name(:object_id) from dual + + + + + + + + select site_node.url(node_id) + from site_nodes s, apm_packages p + where p.package_id = s.object_id + and p.package_key ='acs-developer-support' + and rownum = 1 + + + + + + Index: openacs-4/packages/acs-developer-support/tcl/acs-developer-support-procs-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-developer-support/tcl/Attic/acs-developer-support-procs-postgresql.xql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/acs-developer-support/tcl/acs-developer-support-procs-postgresql.xql 23 Apr 2001 19:43:04 -0000 1.1 +++ openacs-4/packages/acs-developer-support/tcl/acs-developer-support-procs-postgresql.xql 28 Apr 2001 17:35:30 -0000 1.2 @@ -1,13 +1,35 @@ + -postgresql7.1 + postgresql7.1 - - + + select package_id from apm_packages where package_key = 'acs-developer-support' limit 1 - + + + + + + select acs_object__name(:object_id) + + + + + + + select site_node.url(node_id) + from site_nodes s, apm_packages p + where p.package_id = s.object_id + and p.package_key ='acs-developer-support' + limit 1 + + + + + Index: openacs-4/packages/acs-developer-support/tcl/acs-developer-support-procs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-developer-support/tcl/Attic/acs-developer-support-procs.xql,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/acs-developer-support/tcl/acs-developer-support-procs.xql 28 Apr 2001 17:35:30 -0000 1.1 @@ -0,0 +1,18 @@ + + + + + + + select u.user_id as user_id_from_db, + acs_object.name(user_id) as name, + p.email + from users u, + parties p + where u.user_id = p.party_id + + + + + + 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 -N -r1.2 -r1.3 --- openacs-4/packages/acs-kernel/sql/postgresql/acs-logs-create.sql 14 Apr 2001 05:12:22 -0000 1.2 +++ openacs-4/packages/acs-kernel/sql/postgresql/acs-logs-create.sql 28 Apr 2001 17:35:30 -0000 1.3 @@ -17,7 +17,7 @@ log_date timestamp default now() not null, 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 -N -r1.6 -r1.7 --- openacs-4/packages/acs-kernel/sql/postgresql/acs-metadata-create.sql 17 Apr 2001 23:41:36 -0000 1.6 +++ openacs-4/packages/acs-kernel/sql/postgresql/acs-metadata-create.sql 28 Apr 2001 17:35:30 -0000 1.7 @@ -40,8 +40,8 @@ id_column varchar(30) not null, package_name varchar(30) not null constraint acs_object_types_pkg_name_un unique, - name_method varchar(30) default '' not null, - type_extension_table varchar(30) default '' not null, + name_method varchar(30), + type_extension_table varchar(30), dynamic_p boolean default 'f', tree_sortkey varchar(4000) ); @@ -237,7 +237,7 @@ constraint acs_obj_type_tbls_obj_type_fk references acs_object_types (object_type), table_name varchar(30) not null, - id_column varchar(30) default '' not null, + id_column varchar(30), constraint acs_object_type_tables_pk primary key (object_type, table_name) ); @@ -363,12 +363,12 @@ references acs_object_type_tables, attribute_name varchar(100) not null, pretty_name varchar(100) not null, - pretty_plural varchar(100) default '' not null, + pretty_plural varchar(100), sort_order integer not null, datatype varchar(50) not null constraint acs_attributes_datatype_fk references acs_datatypes (datatype), - default_value text default '' not null, + default_value text, min_n_values integer default 1 not null constraint acs_attributes_min_n_ck check (min_n_values >= 0), @@ -380,7 +380,7 @@ check (storage in ('type_specific', 'generic')), static_p boolean default 'f', - column_name varchar(30) default '' not null, + column_name varchar(30), constraint acs_attributes_attr_name_un unique (attribute_name, object_type), constraint acs_attributes_pretty_name_un @@ -438,7 +438,7 @@ attribute_id integer not null constraint asc_enum_values_attr_id_fk references acs_attributes (attribute_id), - enum_value varchar(1000) default '' not null, + enum_value varchar(1000), pretty_name varchar(100) not null, sort_order integer not null, constraint acs_enum_values_pk @@ -458,7 +458,7 @@ constraint acs_attr_descs_ob_tp_at_na_fk foreign key (object_type, attribute_name) references acs_attributes (object_type, attribute_name), - description_key varchar(100) default '' not null, + description_key varchar(100), constraint acs_attribute_descriptions_pk primary key (object_type, attribute_name, description_key), description text not null @@ -627,8 +627,8 @@ (create_type__object_type, create_type__pretty_name, create_type__pretty_plural, create_type__supertype, create_type__table_name, create_type__id_column, - create_type__abstract_p, coalesce(create_type__type_extension_table,''''), - v_package_name, coalesce(v_name_method,'''')); + create_type__abstract_p, create_type__type_extension_table, + v_package_name, v_name_method); return 0; end;' language 'plpgsql'; @@ -755,10 +755,10 @@ min_n_values, max_n_values, storage, static_p) values (v_attribute_id, create_attribute__object_type, - create_attribute__table_name, coalesce(create_attribute__column_name,''''), + create_attribute__table_name, create_attribute__column_name, create_attribute__attribute_name, create_attribute__pretty_name, - coalesce(create_attribute__pretty_plural,''''), v_sort_order, - create_attribute__datatype, coalesce(create_attribute__default_value,''''), + create_attribute__pretty_plural, v_sort_order, + create_attribute__datatype, create_attribute__default_value, create_attribute__min_n_values, create_attribute__max_n_values, create_attribute__storage, create_attribute__static_p); @@ -802,7 +802,7 @@ (object_type, attribute_name, description_key, description) values (add_description__object_type, add_description__attribute_name, - coalesce(add_description__description_key,''''), add_description__description); + add_description__description_key, add_description__description); return 0; end;' language 'plpgsql'; 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 -N -r1.19 -r1.20 --- openacs-4/packages/acs-kernel/sql/postgresql/acs-objects-create.sql 19 Apr 2001 01:17:17 -0000 1.19 +++ openacs-4/packages/acs-kernel/sql/postgresql/acs-objects-create.sql 28 Apr 2001 17:35:30 -0000 1.20 @@ -183,10 +183,10 @@ security_inherit_p boolean default 't' not null, creation_user integer, creation_date timestamp default now() not null, - creation_ip varchar(50) default '' not null, + creation_ip varchar(50), last_modified timestamp default now() not null, modifying_user integer, - modifying_ip varchar(50) default '' not null, + modifying_ip varchar(50), tree_sortkey varchar(4000), constraint acs_objects_context_object_un unique (context_id, object_id) @@ -502,7 +502,7 @@ attribute_id integer not null constraint acs_attr_values_attr_id_fk references acs_attributes (attribute_id), - attr_value text default '' not null, + attr_value text, constraint acs_attribute_values_pk primary key (object_id, attribute_id) ); @@ -522,7 +522,7 @@ attribute_id integer not null constraint acs_static_a_v_attr_id_fk references acs_attributes (attribute_id), - attr_value text default '' not null, + attr_value text, constraint acs_static_a_v_pk primary key (object_type, attribute_id) ); @@ -667,7 +667,7 @@ creation_date, creation_user, creation_ip) values (v_object_id, new__object_type, new__context_id, - new__creation_date, new__creation_user, coalesce(new__creation_ip,'''')); + new__creation_date, new__creation_user, new__creation_ip); PERFORM acs_object__initialize_attributes(v_object_id); @@ -713,8 +713,14 @@ order by o2.tree_sortkey desc loop -- Delete from the table. - execute ''delete from '' || quote_ident(obj_type.table_name) || - '' where '' || quote_ident(obj_type.id_column) || '' = '' || delete__object_id; + + -- DRB: I removed the quote_ident calls that DanW originally included + -- because the table names appear to be stored in upper case. Quoting + -- causes them to not match the actual lower or potentially mixed-case + -- table names. We will just forbid squirrely names that include quotes. + + execute ''delete from '' || obj_type.table_name || + '' where '' || obj_type.id_column || '' = '' || delete__object_id; end loop; return 0; Index: openacs-4/packages/acs-kernel/sql/postgresql/acs-permissions-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/postgresql/acs-permissions-create.sql,v diff -u -N -r1.11 -r1.12 --- openacs-4/packages/acs-kernel/sql/postgresql/acs-permissions-create.sql 19 Apr 2001 14:52:47 -0000 1.11 +++ openacs-4/packages/acs-kernel/sql/postgresql/acs-permissions-create.sql 28 Apr 2001 17:35:30 -0000 1.12 @@ -39,8 +39,8 @@ create table acs_privileges ( privilege varchar(100) not null constraint acs_privileges_pk primary key, - pretty_name varchar(100) default '' not null, - pretty_plural varchar(100) default '' not null + pretty_name varchar(100), + pretty_plural varchar(100) ); create table acs_privilege_hierarchy ( @@ -317,8 +317,8 @@ (privilege, pretty_name, pretty_plural) values (create_privilege__privilege, - coalesce(create_privilege__pretty_name,''''), - coalesce(create_privilege__pretty_plural,'''')); + create_privilege__pretty_name, + create_privilege__pretty_plural); return 0; end;' language 'plpgsql'; 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 -N -r1.13 -r1.14 --- openacs-4/packages/acs-kernel/sql/postgresql/apm-create.sql 28 Apr 2001 01:04:25 -0000 1.13 +++ openacs-4/packages/acs-kernel/sql/postgresql/apm-create.sql 28 Apr 2001 17:35:30 -0000 1.14 @@ -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) default '' not null + package_type varchar(300) constraint apm_packages_pack_type_ck - check (package_type in ('', 'apm_application', 'apm_service')), - spec_file_path varchar(1500) default '' not null, + check (package_type in ('apm_application', 'apm_service')), + spec_file_path varchar(1500), spec_file_mtime integer, singleton_p boolean default 'f' not null ); @@ -240,14 +240,14 @@ version_uri varchar(1500) 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) default '' not null + summary varchar(3000), + description_format varchar(100) constraint apm_package_vers_desc_for_ck - check (description_format in ('', 'text/html', 'text/plain')), - description text default '' not null, + check (description_format in ('text/html', 'text/plain')), + description text, release_date timestamp, - vendor varchar(500) default '' not null, - vendor_uri varchar(1500) default '' not null, + vendor varchar(500), + vendor_uri varchar(1500), enabled_p boolean default 'f' constraint apm_package_vers_enabled_p_nn not null, installed_p boolean default 'f' @@ -258,12 +258,12 @@ constraint apm_package_vers_imp_p_nn not null, data_model_loaded_p boolean default 'f' constraint apm_package_vers_dml_p_nn not null, - cvs_import_results text default '' not null, + cvs_import_results text, activation_date timestamp, deactivation_date timestamp, -- FIXME: use this as the blob_id distribution_tarball integer, - distribution_uri varchar(1500) default '' not null, + distribution_uri varchar(1500), distribution_date timestamp, constraint apm_package_vers_id_name_un unique(package_key, version_name) ); @@ -626,7 +626,7 @@ create table apm_package_owners ( version_id integer constraint apm_package_owners_ver_id_fk references apm_package_versions on delete cascade, -- if the uri is an email address, it should look like 'mailto:alex@arsdigita.com' - owner_uri varchar(1500) default '' not null, + owner_uri varchar(1500), owner_name varchar(200) constraint apm_package_owners_name_nn not null, sort_key integer @@ -772,12 +772,12 @@ references apm_package_types (package_key), parameter_name varchar(100) constraint apm_pack_params_name_nn not null, - description varchar(2000) default '' not null, - section_name varchar(200) default '' not null, + description varchar(2000), + section_name varchar(200), datatype varchar(100) not null constraint apm_parameter_datatype_ck check(datatype in ('number', 'string')), - default_value text default '' not null, + default_value text, min_n_values integer default 1 not null constraint apm_paramters_min_n_ck check (min_n_values >= 0), @@ -839,7 +839,7 @@ references apm_packages (package_id) on delete cascade, parameter_id integer constraint apm_pack_values_parm_id_fk references apm_parameters (parameter_id), - attr_value text default '' not null, + attr_value text, constraint apm_parameter_values_un unique (package_id, parameter_id) ); @@ -1832,9 +1832,9 @@ default_value, section_name, min_n_values, max_n_values) values (v_parameter_id, register_parameter__parameter_name, - coalesce(register_parameter__description,''''), register_parameter__package_key, - register_parameter__datatype, coalesce(register_parameter__default_value,''''), - coalesce(register_parameter__section_name,''''), register_parameter__min_n_values, + register_parameter__description, register_parameter__package_key, + register_parameter__datatype, register_parameter__default_value, + register_parameter__section_name, register_parameter__min_n_values, register_parameter__max_n_values); -- Propagate parameter to new instances. @@ -2298,9 +2298,9 @@ release_date, vendor, vendor_uri, installed_p, data_model_loaded_p) values (v_version_id, apm_pkg_ver__package_key, apm_pkg_ver__version_name, - apm_pkg_ver__version_uri, coalesce(apm_pkg_ver__summary,''''), - coalesce(apm_pkg_ver__description_format,''''), coalesce(apm_pkg_ver__description,''''), - apm_pkg_ver__release_date, coalesce(apm_pkg_ver__vendor,''''), coalesce(apm_pkg_ver__vendor_uri,''''), + apm_pkg_ver__version_uri, apm_pkg_ver__summary, + apm_pkg_ver__description_format, apm_pkg_ver__description, + apm_pkg_ver__release_date, apm_pkg_ver__vendor, apm_pkg_ver__vendor_uri, apm_pkg_ver__installed_p, apm_pkg_ver__data_model_loaded_p); return v_version_id; @@ -2312,7 +2312,7 @@ create function apm_package_version__delete (integer) returns integer as ' declare - delete_version_id alias for $1; + delete__version_id alias for $1; begin delete from apm_package_owners where version_id = delete__version_id; @@ -2349,7 +2349,7 @@ create function apm_package_version__disable (integer) returns integer as ' declare - disable_version_id alias for $1; + disable__version_id alias for $1; begin update apm_package_versions set enabled_p = ''f'' @@ -2669,7 +2669,6 @@ -- what''s the next character? if a period, just skip it a_char := substr(version_name, a_end, 1); if a_char = ''.'' then - return null; else -- if the next character was a letter, append the appropriate characters if a_char = ''d'' then @@ -2925,7 +2924,7 @@ insert into apm_parameter_values (value_id, package_id, parameter_id, attr_value) values - (v_value_id, new__package_id, new__parameter_id, coalesce(new__attr_value,'''')); + (v_value_id, new__package_id, new__parameter_id, new__attr_value); return v_value_id; Index: openacs-4/packages/acs-kernel/sql/postgresql/community-core-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/postgresql/community-core-create.sql,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/acs-kernel/sql/postgresql/community-core-create.sql 17 Apr 2001 23:41:36 -0000 1.3 +++ openacs-4/packages/acs-kernel/sql/postgresql/community-core-create.sql 28 Apr 2001 17:35:30 -0000 1.4 @@ -252,7 +252,7 @@ constraint parties_pk primary key, email varchar(100) constraint parties_email_un unique, - url varchar(200) default '' not null + url varchar(200) ); comment on table parties is ' @@ -321,7 +321,7 @@ insert into parties (party_id, email, url) values - (v_party_id, lower(new__email), coalesce(new__url,'''')); + (v_party_id, lower(new__email), new__url); return v_party_id; @@ -496,8 +496,8 @@ last_visit timestamp, second_to_last_visit timestamp, n_sessions integer default 1 not null, - password_question varchar(1000) default '' not null, - password_answer varchar(1000) default '' not null + password_question varchar(1000), + password_answer varchar(1000) ); create table user_preferences ( @@ -509,7 +509,7 @@ -- an ISO 639 language code (in lowercase) language_preference char(2) default 'en', dont_spam_me_p boolean default 'f', - email_type varchar(64) default '' not null + email_type varchar(64) ); create function inline_1 () @@ -645,8 +645,8 @@ (user_id, password, salt, password_question, password_answer, screen_name, email_verified_p) values - (v_user_id, new__password, new__salt, coalesce(new__password_question,''''), - coalesce(new__password_answer,''''), new__screen_name, new__email_verified_p); + (v_user_id, new__password, new__salt, new__password_question, + new__password_answer, new__screen_name, new__email_verified_p); insert into user_preferences (user_id) 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.7 -r1.8 --- openacs-4/packages/acs-kernel/sql/postgresql/groups-create.sql 14 Apr 2001 05:12:22 -0000 1.7 +++ openacs-4/packages/acs-kernel/sql/postgresql/groups-create.sql 28 Apr 2001 17:35:30 -0000 1.8 @@ -29,8 +29,8 @@ constraint membership_rel_rel_id_pk primary key, -- null means waiting for admin approval - member_state varchar(20) default '' not null constraint membership_rel_mem_ck - check (member_state in ('', 'approved', 'needs approval', + member_state varchar(20) constraint membership_rel_mem_ck + check (member_state in ('approved', 'needs approval', 'banned', 'rejected', 'deleted')) ); Index: openacs-4/packages/acs-kernel/sql/postgresql/journal-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/postgresql/journal-create.sql,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/acs-kernel/sql/postgresql/journal-create.sql 17 Apr 2001 23:41:36 -0000 1.2 +++ openacs-4/packages/acs-kernel/sql/postgresql/journal-create.sql 28 Apr 2001 17:35:30 -0000 1.3 @@ -47,9 +47,9 @@ object_id integer constraint journal_entries_object_fk references acs_objects on delete cascade, - action varchar(100) default '' not null, - action_pretty text default '' not null, - msg text default '' not null + action varchar(100), + action_pretty text, + msg text ); create index journal_entries_object_idx on journal_entries (object_id); @@ -113,8 +113,8 @@ insert into journal_entries ( journal_id, object_id, action, action_pretty, msg ) values ( - v_journal_id, new__object_id, coalesce(new__action,''''), - coalesce(new__action_pretty,''''), coalesce(new__msg,'''') + v_journal_id, new__object_id, new__action, + new__action_pretty, new__msg ); return v_journal_id; Index: openacs-4/packages/acs-kernel/sql/postgresql/security-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/postgresql/security-create.sql,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/acs-kernel/sql/postgresql/security-create.sql 8 Apr 2001 16:13:53 -0000 1.2 +++ openacs-4/packages/acs-kernel/sql/postgresql/security-create.sql 28 Apr 2001 17:35:30 -0000 1.3 @@ -20,7 +20,7 @@ property_name varchar(50) constraint sec_session_prop_prop_name_nn not null, - property_value text default '' not null, + property_value text, -- transmitted only across secure connections? secure_p boolean, last_hit integer 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 -N -r1.10 -r1.11 --- openacs-4/packages/acs-kernel/sql/postgresql/site-nodes-create.sql 17 Apr 2001 23:41:36 -0000 1.10 +++ openacs-4/packages/acs-kernel/sql/postgresql/site-nodes-create.sql 28 Apr 2001 17:35:30 -0000 1.11 @@ -43,7 +43,7 @@ primary key, parent_id integer constraint site_nodes_parent_id_fk references site_nodes (node_id), - name varchar(100) default '' not null + name varchar(100) constraint site_nodes_name_ck check (name not like '%/%'), constraint site_nodes_un Index: openacs-4/packages/acs-tcl/tcl/apm-install-procs-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-install-procs-oracle.xql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/acs-tcl/tcl/apm-install-procs-oracle.xql 24 Apr 2001 06:02:26 -0000 1.1 +++ openacs-4/packages/acs-tcl/tcl/apm-install-procs-oracle.xql 28 Apr 2001 17:35:30 -0000 1.2 @@ -92,7 +92,7 @@ - + begin Index: openacs-4/packages/acs-tcl/tcl/apm-install-procs-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-install-procs-postgresql.xql,v diff -u -N -r1.6 -r1.7 --- openacs-4/packages/acs-tcl/tcl/apm-install-procs-postgresql.xql 27 Apr 2001 17:39:16 -0000 1.6 +++ openacs-4/packages/acs-tcl/tcl/apm-install-procs-postgresql.xql 28 Apr 2001 17:35:30 -0000 1.7 @@ -73,7 +73,7 @@ - + select apm_package_version__disable( @@ -246,7 +246,7 @@ - select apm_package_version__version_name_greater(:version_name, version_name) upgrade_p + select apm_package_version__version_name_greater(:version_name, version_name) as upgrade_p from apm_package_versions where package_key = :package_key and version_id = apm_package__highest_version (:package_key) Index: openacs-4/packages/bookmarks/bookmarks.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/bookmarks.info,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/bookmarks/bookmarks.info 20 Apr 2001 20:51:09 -0000 1.1 +++ openacs-4/packages/bookmarks/bookmarks.info 28 Apr 2001 17:35:30 -0000 1.2 @@ -13,7 +13,7 @@ Peter Marklund This module lets you manage your bookmarks on the web and enables sharing of bookmarks between people in a community (one ACS installation). - 2001-02-23 + 2001-02-23 00:00:00-08 ArsDigita Corporation This version contains a number of bugfixes and minor improvements over the 4.X alpha versions and has been rigorously tested. @@ -123,10 +123,10 @@ - - - + + + Index: openacs-4/packages/wp-slim/wp-slim.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/wp-slim.info,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/wp-slim/wp-slim.info 20 Apr 2001 20:51:24 -0000 1.1 +++ openacs-4/packages/wp-slim/wp-slim.info 28 Apr 2001 17:35:31 -0000 1.2 @@ -14,7 +14,7 @@ Paul Konigsberg Haolan Qin Wimpy Point allows users to collaborate and share online presentations. - 2001-01-26 + 2001-01-26 00:00:00-08 ArsDigita Corporation Fixed several bugs. Added new features (e.g. versioning and authorization).