From 6a66c878487b23c8cc2624b8475a61d5fd4c1dd1 Mon Sep 17 00:00:00 2001 From: Michael Andreen Date: Wed, 9 Jan 2008 23:20:59 +0100 Subject: [PATCH] oops, need to do things in the right order --- database/scans.sql | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/database/scans.sql b/database/scans.sql index f68b4b6..b561e33 100644 --- a/database/scans.sql +++ b/database/scans.sql @@ -19,12 +19,6 @@ ALTER TABLE fleets RENAME COLUMN landing_tick TO tick; ALTER TABLE fleet_ships RENAME COLUMN fleet TO id; - -CREATE TABLE fleet_scans ( - id INTEGER PRIMARY KEY REFERENCES fleets(id), - scan INTEGER NOT NULL REFERENCES scans(id) -) WITHOUT OIDS; - ALTER TABLE scans DROP COLUMN scan; ALTER TABLE scans DROP COLUMN type; @@ -43,6 +37,11 @@ ALTER TABLE scans ADD COLUMN id SERIAL PRIMARY KEY; ALTER TABLE scans ADD UNIQUE (scan_id, tick, groupscan); +CREATE TABLE fleet_scans ( + id INTEGER PRIMARY KEY REFERENCES fleets(id), + scan INTEGER NOT NULL REFERENCES scans(id) +) WITHOUT OIDS; + CREATE OR REPLACE FUNCTION planetid(x integer, y integer, z integer, tick integer) RETURNS integer AS $_$SELECT id FROM planet_stats WHERE x = $1 AND y = $2 AND z = $3 AND (tick >= $4 OR tick =( SELECT max(tick) FROM planet_stats)) ORDER BY tick ASC LIMIT 1$_$ LANGUAGE sql STABLE; -- 2.39.2