From: Eric Bollengier Date: Wed, 27 Jun 2007 17:07:53 +0000 (+0000) Subject: ebl fix name X-Git-Tag: Release-2.2.0~207 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d4ac3ef7cd40ba6721adc00261dbf030d52b4c4e;p=bacula%2Fbacula ebl fix name git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@5110 91ce42f0-d328-0410-95d8-f526ca767f89 --- diff --git a/gui/bweb/script/bweb-postgresql.sql b/gui/bweb/script/bweb-postgresql.sql index bfcd26bf1e..9d62ed1985 100644 --- a/gui/bweb/script/bweb-postgresql.sql +++ b/gui/bweb/script/bweb-postgresql.sql @@ -26,3 +26,106 @@ CREATE INDEX client_group_member_idx on client_group_member (client_group_id); COMMIT; +-- -------------------------------------------------- +-- End of upgrade from 2.0 +-- -------------------------------------------------- + +-- -- creer un nouveau group +-- +-- INSERT INTO client_group (client_group_name) VALUES ('SIGMA'); +-- +-- -- affecter une machine a un group +-- +-- INSERT INTO client_group_member (client_group_id, clientid) +-- (SELECT client_group_id, +-- (SELECT Clientid FROM Client WHERE Name = 'slps0003-fd') +-- FROM client_group +-- WHERE client_group_name IN ('SIGMA', 'EXPLOITATION', 'MUTUALISE')); +-- +-- +-- -- modifier l'affectation d'une machine +-- +-- DELETE FROM client_group_member +-- WHERE clientid = (SELECT ClientId FROM Client WHERE Name = 'slps0003-fd') +-- +-- -- supprimer un groupe +-- +-- DELETE FROM client_group_member +-- WHERE client_group_id = (SELECT client_group_id FROM client_group WHERE client_group_name = 'EXPLOIT') +-- +-- +-- -- afficher tous les clients du group SIGMA +-- +-- SELECT Name FROM Client JOIN client_group_member using (clientid) +-- JOIN client_group using (client_group_id) +-- WHERE client_group_name = 'SIGMA'; +-- +-- -- afficher tous les groups +-- +-- SELECT client_group_name FROM client_group ORDER BY client_group_name; +-- +-- -- afficher tous les job du group SIGMA hier +-- +-- SELECT JobId, Job.Name, Client.Name, JobStatus, JobErrors +-- FROM Job JOIN Client USING(ClientId) +-- JOIN client_group_member USING (ClientId) +-- JOIN client_group USING (client_group_id) +-- WHERE client_group_name = 'SIGMA' +-- AND Job.StartTime > '2007-03-20'; +-- +-- -- donne des stats +-- +-- SELECT count(1) AS nb, sum(JobFiles) AS files, +-- sum(JobBytes) AS size, sum(JobErrors) AS joberrors, +-- JobStatus AS jobstatus, client_group_name +-- FROM Job JOIN Client USING(ClientId) +-- JOIN client_group_member USING (ClientId) +-- JOIN client_group USING (client_group_id) +-- WHERE Job.StartTime > '2007-03-20' +-- GROUP BY JobStatus, client_group_name +-- +-- + +CREATE PROCEDURAL LANGUAGE plpgsql; +BEGIN; + +CREATE FUNCTION SEC_TO_TIME(timestamp with time zone) +RETURNS timestamp with time zone AS $$ + select date_trunc('second', $1); +$$ LANGUAGE SQL; + +CREATE FUNCTION SEC_TO_TIME(bigint) +RETURNS interval AS $$ + select date_trunc('second', $1 * interval '1 second'); +$$ LANGUAGE SQL; + +CREATE FUNCTION UNIX_TIMESTAMP(timestamp with time zone) +RETURNS double precision AS $$ + select date_part('epoch', $1); +$$ LANGUAGE SQL; + +CREATE FUNCTION SEC_TO_INT(interval) +RETURNS double precision AS $$ + select extract(epoch from $1); +$$ LANGUAGE SQL; + +CREATE OR REPLACE FUNCTION base64_decode_lstat(int4, varchar) RETURNS int8 AS $$ +DECLARE +val int8; +b64 varchar(64); +size varchar(64); +i int; +BEGIN +size := split_part($2, ' ', $1); +b64 := 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/'; +val := 0; +FOR i IN 1..length(size) LOOP +val := val + (strpos(b64, substr(size, i, 1))-1) * (64^(length(size)-i)); +END LOOP; +RETURN val; +END; +$$ language 'plpgsql'; + +COMMIT; + + diff --git a/gui/bweb/script/upgrade-2.0_2.2_postgresql.sql b/gui/bweb/script/upgrade-2.0_2.2_postgresql.sql index 9d62ed1985..bfcd26bf1e 100644 --- a/gui/bweb/script/upgrade-2.0_2.2_postgresql.sql +++ b/gui/bweb/script/upgrade-2.0_2.2_postgresql.sql @@ -26,106 +26,3 @@ CREATE INDEX client_group_member_idx on client_group_member (client_group_id); COMMIT; --- -------------------------------------------------- --- End of upgrade from 2.0 --- -------------------------------------------------- - --- -- creer un nouveau group --- --- INSERT INTO client_group (client_group_name) VALUES ('SIGMA'); --- --- -- affecter une machine a un group --- --- INSERT INTO client_group_member (client_group_id, clientid) --- (SELECT client_group_id, --- (SELECT Clientid FROM Client WHERE Name = 'slps0003-fd') --- FROM client_group --- WHERE client_group_name IN ('SIGMA', 'EXPLOITATION', 'MUTUALISE')); --- --- --- -- modifier l'affectation d'une machine --- --- DELETE FROM client_group_member --- WHERE clientid = (SELECT ClientId FROM Client WHERE Name = 'slps0003-fd') --- --- -- supprimer un groupe --- --- DELETE FROM client_group_member --- WHERE client_group_id = (SELECT client_group_id FROM client_group WHERE client_group_name = 'EXPLOIT') --- --- --- -- afficher tous les clients du group SIGMA --- --- SELECT Name FROM Client JOIN client_group_member using (clientid) --- JOIN client_group using (client_group_id) --- WHERE client_group_name = 'SIGMA'; --- --- -- afficher tous les groups --- --- SELECT client_group_name FROM client_group ORDER BY client_group_name; --- --- -- afficher tous les job du group SIGMA hier --- --- SELECT JobId, Job.Name, Client.Name, JobStatus, JobErrors --- FROM Job JOIN Client USING(ClientId) --- JOIN client_group_member USING (ClientId) --- JOIN client_group USING (client_group_id) --- WHERE client_group_name = 'SIGMA' --- AND Job.StartTime > '2007-03-20'; --- --- -- donne des stats --- --- SELECT count(1) AS nb, sum(JobFiles) AS files, --- sum(JobBytes) AS size, sum(JobErrors) AS joberrors, --- JobStatus AS jobstatus, client_group_name --- FROM Job JOIN Client USING(ClientId) --- JOIN client_group_member USING (ClientId) --- JOIN client_group USING (client_group_id) --- WHERE Job.StartTime > '2007-03-20' --- GROUP BY JobStatus, client_group_name --- --- - -CREATE PROCEDURAL LANGUAGE plpgsql; -BEGIN; - -CREATE FUNCTION SEC_TO_TIME(timestamp with time zone) -RETURNS timestamp with time zone AS $$ - select date_trunc('second', $1); -$$ LANGUAGE SQL; - -CREATE FUNCTION SEC_TO_TIME(bigint) -RETURNS interval AS $$ - select date_trunc('second', $1 * interval '1 second'); -$$ LANGUAGE SQL; - -CREATE FUNCTION UNIX_TIMESTAMP(timestamp with time zone) -RETURNS double precision AS $$ - select date_part('epoch', $1); -$$ LANGUAGE SQL; - -CREATE FUNCTION SEC_TO_INT(interval) -RETURNS double precision AS $$ - select extract(epoch from $1); -$$ LANGUAGE SQL; - -CREATE OR REPLACE FUNCTION base64_decode_lstat(int4, varchar) RETURNS int8 AS $$ -DECLARE -val int8; -b64 varchar(64); -size varchar(64); -i int; -BEGIN -size := split_part($2, ' ', $1); -b64 := 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/'; -val := 0; -FOR i IN 1..length(size) LOOP -val := val + (strpos(b64, substr(size, i, 1))-1) * (64^(length(size)-i)); -END LOOP; -RETURN val; -END; -$$ language 'plpgsql'; - -COMMIT; - -