diff --git a/application/controllers/system/DBSkel.php b/application/controllers/system/DBSkel.php index 94ba18cf6..c9c3fc9fe 100644 --- a/application/controllers/system/DBSkel.php +++ b/application/controllers/system/DBSkel.php @@ -24,3 +24,4 @@ class DBSkel extends CLI_Controller $this->dbskellib->start($step, $selectedDirectories) === true ? exit(0) : exit(1); } } + diff --git a/application/dbskel/fue/TBL_aktivitaet.php b/application/dbskel/fue/TBL_aktivitaet.php index 05027ba92..fa98f03f3 100644 --- a/application/dbskel/fue/TBL_aktivitaet.php +++ b/application/dbskel/fue/TBL_aktivitaet.php @@ -25,3 +25,4 @@ $tableArray = array( ), 'comment' => 'Timesheet SLA Activity' ); + diff --git a/application/dbskel/fue/constraints.php b/application/dbskel/fue/constraints.php index a3e534cf1..8dc2dd527 100644 --- a/application/dbskel/fue/constraints.php +++ b/application/dbskel/fue/constraints.php @@ -6,3 +6,4 @@ $constraintsArray = array( 'uk_beschreibung' => 'ALTER TABLE fue.tbl_aktivitaet ADD CONSTRAINT uk_beschreibung UNIQUE (beschreibung)', 'testchk' => 'ALTER TABLE fue.tbl_aktivitaet ADD CONSTRAINT testchk CHECK (sort > 0)' ); + diff --git a/application/dbskel/fue/extra.sql b/application/dbskel/fue/extra.sql index 3d826b40f..01dbabc5e 100644 --- a/application/dbskel/fue/extra.sql +++ b/application/dbskel/fue/extra.sql @@ -1 +1,2 @@ SELECT 'Extra file' AS justatest; + diff --git a/application/dbskel/fue/functions.php b/application/dbskel/fue/functions.php index f3dab4498..642ce01cd 100644 --- a/application/dbskel/fue/functions.php +++ b/application/dbskel/fue/functions.php @@ -1,19 +1,4 @@ - 'CREATE OR REPLACE FUNCTION fue.get_highest_content_version(bigint) RETURNS smallint AS $$ - DECLARE i_content_id ALIAS FOR $1; - DECLARE rec RECORD; - BEGIN +$functionsArray = array(); - SELECT INTO rec version - FROM campus.tbl_contentsprache - WHERE content_id = i_content_id - ORDER BY version desc - LIMIT 1; - - RETURN rec.version; - END; - $$ LANGUAGE plpgsql;' -); diff --git a/application/dbskel/fue/grants.sql b/application/dbskel/fue/grants.sql index cdc8c9c95..4a422c2f3 100644 --- a/application/dbskel/fue/grants.sql +++ b/application/dbskel/fue/grants.sql @@ -6,6 +6,11 @@ REVOKE ALL ON ALL TABLES IN SCHEMA fue FROM vilesci; REVOKE ALL ON ALL SEQUENCES IN SCHEMA fue FROM vilesci; REVOKE ALL ON ALL FUNCTIONS IN SCHEMA fue FROM vilesci; +REVOKE ALL PRIVILEGES ON SCHEMA fue FROM web; +REVOKE ALL ON ALL TABLES IN SCHEMA fue FROM web; +REVOKE ALL ON ALL SEQUENCES IN SCHEMA fue FROM web; +REVOKE ALL ON ALL FUNCTIONS IN SCHEMA fue FROM web; + ---------------------------------------------------------------------------------------------------- -- Gives the desired privileges to the chosen users (with great power comes great responsibility!) ---------------------------------------------------------------------------------------------------- @@ -13,8 +18,8 @@ REVOKE ALL ON ALL FUNCTIONS IN SCHEMA fue FROM vilesci; -- Schema privileges GRANT ALL ON SCHEMA fue TO vilesci; GRANT USAGE ON SCHEMA fue TO web; -GRANT USAGE ON SCHEMA fue TO wawi; -- Sequences privileges GRANT SELECT,UPDATE ON SEQUENCE fue.seq_projekt_dokument_projekt_dokument_id TO vilesci; GRANT SELECT,UPDATE ON SEQUENCE fue.seq_projekt_dokument_projekt_dokument_id TO web; + diff --git a/application/dbskel/fue/schema.sql b/application/dbskel/fue/schema.sql index 1dc28d796..bff0cfa86 100644 --- a/application/dbskel/fue/schema.sql +++ b/application/dbskel/fue/schema.sql @@ -1,4 +1,6 @@ -- Create the schema if not exists CREATE SCHEMA IF NOT EXISTS fue; + -- Comment schema COMMENT ON SCHEMA fue IS 'Projectmanagement'; + diff --git a/application/dbskel/fue/sequences.php b/application/dbskel/fue/sequences.php index 98a1ca60b..003505e0b 100644 --- a/application/dbskel/fue/sequences.php +++ b/application/dbskel/fue/sequences.php @@ -3,9 +3,45 @@ $sequencesArray = array( 'seq_projekt_dokument_projekt_dokument_id' => 'CREATE SEQUENCE fue.seq_projekt_dokument_projekt_dokument_id - START WITH 1 - INCREMENT BY 1 - NO MINVALUE - NO MAXVALUE - CACHE 1;' + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1;', + 'seq_projekt_ressource_projekt_ressource_id' => + 'CREATE SEQUENCE seq_projekt_ressource_projekt_ressource_id + START WITH 1 + INCREMENT BY 1 + NO MAXVALUE + NO MINVALUE + CACHE 1;', + 'seq_projektphase_projektphase_id' => + 'CREATE SEQUENCE seq_projektphase_projektphase_id + START WITH 1 + INCREMENT BY 1 + NO MAXVALUE + NO MINVALUE + CACHE 1;', + 'seq_projekttask_projekttask_id' => + 'CREATE SEQUENCE seq_projekttask_projekttask_id + START WITH 1 + INCREMENT BY 1 + NO MAXVALUE + NO MINVALUE + CACHE 1;', + 'seq_ressource_ressource_id' => + 'CREATE SEQUENCE seq_ressource_ressource_id + START WITH 1 + INCREMENT BY 1 + NO MAXVALUE + NO MINVALUE + CACHE 1;', + 'tbl_projekt_projekt_id_seq' => + 'CREATE SEQUENCE fue.tbl_projekt_projekt_id_seq + START WITH 1 + INCREMENT BY 1 + NO MAXVALUE + NO MINVALUE + CACHE 1;' ); + diff --git a/application/dbskel/fue/views.php b/application/dbskel/fue/views.php index 69b911714..03927829b 100644 --- a/application/dbskel/fue/views.php +++ b/application/dbskel/fue/views.php @@ -48,3 +48,4 @@ $viewsArray = array( LEFT JOIN fue.tbl_projekt tp USING (projekt_kurzbz) LEFT JOIN fue.tbl_projektphase tpp USING (projektphase_id);' ); + diff --git a/application/libraries/DBSkelLib.php b/application/libraries/DBSkelLib.php index 06130cf50..6f5c08e76 100644 --- a/application/libraries/DBSkelLib.php +++ b/application/libraries/DBSkelLib.php @@ -18,6 +18,7 @@ class DBSkelLib const RUN_MODE_NEW = 'new'; // build a new database or if database is already present creates only new objects const RUN_MODE_DIFF = 'diff'; // like new, but it also remove object from database that are NOT present in configuration files + // Step indexes const STEP_SCHEMA = 1; const STEP_SEQUENCES = 2; const STEP_TABLES = 3; @@ -831,12 +832,12 @@ class DBSkelLib } elseif ($step > self::MAX_STEPS) // if it is a number but > MAX_STEPS { - $this->_ci->eprintflib->printError('The maximun value fot this parameter is: '.self::MAX_STEPS); + $this->_ci->eprintflib->printError('The maximun value for this parameter is: '.self::MAX_STEPS); return false; } elseif ($step < 1) // if it is a number but < 1 { - $this->_ci->eprintflib->printError('The minimum value fot this parameter is 1'); + $this->_ci->eprintflib->printError('The minimum value for this parameter is 1'); return false; } } @@ -1249,3 +1250,4 @@ class DBSkelLib elseif ($this->_isDiffMode()) $this->_printInfo('>> DBSkel is running in diff mode <<'); } } +