Index: openacs-4/packages/accounts-finance/sql/postgresql/accounts-finance-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/accounts-finance/sql/postgresql/accounts-finance-create.sql,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/accounts-finance/sql/postgresql/accounts-finance-create.sql 23 Aug 2010 22:00:49 -0000 1.3 +++ openacs-4/packages/accounts-finance/sql/postgresql/accounts-finance-create.sql 25 Aug 2010 22:19:52 -0000 1.4 @@ -4,8 +4,8 @@ -- @cvs-id -- -CREATE SEQUENCE qaf_id start 10000; -SELECT nextval ('qaf_id'); +CREATE SEQUENCE qaf_id_seq start 10000; +SELECT nextval ('qaf_id_seq'); -- model output is separate from case, even though it is one-to-one -- for easier abstractions of output without associating case for @@ -14,7 +14,7 @@ -- think calculator wiki with revisions CREATE TABLE qaf_file ( - id integer primary key DEFAULT nextval ( 'qaf_id' ), + id integer primary key, title varchar(60) ); @@ -32,7 +32,7 @@ CREATE TABLE qaf_initial_conditions ( - id integer primary key DEFAULT nextval ( 'qaf_id' ), + id integer primary key, code varchar(30), title varchar(30), user_id integer not null, @@ -42,7 +42,7 @@ ); CREATE TABLE qaf_model ( - id integer primary key DEFAULT nextval ( 'qaf_id' ), + id integer primary key, code varchar(30), title varchar(30), user_id integer not null, @@ -54,7 +54,7 @@ CREATE TABLE qaf_log_points ( - id integer primary key DEFAULT nextval ( 'qaf_id' ), + id integer primary key, code varchar(30), title varchar(30), user_id integer not null, @@ -64,7 +64,7 @@ ); CREATE TABLE qaf_post_calcs ( - id integer primary key DEFAULT nextval ( 'qaf_id' ), + id integer primary key, log_id integer, -- id of qaf_log_point associated with process code varchar(30), @@ -77,7 +77,7 @@ CREATE TABLE qaf_case ( - id integer primary key DEFAULT nextval ( 'qaf_id' ), + id integer primary key, file_id integer, -- file_id does not change when case_id changes code varchar(30), @@ -106,7 +106,7 @@ -- until we can reference a spreadsheet table, and -- insert there. CREATE TABLE qaf_log ( - id integer primary key DEFAULT nextval ( 'qaf_id' ), + id integer primary key, code varchar(30), title varchar(30), user_id integer not null, @@ -124,7 +124,7 @@ -- post_calc_variables can be filtered when aggregated into -- another case using log_points CREATE TABLE qaf_post_calc_log ( - id integer primary key DEFAULT nextval ( 'qaf_id' ), + id integer primary key, code varchar(30), title varchar(30), user_id integer not null, Index: openacs-4/packages/accounts-finance/sql/postgresql/accounts-finance-drop.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/accounts-finance/sql/postgresql/accounts-finance-drop.sql,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/accounts-finance/sql/postgresql/accounts-finance-drop.sql 23 Aug 2010 22:00:49 -0000 1.2 +++ openacs-4/packages/accounts-finance/sql/postgresql/accounts-finance-drop.sql 25 Aug 2010 22:19:52 -0000 1.3 @@ -25,4 +25,4 @@ DROP TABLE qaf_post_calc_log; DROP TABLE qaf_log; -DROP SEQUENCE qaf_id; \ No newline at end of file +DROP SEQUENCE qaf_id_seq; \ No newline at end of file