Index: openacs-4/packages/ams/sql/postgresql/ams-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ams/sql/postgresql/ams-create.sql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/ams/sql/postgresql/ams-create.sql 20 Oct 2004 21:40:04 -0000 1.1 +++ openacs-4/packages/ams/sql/postgresql/ams-create.sql 22 Oct 2004 01:16:15 -0000 1.2 @@ -228,34 +228,25 @@ -- since these groupings will be used to create lists of elements -- for ad_form as well as lists of certain attributes to be used -- by other applications. --- --- Note: the ams_lists table copies the workflows table in the --- workflow package since it has a similar function and it helps --- to ensure consistency amongst openacs packages. There are some --- minor discrepencies since AMS uses acs_lang for any and all --- human readable text in the package. - create table ams_lists ( list_id integer constraint ams_lists_list_id_fk references acs_objects(object_id) constraint ams_lists_list_id_pk primary key, - short_name varchar(100) - constraint ams_lists_short_name_nn not null, - pretty_name varchar(200) - constraint ams_lists_pretty_name_nn not null, - object_id integer - constraint ams_lists_object_id_fk references acs_objects(object_id), package_key varchar(100) constraint ams_lists_package_key_fk references apm_package_types(package_key) constraint ams_lists_package_key_nn not null, object_type varchar(1000) constraint ams_lists_object_type_fk references acs_object_types(object_type) constraint ams_lists_object_type_nn not null, + list_name varchar(100) + constraint ams_lists_list_name_nn not null, + pretty_name varchar(200) + constraint ams_lists_pretty_name_nn not null, description varchar(200), description_mime_type varchar(200) constraint ams_lists_description_mime_type_fk references cr_mime_types(mime_type), - UNIQUE(short_name,package_key,object_type) + UNIQUE(package_key,object_type,list_name) ); select acs_object_type__create_type ( @@ -273,12 +264,12 @@ select acs_attribute__create_attribute ( 'ams_list', -- object_type - 'short_name', -- attribute_name + 'package_key', -- attribute_name 'string', -- datatype - 'Short Name', -- pretty_name - 'Short Names', -- pretty_plural -- default null + 'Package Key', -- pretty_name + 'Package Keys', -- pretty_plural -- default null null, -- table_name -- default null - 'short_name', -- column_name -- default null + 'object_type', -- column_name -- default null null, -- default_value -- default null '1', -- min_n_values -- default 1 '1', -- max_n_values -- default 1 @@ -289,27 +280,11 @@ select acs_attribute__create_attribute ( 'ams_list', -- object_type - 'pretty_name', -- attribute_name + 'object_type', -- attribute_name 'string', -- datatype - 'Pretty Name', -- pretty_name - 'Pretty Names', -- pretty_plural -- default null + 'Object Type', -- pretty_name + 'Object Types', -- pretty_plural -- default null null, -- table_name -- default null - 'pretty_name', -- column_name -- default null - null, -- default_value -- default null - '1', -- min_n_values -- default 1 - '1', -- max_n_values -- default 1 - null, -- sort_order -- default null - 'type_specific', -- storage -- default 'type_specific' - null -- static_p -- default 'f' -); - -select acs_attribute__create_attribute ( - 'ams_list', -- object_type - 'object_id', -- attribute_name - 'integer', -- datatype - 'Object ID', -- pretty_name - 'Object ID', -- pretty_plural -- default null - null, -- table_name -- default null 'object_type', -- column_name -- default null null, -- default_value -- default null '1', -- min_n_values -- default 1 @@ -321,12 +296,12 @@ select acs_attribute__create_attribute ( 'ams_list', -- object_type - 'package_key', -- attribute_name + 'list_name', -- attribute_name 'string', -- datatype - 'Package Key', -- pretty_name - 'Package Keys', -- pretty_plural -- default null + 'List Name', -- pretty_name + 'List Names', -- pretty_plural -- default null null, -- table_name -- default null - 'object_type', -- column_name -- default null + 'list_name', -- column_name -- default null null, -- default_value -- default null '1', -- min_n_values -- default 1 '1', -- max_n_values -- default 1 @@ -337,12 +312,12 @@ select acs_attribute__create_attribute ( 'ams_list', -- object_type - 'object_type', -- attribute_name + 'pretty_name', -- attribute_name 'string', -- datatype - 'Object Type', -- pretty_name - 'Object Types', -- pretty_plural -- default null + 'Pretty Name', -- pretty_name + 'Pretty Names', -- pretty_plural -- default null null, -- table_name -- default null - 'object_type', -- column_name -- default null + 'pretty_name', -- column_name -- default null null, -- default_value -- default null '1', -- min_n_values -- default 1 '1', -- max_n_values -- default 1 Index: openacs-4/packages/ams/sql/postgresql/ams-package-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ams/sql/postgresql/ams-package-create.sql,v diff -u -r1.2 -r1.3 --- openacs-4/packages/ams/sql/postgresql/ams-package-create.sql 21 Oct 2004 01:53:46 -0000 1.2 +++ openacs-4/packages/ams/sql/postgresql/ams-package-create.sql 22 Oct 2004 01:16:16 -0000 1.3 @@ -550,23 +550,22 @@ -select define_function_args('ams_list__new','list_id,short_name,pretty_name,object_id,package_key,object_type,description,description_mime_type,creation_date,creation_user,creation_ip,context_id'); +select define_function_args('ams_list__new','list_id,package_key,object_type,list_name,pretty_name,description,description_mime_type,creation_date,creation_user,creation_ip,context_id'); -create or replace function ams_list__new (integer,varchar,varchar,integer,varchar,varchar,varchar,varchar,timestamptz,integer,varchar,integer) +create or replace function ams_list__new (integer,varchar,varchar,varchar,varchar,varchar,varchar,timestamptz,integer,varchar,integer) returns integer as ' declare p_list_id alias for $1; - p_short_name alias for $2; - p_pretty_name alias for $3; - p_object_id alias for $4; - p_package_key alias for $5; - p_object_type alias for $6; - p_description alias for $7; - p_description_mime_type alias for $8; - p_creation_date alias for $9; - p_creation_user alias for $10; - p_creation_ip alias for $11; - p_context_id alias for $12; + p_package_key alias for $2; + p_object_type alias for $3; + p_list_name alias for $4; + p_pretty_name alias for $5; + p_description alias for $6; + p_description_mime_type alias for $7; + p_creation_date alias for $8; + p_creation_user alias for $9; + p_creation_ip alias for $10; + p_context_id alias for $11; v_list_id integer; begin @@ -580,9 +579,9 @@ ); insert into ams_lists - (list_id,short_name,pretty_name,object_id,package_key,object_type,description,description_mime_type) + (list_id,package_key,object_type,list_name,pretty_name,description,description_mime_type) values - (v_list_id,p_short_name,p_pretty_name,p_object_id,p_package_key,p_object_type,p_description,p_description_mime_type); + (v_list_id,p_package_key,p_object_type,p_list_name,p_pretty_name,p_description,p_description_mime_type); return v_list_id; end;' language 'plpgsql'; @@ -633,6 +632,8 @@ -------------------------------------------------------------------- -- postal_type needs to be entered here at the end... this is a hack +-- CASE WHEN postal_type is not null THEN postal_type ELSE '''' END || ''}'' +-- it needs to be consistently recast as an integer create or replace function ams_attribute__postal_address_string (integer) returns varchar as '