Renamed technology tables and views
* Removed the _v2 suffix from some tables and views.
This commit is contained in:
parent
ab04752169
commit
071257786c
19 changed files with 82 additions and 82 deletions
legacyworlds-server-data/db-structure/parts/040-functions
|
|
@ -140,7 +140,7 @@ BEGIN
|
|||
FROM defs.technologies _def
|
||||
LEFT OUTER JOIN (
|
||||
SELECT technology_name_id
|
||||
FROM emp.technologies_v2 _tech
|
||||
FROM emp.technologies _tech
|
||||
WHERE technology_name_id = _name_id
|
||||
AND emptech_state = 'RESEARCH'
|
||||
FOR UPDATE OF _tech
|
||||
|
|
@ -173,7 +173,7 @@ BEGIN
|
|||
-- Update empire research if necessary
|
||||
IF _old_points <> _points THEN
|
||||
_multi := _points::DOUBLE PRECISION / _old_points::DOUBLE PRECISION;
|
||||
UPDATE emp.technologies_v2
|
||||
UPDATE emp.technologies
|
||||
SET emptech_points = emptech_points * _multi
|
||||
WHERE technology_name_id = _name_id
|
||||
AND emptech_points IS NOT NULL;
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ BEGIN
|
|||
SELECT _name_id , resource_name_id FROM defs.resources;
|
||||
|
||||
-- Insert technologies that have no dependencies as research in progress
|
||||
INSERT INTO emp.technologies_v2 ( empire_id , technology_name_id )
|
||||
INSERT INTO emp.technologies ( empire_id , technology_name_id )
|
||||
SELECT _name_id , technology_name_id
|
||||
FROM defs.technologies
|
||||
LEFT OUTER JOIN defs.technology_dependencies
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ BEGIN
|
|||
SELECT INTO _impl_data
|
||||
technology_name_id , technology_price
|
||||
FROM emp.empires _emp
|
||||
INNER JOIN emp.technologies_v2 _tech
|
||||
INNER JOIN emp.technologies _tech
|
||||
ON _tech.empire_id = _emp.name_id
|
||||
INNER JOIN defs.technologies _def
|
||||
USING ( technology_name_id )
|
||||
|
|
@ -58,25 +58,25 @@ BEGIN
|
|||
UPDATE emp.empires
|
||||
SET cash = cash - _impl_data.technology_price
|
||||
WHERE name_id = _empire;
|
||||
UPDATE emp.technologies_v2
|
||||
UPDATE emp.technologies
|
||||
SET emptech_state = 'KNOWN'
|
||||
WHERE empire_id = _empire
|
||||
AND technology_name_id = _impl_data.technology_name_id;
|
||||
|
||||
-- Insert new research
|
||||
INSERT INTO emp.technologies_v2 ( empire_id , technology_name_id )
|
||||
INSERT INTO emp.technologies ( empire_id , technology_name_id )
|
||||
SELECT _empire , _valid.technology_name_id
|
||||
FROM ( SELECT _tech.technology_name_id ,
|
||||
( COUNT(*) = COUNT(_emptech.emptech_state) ) AS emptech_has_dependencies
|
||||
FROM defs.technologies _tech
|
||||
INNER JOIN defs.technology_dependencies _deps
|
||||
USING ( technology_name_id )
|
||||
LEFT OUTER JOIN emp.technologies_v2 _emptech
|
||||
LEFT OUTER JOIN emp.technologies _emptech
|
||||
ON _emptech.technology_name_id = _deps.technology_name_id_depends
|
||||
AND _emptech.emptech_state = 'KNOWN'
|
||||
AND _emptech.empire_id = _empire
|
||||
GROUP BY _tech.technology_name_id ) _valid
|
||||
LEFT OUTER JOIN emp.technologies_v2 _emptech
|
||||
LEFT OUTER JOIN emp.technologies _emptech
|
||||
ON _emptech.empire_id = _empire
|
||||
AND _emptech.technology_name_id = _valid.technology_name_id
|
||||
WHERE _emptech.empire_id IS NULL AND _valid.emptech_has_dependencies;
|
||||
|
|
@ -177,7 +177,7 @@ BEGIN
|
|||
emp.technology_make_identifier( empire_id , _str.name , emptech_visible ) ,
|
||||
_etech.emptech_priority
|
||||
FROM emp.empires _emp
|
||||
INNER JOIN emp.technologies_v2 _etech
|
||||
INNER JOIN emp.technologies _etech
|
||||
ON _etech.empire_id = _emp.name_id
|
||||
AND _etech.emptech_state = 'RESEARCH'
|
||||
INNER JOIN defs.technologies _tech
|
||||
|
|
@ -270,7 +270,7 @@ CREATE FUNCTION emp.resprio_update_apply( )
|
|||
AS $resprio_update_apply$
|
||||
BEGIN
|
||||
|
||||
UPDATE emp.technologies_v2
|
||||
UPDATE emp.technologies
|
||||
SET emptech_priority = _emptech_priority
|
||||
FROM rprio_update
|
||||
WHERE _empire_id = empire_id
|
||||
|
|
@ -367,7 +367,7 @@ CREATE VIEW emp.technology_visibility_view
|
|||
OR emptech_points >= sys.get_constant( 'game.research.visibility.points' )
|
||||
OR emptech_points / technology_points::DOUBLE PRECISION >= sys.get_constant( 'game.research.visibility.ratio' )
|
||||
) AS emptech_visible
|
||||
FROM emp.technologies_v2
|
||||
FROM emp.technologies
|
||||
INNER JOIN defs.technologies
|
||||
USING ( technology_name_id );
|
||||
|
||||
|
|
@ -390,7 +390,7 @@ CREATE VIEW emp.research_weights_view
|
|||
AS SELECT empire_id , technology_name_id ,
|
||||
POW( sys.get_constant( 'game.research.weightBase' ) ,
|
||||
emptech_priority ) AS emptech_weight
|
||||
FROM emp.technologies_v2
|
||||
FROM emp.technologies
|
||||
WHERE emptech_state = 'RESEARCH';
|
||||
|
||||
/*
|
||||
|
|
@ -450,8 +450,8 @@ CREATE VIEW emp.research_total_weights_view
|
|||
* technology_buildings The buildings which are unlocked when the
|
||||
* technology is implemented
|
||||
*/
|
||||
DROP VIEW IF EXISTS emp.technologies_v2_view CASCADE;
|
||||
CREATE VIEW emp.technologies_v2_view
|
||||
DROP VIEW IF EXISTS emp.technologies_view CASCADE;
|
||||
CREATE VIEW emp.technologies_view
|
||||
AS SELECT empire_id ,
|
||||
emp.technology_make_identifier( empire_id , _name_str.name , emptech_visible ) AS emptech_id ,
|
||||
emptech_state ,
|
||||
|
|
@ -497,7 +497,7 @@ CREATE VIEW emp.technologies_v2_view
|
|||
ELSE
|
||||
''
|
||||
END ) AS technology_buildings
|
||||
FROM emp.technologies_v2
|
||||
FROM emp.technologies
|
||||
INNER JOIN emp.technology_visibility_view
|
||||
USING ( technology_name_id , empire_id )
|
||||
INNER JOIN defs.technologies _tech
|
||||
|
|
@ -514,5 +514,5 @@ CREATE VIEW emp.technologies_v2_view
|
|||
ON _descr_str.id = _tech.technology_description_id;
|
||||
|
||||
GRANT SELECT
|
||||
ON emp.technologies_v2_view
|
||||
ON emp.technologies_view
|
||||
TO :dbuser;
|
||||
|
|
|
|||
|
|
@ -479,7 +479,7 @@ AS $$
|
|||
UNION SELECT bv.*
|
||||
FROM tech.buildings_view bv
|
||||
INNER JOIN emp.planets ep ON ep.planet_id = $1
|
||||
INNER JOIN emp.technologies_v2 _emptech
|
||||
INNER JOIN emp.technologies _emptech
|
||||
USING ( technology_name_id , empire_id )
|
||||
WHERE emptech_state = 'KNOWN'
|
||||
) AS bv , (
|
||||
|
|
@ -530,7 +530,7 @@ AS $$
|
|||
UNION SELECT bv.*
|
||||
FROM tech.ships_view bv
|
||||
INNER JOIN emp.planets ep ON ep.planet_id = $1
|
||||
INNER JOIN emp.technologies_v2 t
|
||||
INNER JOIN emp.technologies t
|
||||
USING ( empire_id , technology_name_id )
|
||||
WHERE emptech_state = 'KNOWN'
|
||||
) AS bv , (
|
||||
|
|
@ -712,7 +712,7 @@ BEGIN
|
|||
FROM tech.ships s
|
||||
INNER JOIN tech.buildables b
|
||||
ON b.name_id = s.buildable_id
|
||||
LEFT OUTER JOIN emp.technologies_v2 t
|
||||
LEFT OUTER JOIN emp.technologies t
|
||||
ON t.empire_id = e_id AND t.technology_name_id = b.technology_name_id
|
||||
AND t.emptech_state = 'KNOWN'
|
||||
WHERE s.buildable_id = s_id;
|
||||
|
|
@ -778,7 +778,7 @@ BEGIN
|
|||
FROM tech.buildings s
|
||||
INNER JOIN tech.buildables b
|
||||
ON b.name_id = s.buildable_id
|
||||
LEFT OUTER JOIN emp.technologies_v2 t
|
||||
LEFT OUTER JOIN emp.technologies t
|
||||
ON t.empire_id = e_id AND t.technology_name_id = b.technology_name_id
|
||||
AND t.emptech_state = 'KNOWN'
|
||||
WHERE s.buildable_id = b_id;
|
||||
|
|
|
|||
|
|
@ -1198,7 +1198,7 @@ GRANT SELECT ON bugs.dump_main_view TO :dbuser;
|
|||
CREATE VIEW bugs.dump_research_view
|
||||
AS SELECT et.empire_id , tst.name AS name , et.emptech_state AS state ,
|
||||
et.emptech_points AS points , et.emptech_priority AS priority
|
||||
FROM emp.technologies_v2 et
|
||||
FROM emp.technologies et
|
||||
INNER JOIN defs.strings tst ON tst.id = et.technology_name_id;
|
||||
|
||||
GRANT SELECT ON bugs.dump_research_view TO :dbuser;
|
||||
|
|
@ -1360,4 +1360,4 @@ CREATE VIEW bugs.dump_ships_view
|
|||
INNER JOIN defs.strings sn ON sn.id = s.ship_id
|
||||
ORDER BY s.ship_id;
|
||||
|
||||
GRANT SELECT ON bugs.dump_ships_view TO :dbuser;
|
||||
GRANT SELECT ON bugs.dump_ships_view TO :dbuser;
|
||||
|
|
|
|||
Reference in a new issue