Make use of the newish planet id from stats

[ndwebbie.git] / database / functions / planets.sql

diff --git a/database/functions/planets.sql b/database/functions/planets.sql
index 2276518f13781b9a7a425b033ca7d9654db216c9..d6d190ec0564cc5d06a2a80cef76da7f5f0e6cc3 100644 (file)
--- a/database/functions/planets.sql
+++ b/database/functions/planets.sql
@@ -6,30 +6,6 @@ CREATE OR REPLACE FUNCTION planetcoords(id integer, tick integer, OUT x integer,
     AS $_$SELECT x,y,z FROM planet_stats WHERE pid = $1 AND (tick >= $2  OR tick =( SELECT max(tick) FROM planet_stats))  ORDER BY tick ASC LIMIT 1$_$
     LANGUAGE sql STABLE;
 
-CREATE OR REPLACE FUNCTION find_planet_id(_ruler text, _planet text, _race race) RETURNS integer
-    AS $_$
-DECLARE
-       p RECORD;
-       id INTEGER;
-       thread INTEGER;
-BEGIN
-       SELECT pid, race INTO p FROM planets WHERE ruler = _ruler AND planet = _planet;
-       IF FOUND THEN
-               IF _race <> p.race THEN
-                       UPDATE planets SET race = _race WHERE pid = p.pid;
-               END IF;
-               id := p.pid;
-       ELSE
-               INSERT INTO forum_threads (fbid,subject,uid) VALUES(-2, _ruler || ' OF ' || _planet, -3)
-                       RETURNING ftid INTO thread;
-               INSERT INTO planets(ruler,planet,race,ftid) VALUES(_ruler,_planet,_race,thread)
-                       RETURNING pid INTO id;
-       END IF;
-       RETURN id;
-END;
-$_$
-    LANGUAGE plpgsql;
-
 CREATE OR REPLACE FUNCTION find_alliance_id(alli text) RETURNS integer
     AS $_$
 DECLARE