projects/lwb6
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Renamed technology tables and views

Browse source 
* Removed the _v2 suffix from some tables and views.
This commit is contained in:
Emmanuel BENOîT 2012-04-09 15:01:04 +02:00
parent ab04752169
commit 071257786c
19 changed files with 82 additions and 82 deletions

8
legacyworlds-server-data/db-structure/tests/admin/040-functions/030-tech/030-uoc-technology-scale.sql
View file

@ -24,11 +24,11 @@ BEGIN;
);
/* Remove foreign key to empires on empire technologies */
ALTER TABLE emp.technologies_v2
ALTER TABLE emp.technologies
DROP CONSTRAINT fk_emptech_empire;
/* Insert records for the new technology, with different states */
INSERT INTO emp.technologies_v2 (
INSERT INTO emp.technologies (
empire_id , technology_name_id , emptech_state ,
emptech_points , emptech_priority
) VALUES (
@ -46,7 +46,7 @@ BEGIN;
SELECT diag_test_name( 'defs.uoc_technology() - Update - Scaling of in-progress research' );
SELECT set_eq( $$
SELECT empire_id , ROUND( emptech_points )::INT
FROM emp.technologies_v2
FROM emp.technologies
WHERE emptech_state = 'RESEARCH'
$$ , $$ VALUES(
1 , 500
@ -55,4 +55,4 @@ BEGIN;
) $$ );
SELECT * FROM finish( );
ROLLBACK;
ROLLBACK;

4
legacyworlds-server-data/db-structure/tests/admin/040-functions/040-empire/010-create-empire.sql
View file

@ -117,7 +117,7 @@ BEGIN;
SELECT diag_test_name( 'emp.create_empire() - Empire technologies have been initialised' );
SELECT set_eq( $$
SELECT technology_name_id , emptech_state::TEXT , emptech_points , emptech_priority
FROM emp.technologies_v2
FROM emp.technologies
WHERE empire_id = _get_emp_name( 'testEmp1' );
$$ , $$ VALUES(
_get_string( 'tech1' ) , 'RESEARCH' , 0.0 , 2
@ -130,4 +130,4 @@ BEGIN;
AND resource_name_id = _get_string( 'natRes1' );
SELECT * FROM finish( );
ROLLBACK;
ROLLBACK;

14
legacyworlds-server-data/db-structure/tests/admin/040-functions/045-empire-research/010-technology-implement.sql
View file

@ -36,20 +36,20 @@ BEGIN;
( _get_string( 'tech3' ) , _get_string( 'tech2' ) );
/* Empire "emp1" has only in-progress research. */
INSERT INTO emp.technologies_v2 ( empire_id , technology_name_id )
INSERT INTO emp.technologies ( empire_id , technology_name_id )
VALUES( _get_emp_name( 'emp1' ) , _get_string( 'tech1' ) );
/* Empire "emp2" has a pending technology. */
INSERT INTO emp.technologies_v2 ( empire_id , technology_name_id , emptech_state , emptech_points , emptech_priority )
INSERT INTO emp.technologies ( empire_id , technology_name_id , emptech_state , emptech_points , emptech_priority )
VALUES( _get_emp_name( 'emp2' ) , _get_string( 'tech1' ) , 'PENDING' , NULL , NULL );
/* Empire "emp3" has implemented 'tech1' and has 'tech2' as pending. */
INSERT INTO emp.technologies_v2 ( empire_id , technology_name_id , emptech_state , emptech_points , emptech_priority )
INSERT INTO emp.technologies ( empire_id , technology_name_id , emptech_state , emptech_points , emptech_priority )
VALUES( _get_emp_name( 'emp3' ) , _get_string( 'tech1' ) , 'KNOWN' , NULL , NULL ) ,
( _get_emp_name( 'emp3' ) , _get_string( 'tech2' ) , 'PENDING' , NULL , NULL );
/* Empire "emp4" has implemented 'tech1' and 'tech2' and has 'tech3' as pending. */
INSERT INTO emp.technologies_v2 ( empire_id , technology_name_id , emptech_state , emptech_points , emptech_priority )
INSERT INTO emp.technologies ( empire_id , technology_name_id , emptech_state , emptech_points , emptech_priority )
VALUES( _get_emp_name( 'emp4' ) , _get_string( 'tech1' ) , 'KNOWN' , NULL , NULL ) ,
( _get_emp_name( 'emp4' ) , _get_string( 'tech2' ) , 'KNOWN' , NULL , NULL ) ,
( _get_emp_name( 'emp4' ) , _get_string( 'tech3' ) , 'PENDING' , NULL , NULL );
@ -72,7 +72,7 @@ BEGIN;
SELECT diag_test_name( 'emp.technology_implement() - Call on pending technology - No new research - Table contents' );
SELECT set_eq( $$
SELECT technology_name_id , emptech_state::TEXT
FROM emp.technologies_v2
FROM emp.technologies
WHERE empire_id = _get_emp_name( 'emp2' )
$$ , $$ VALUES(
_get_string( 'tech1' ) , 'KNOWN'
@ -88,7 +88,7 @@ BEGIN;
SELECT diag_test_name( 'emp.technology_implement() - Call on pending technology - New research - Table contents' );
SELECT set_eq( $$
SELECT technology_name_id , emptech_state::TEXT
FROM emp.technologies_v2
FROM emp.technologies
WHERE empire_id = _get_emp_name( 'emp3' )
$$ , $$ VALUES(
_get_string( 'tech1' ) , 'KNOWN'
@ -107,4 +107,4 @@ BEGIN;
SELECT ok( NOT emp.technology_implement( _get_emp_name( 'emp4' ) , 'tech3' ) );
SELECT * FROM finish( );
ROLLBACK;
ROLLBACK;

4
legacyworlds-server-data/db-structure/tests/admin/040-functions/045-empire-research/030-resprio-update-start.sql
View file

@ -46,7 +46,7 @@ BEGIN;
AS SELECT * FROM _fake_visibility;
/* Insert empire state and data for fake views */
INSERT INTO emp.technologies_v2 (
INSERT INTO emp.technologies (
empire_id , technology_name_id ,
emptech_state , emptech_points , emptech_priority
) VALUES (
@ -102,4 +102,4 @@ BEGIN;
DROP TABLE IF EXISTS rprio_update;
SELECT * FROM finish( );
ROLLBACK;
ROLLBACK;

10
legacyworlds-server-data/db-structure/tests/admin/040-functions/045-empire-research/050-resprio-update-apply.sql
View file

@ -23,7 +23,7 @@ BEGIN;
INSERT INTO defs.technologies ( technology_name_id )
VALUES ( _get_string( 'tech1' ) );
INSERT INTO emp.technologies_v2(
INSERT INTO emp.technologies(
empire_id , technology_name_id ,
emptech_state , emptech_points , emptech_priority
) VALUES (
@ -52,7 +52,7 @@ BEGIN;
SELECT diag_test_name( 'emp.resprio_update_apply() - Applying a valid update - Table contents' );
SELECT set_eq( $$
SELECT empire_id , emptech_priority
FROM emp.technologies_v2
FROM emp.technologies
WHERE technology_name_id = _get_string( 'tech1' );
$$ , $$ VALUES(
_get_emp_name( 'emp1' ) , 1
@ -60,7 +60,7 @@ BEGIN;
_get_emp_name( 'emp2' ) , 2
) $$ );
DELETE FROM rprio_update;
UPDATE emp.technologies_v2
UPDATE emp.technologies
SET emptech_priority = 2
WHERE technology_name_id = _get_string( 'tech1' );
@ -71,7 +71,7 @@ BEGIN;
SELECT diag_test_name( 'emp.resprio_update_apply() - Applying an invalid update - Table contents' );
SELECT set_eq( $$
SELECT empire_id , emptech_priority
FROM emp.technologies_v2
FROM emp.technologies
$$ , $$ VALUES(
_get_emp_name( 'emp1' ) , 2
) , (
@ -79,4 +79,4 @@ BEGIN;
) $$ );
SELECT * FROM finish( );
ROLLBACK;
ROLLBACK;

4
legacyworlds-server-data/db-structure/tests/admin/040-functions/045-empire-research/060-technology-visibility-view.sql
View file

@ -39,7 +39,7 @@ BEGIN;
( _get_string( 'tech6' ) , 1000 );
/* Insert empire state */
INSERT INTO emp.technologies_v2 (
INSERT INTO emp.technologies (
empire_id , technology_name_id ,
emptech_state , emptech_points , emptech_priority
) VALUES (
@ -108,4 +108,4 @@ BEGIN;
SELECT * FROM finish( );
ROLLBACK;
ROLLBACK;

8
legacyworlds-server-data/db-structure/tests/admin/040-functions/045-empire-research/070-research-weights-view.sql
View file

@ -3,13 +3,13 @@
*/
BEGIN;
/* Remove foreign keys from the empire research table */
ALTER TABLE emp.technologies_v2
ALTER TABLE emp.technologies
DROP CONSTRAINT fk_emptech_empire ,
DROP CONSTRAINT fk_emptech_technology;
/* Insert a few records */
DELETE FROM emp.technologies_v2;
INSERT INTO emp.technologies_v2 (
DELETE FROM emp.technologies;
INSERT INTO emp.technologies (
empire_id , technology_name_id ,
emptech_state , emptech_points , emptech_priority
) VALUES
@ -39,4 +39,4 @@ BEGIN;
$$ );
SELECT * FROM finish( );
ROLLBACK;
ROLLBACK;

18
legacyworlds-server-data/db-structure/tests/admin/040-functions/045-empire-research/090-technologies-view.sql
View file

@ -1,5 +1,5 @@
/*
* Unit tests for emp.technologies_v2_view
* Unit tests for emp.technologies_view
*/
BEGIN;
\i utils/strings.sql
@ -54,7 +54,7 @@ BEGIN;
AS SELECT * FROM _fake_deps;
/* Insert empire states and data for fake views */
INSERT INTO emp.technologies_v2 (
INSERT INTO emp.technologies (
empire_id , technology_name_id ,
emptech_state , emptech_points , emptech_priority
) VALUES (
@ -79,14 +79,14 @@ BEGIN;
-- ***** TESTS BEGIN HERE *****
SELECT plan( 3 );
SELECT diag_test_name( 'emp.technologies_v2_view - Known technology' );
SELECT diag_test_name( 'emp.technologies_view - Known technology' );
SELECT set_eq( $$
SELECT emptech_id , emptech_state::TEXT , emptech_visible ,
technology_category , technology_name , technology_description ,
emptech_points , emptech_priority IS NULL AS ep_null ,
emptech_ratio IS NULL AS er_null ,
technology_price , technology_dependencies
FROM emp.technologies_v2_view
FROM emp.technologies_view
WHERE empire_id = _get_emp_name( 'emp1' )
$$ , $$ VALUES(
_get_emp_name( 'emp1' ) || ',tech1,true' , 'KNOWN' , TRUE ,
@ -94,13 +94,13 @@ BEGIN;
456 , TRUE , TRUE , 123 , 'deps are here'
) $$ );
SELECT diag_test_name( 'emp.technologies_v2_view - In-progress, visible technology' );
SELECT diag_test_name( 'emp.technologies_view - In-progress, visible technology' );
SELECT set_eq( $$
SELECT emptech_id , emptech_state::TEXT , emptech_visible ,
technology_category , technology_name , technology_description ,
emptech_points , emptech_priority , emptech_ratio ,
technology_price , technology_dependencies
FROM emp.technologies_v2_view
FROM emp.technologies_view
WHERE empire_id = _get_emp_name( 'emp2' )
$$ , $$ VALUES(
_get_emp_name( 'emp2' ) || ',tech1,true' , 'RESEARCH' , TRUE ,
@ -108,13 +108,13 @@ BEGIN;
228 , 0 , 50 , 123 , 'deps are here'
) $$ );
SELECT diag_test_name( 'emp.technologies_v2_view - In-progress, unknown technology' );
SELECT diag_test_name( 'emp.technologies_view - In-progress, unknown technology' );
SELECT set_eq( $$
SELECT emptech_id , emptech_state::TEXT , emptech_visible ,
technology_category , technology_name IS NULL AS n1 , technology_description IS NULL AS n2 ,
emptech_points IS NULL AS n3 , emptech_priority , emptech_ratio ,
technology_price IS NULL AS n4, technology_dependencies
FROM emp.technologies_v2_view
FROM emp.technologies_view
WHERE empire_id = _get_emp_name( 'emp3' )
$$ , $$ VALUES(
_get_emp_name( 'emp3' ) || ',tech1,false' , 'RESEARCH' , FALSE ,
@ -122,4 +122,4 @@ BEGIN;
TRUE , 1 , 25 , TRUE , 'deps are here'
) $$ );
SELECT * FROM finish( );
ROLLBACK;
ROLLBACK;

8
legacyworlds-server-data/db-structure/tests/user/040-functions/045-empire-research/020-technology-make-identifier.sql
View file

@ -5,10 +5,10 @@ BEGIN;
SELECT plan( 1 );
SELECT diag_test_name( 'emp.technology_make_identifier() - No EXECUTE privilege' );
SELECT throws_ok( $$
SELECT diag_test_name( 'emp.technology_make_identifier() - EXECUTE privilege' );
SELECT lives_ok( $$
SELECT emp.technology_make_identifier( 1 , '' , FALSE );
$$ , 42501 );
$$ );
SELECT * FROM finish( );
ROLLBACK;
ROLLBACK;

8
legacyworlds-server-data/db-structure/tests/user/040-functions/045-empire-research/090-technologies-view.sql
View file

@ -1,15 +1,15 @@
/*
* Test privileges on emp.technologies_v2_view
* Test privileges on emp.technologies_view
*/
BEGIN;
\i utils/strings.sql
SELECT plan( 1 );
SELECT diag_test_name( 'emp.technologies_v2_view - SELECT privilege' );
SELECT diag_test_name( 'emp.technologies_view - SELECT privilege' );
SELECT lives_ok( $$
SELECT * FROM emp.technologies_v2_view;
SELECT * FROM emp.technologies_view;
$$ );
SELECT * FROM finish( );
ROLLBACK;
ROLLBACK;

14
legacyworlds-server-data/db-structure/tests/utils/common-setup/setup-gu-research-get-empires-test.sql
View file

@ -47,7 +47,7 @@ INSERT INTO verse.planet_happiness( planet_id , target , current )
*/
INSERT INTO emp.empires( name_id , cash )
VALUES( _get_emp_name( 'emp1' ) , 100.0 );
INSERT INTO emp.technologies_v2 (
INSERT INTO emp.technologies (
empire_id , technology_name_id ,
emptech_state , emptech_points , emptech_priority )
SELECT _get_emp_name( 'emp1' ) , technology_name_id , 'KNOWN' , NULL , NULL
@ -59,7 +59,7 @@ INSERT INTO emp.technologies_v2 (
*/
INSERT INTO emp.empires( name_id , cash )
VALUES( _get_emp_name( 'emp2' ) , 100.0 );
INSERT INTO emp.technologies_v2 (
INSERT INTO emp.technologies (
empire_id , technology_name_id ,
emptech_state , emptech_points , emptech_priority )
SELECT _get_emp_name( 'emp2' ) , technology_name_id , 'KNOWN' , NULL , NULL
@ -72,7 +72,7 @@ INSERT INTO emp.planets( empire_id , planet_id )
*/
INSERT INTO emp.empires( name_id , cash )
VALUES( _get_emp_name( 'emp3' ) , 100.0 );
INSERT INTO emp.technologies_v2 ( empire_id , technology_name_id )
INSERT INTO emp.technologies ( empire_id , technology_name_id )
SELECT _get_emp_name( 'emp3' ) , technology_name_id
FROM defs.technologies;
@ -82,7 +82,7 @@ INSERT INTO emp.technologies_v2 ( empire_id , technology_name_id )
*/
INSERT INTO emp.empires( name_id , cash )
VALUES( _get_emp_name( 'emp4' ) , 100.0 );
INSERT INTO emp.technologies_v2 ( empire_id , technology_name_id )
INSERT INTO emp.technologies ( empire_id , technology_name_id )
SELECT _get_emp_name( 'emp4' ) , technology_name_id
FROM defs.technologies;
INSERT INTO emp.planets( empire_id , planet_id )
@ -97,7 +97,7 @@ INSERT INTO emp.planets( empire_id , planet_id )
*/
INSERT INTO emp.empires( name_id , cash )
VALUES( _get_emp_name( 'emp5' ) , 100.0 );
INSERT INTO emp.technologies_v2 ( empire_id , technology_name_id )
INSERT INTO emp.technologies ( empire_id , technology_name_id )
SELECT _get_emp_name( 'emp5' ) , technology_name_id
FROM defs.technologies;
INSERT INTO emp.planets( empire_id , planet_id )
@ -117,7 +117,7 @@ INSERT INTO users.vacations ( account_id , since , status )
*/
INSERT INTO emp.empires( name_id , cash )
VALUES( _get_emp_name( 'emp6' ) , 100.0 );
INSERT INTO emp.technologies_v2 ( empire_id , technology_name_id )
INSERT INTO emp.technologies ( empire_id , technology_name_id )
SELECT _get_emp_name( 'emp6' ) , technology_name_id
FROM defs.technologies;
INSERT INTO emp.planets( empire_id , planet_id )
@ -134,4 +134,4 @@ UPDATE sys.updates su
SET update_state = 'PROCESSED' , update_last = 0
FROM emp.empires_updates eu
WHERE eu.update_id = su.update_id
AND eu.name_id = _get_emp_name( 'emp6' );
AND eu.name_id = _get_emp_name( 'emp6' );