Block entering coords right after shuffle

[ndwebbie.git] / database / ndawn.sql

diff --git a/database/ndawn.sql b/database/ndawn.sql
index 40722c273a4661093ab401d87bf6a81519e9f909..54ede3a5c10269a2c966b8f2863d1630813f239f 100644 (file)
--- a/database/ndawn.sql
+++ b/database/ndawn.sql
@@ -773,6 +773,8 @@ CREATE TABLE planets (
 )
 WITH (fillfactor='50');
 
+ALTER TABLE planets ADD COLUMN id text UNIQUE NOT NULL;
+
 
 ALTER TABLE planets OWNER TO ndawn;
 
@@ -1001,7 +1003,7 @@ CREATE TABLE users (
     uid integer NOT NULL,
     username citext NOT NULL,
     pid integer,
-    password text NOT NULL,
+    password text,
     attack_points numeric(3,0) DEFAULT 0 NOT NULL,
     defense_points numeric(4,1) DEFAULT 0 NOT NULL,
     scan_points numeric(5,0) DEFAULT 0 NOT NULL,
@@ -3060,14 +3062,6 @@ ALTER TABLE ONLY planets
     ADD CONSTRAINT planets_pkey PRIMARY KEY (pid);
 
 
---
--- Name: planets_ruler_key; Type: CONSTRAINT; Schema: public; Owner: ndawn
---
-
-ALTER TABLE ONLY planets
-    ADD CONSTRAINT planets_ruler_key UNIQUE (ruler, planet);
-
-
 --
 -- Name: raid_access_pkey; Type: CONSTRAINT; Schema: public; Owner: ndawn
 --
@@ -3475,6 +3469,8 @@ CREATE TRIGGER update_forum_thread_posts AFTER INSERT OR DELETE OR UPDATE ON for
 
 CREATE TRIGGER update_planet AFTER UPDATE ON users FOR EACH ROW EXECUTE PROCEDURE update_user_planet();
 
+CREATE TRIGGER update_user_planet_check BEFORE UPDATE ON users FOR EACH ROW WHEN (NEW.pid IS NOT NULL AND OLD.pid IS NULL) EXECUTE PROCEDURE update_user_planet_check();
+
 
 --
 -- Name: update_wiki_page; Type: TRIGGER; Schema: public; Owner: ndawn