summaryrefslogtreecommitdiff
path: root/sql/legacy
diff options
context:
space:
mode:
authoreinhverfr <einhverfr@4979c152-3d1c-0410-bac9-87ea11338e46>2007-02-06 05:21:08 +0000
committereinhverfr <einhverfr@4979c152-3d1c-0410-bac9-87ea11338e46>2007-02-06 05:21:08 +0000
commit05cf6c2ce357a792927c19e2b1cc8a8f45c375e9 (patch)
tree2f4f110002a9b6a43232cd51086685a31d100365 /sql/legacy
parent0de9fa75e8e34617fa1a128d4352209512ff0274 (diff)
Accepting LBMoore's upgrade fixes
git-svn-id: https://ledger-smb.svn.sourceforge.net/svnroot/ledger-smb/branches/1.2@793 4979c152-3d1c-0410-bac9-87ea11338e46
Diffstat (limited to 'sql/legacy')
-rw-r--r--sql/legacy/Pg-upgrade-2.6.18-2.6.19.sql98
1 files changed, 49 insertions, 49 deletions
diff --git a/sql/legacy/Pg-upgrade-2.6.18-2.6.19.sql b/sql/legacy/Pg-upgrade-2.6.18-2.6.19.sql
index 5bed6ec9..5b18932c 100644
--- a/sql/legacy/Pg-upgrade-2.6.18-2.6.19.sql
+++ b/sql/legacy/Pg-upgrade-2.6.18-2.6.19.sql
@@ -150,70 +150,70 @@ UPDATE tax SET taxmodule_id = 1;
ALTER TABLE tax ALTER COLUMN taxmodule_id SET NOT NULL;
-- Fixed session table and add users table --
-CREATE TABLE users (id serial UNIQUE, username varchar(30) PRIMARY KEY);
+--CREATE TABLE users (id serial UNIQUE, username varchar(30) PRIMARY KEY);
COMMENT ON TABLE users IS 'username is the primary key because we don\'t want duplicate users';
-CREATE TABLE users_conf(id integer primary key references users(id) deferrable initially deferred,
- acs text,
- address text,
- businessnumber text,
- company text,
- countrycode text,
- currency text,
- dateformat text,
- dbconnect text,
- dbdriver text default 'Pg',
- dbhost text default 'localhost',
- dbname text,
- dboptions text,
- dbpasswd text,
- dbport text,
- dbuser text,
- email text,
- fax text,
- menuwidth text,
- name text,
- numberformat text,
- password varchar(32) check(length(password) = 32),
- print text,
- printer text,
- role text,
- sid text,
- signature text,
- stylesheet text,
- tel text,
- templates text,
- crypted_password text,
- timeout numeric,
- vclimit numeric);
+--CREATE TABLE users_conf(id integer primary key references users(id) deferrable initially deferred,
+-- acs text,
+-- address text,
+-- businessnumber text,
+-- company text,
+-- countrycode text,
+-- currency text,
+-- dateformat text,
+-- dbconnect text,
+-- dbdriver text default 'Pg',
+-- dbhost text default 'localhost',
+-- dbname text,
+-- dboptions text,
+-- dbpasswd text,
+-- dbport text,
+-- dbuser text,
+-- email text,
+-- fax text,
+-- menuwidth text,
+-- name text,
+-- numberformat text,
+-- password varchar(32) check(length(password) = 32),
+-- print text,
+-- printer text,
+-- role text,
+-- sid text,
+-- signature text,
+-- stylesheet text,
+-- tel text,
+-- templates text,
+-- crypted_password text,
+-- timeout numeric,
+-- vclimit numeric);
COMMENT ON TABLE users_conf IS 'This is a completely dumb table that is a place holder to get usersconf into the database. Next major release will have a much more sane implementation';
COMMENT ON COLUMN users_conf.id IS 'Yes primary key with a FOREIGN KEY to users(id) is correct';
COMMENT ON COLUMN users_conf.password IS 'This means we have to get rid of the current password stuff and move to presumably md5()';
-LOCK session in EXCLUSIVE MODE;
-DELETE FROM session;
-ALTER TABLE session ADD CONSTRAINT session_token_check check (length(token::text) = 32);
-ALTER TABLE session ADD column user_id integer not null references users(id);
+--LOCK session in EXCLUSIVE MODE;
+--DELETE FROM session;
+--ALTER TABLE session ADD CONSTRAINT session_token_check check (length(token::text) = 32);
+--ALTER TABLE session ADD column user_id integer not null references users(id);
-- comment this out when user db is working:
-ALTER TABLE session ALTER COLUMN user_id DROP NOT NULL;
+--ALTER TABLE session ALTER COLUMN user_id DROP NOT NULL;
-- Admin user --
-INSERT INTO users(username) VALUES ('admin');
-INSERT INTO users_conf(id,password) VALUES (currval('users_id_seq'),NULL);
+--INSERT INTO users(username) VALUES ('admin');
+--INSERT INTO users_conf(id,password) VALUES (currval('users_id_seq'),NULL);
-- Functions
-CREATE FUNCTION create_user(text) RETURNS bigint AS $$
- INSERT INTO users(username) VALUES ('$1');
- SELECT currval('users_id_seq');
- $$ LANGUAGE 'SQL';
+--CREATE FUNCTION create_user(text) RETURNS bigint AS $$
+-- INSERT INTO users(username) VALUES ('$1');
+-- SELECT currval('users_id_seq');
+-- $$ LANGUAGE 'SQL';
COMMENT ON FUNCTION create_user(text) IS $$ Function to create user Returns users.id if successful, else it is an error. $$;
-CREATE FUNCTION update_user(int4,text) RETURNS int4 AS $$
- UPDATE users SET username = '$2' WHERE id = $1;
- SELECT 1;
- $$ LANGUAGE 'SQL';
+--CREATE FUNCTION update_user(int4,text) RETURNS int4 AS $$
+-- UPDATE users SET username = '$2' WHERE id = $1;
+-- SELECT 1;
+-- $$ LANGUAGE 'SQL';
COMMENT ON FUNCTION update_user(int4,text) IS $$ Takes int4 which is users.id and text which is username. Will update username based on id. Username is unique $$;