# HG changeset patch
# User Tom Gottfried <tom@intevation.de>
# Date 1465218912 -7200
# Node ID 3a2ed18fe13c4b9865a463ae0f58ad58bef6aac1
# Parent  248d7bca85853c643ef14cf410cb7054cdceb25a# Parent  60c6c5910ea99727d2e0659d9c72a96f5f5a4045
Merged.

diff -r 60c6c5910ea9 -r 3a2ed18fe13c db_schema/stammdaten_data.sql
--- a/db_schema/stammdaten_data.sql	Thu Jun 02 12:27:34 2016 +0200
+++ b/db_schema/stammdaten_data.sql	Mon Jun 06 15:15:12 2016 +0200
@@ -19,6 +19,53 @@
 SET search_path = stammdaten, pg_catalog;
 
 --
+-- TOC entry 4703 (class 0 OID 535781)
+-- Dependencies: 269
+-- Data for Name: netz_betreiber; Type: TABLE DATA; Schema: stammdaten; Owner: lada
+--
+
+COPY netz_betreiber (id, netzbetreiber, idf_netzbetreiber, is_bmn, mailverteiler, aktiv, zust_mst_id) FROM stdin;
+X	ausländ. Messnetze	\N	t	X	t	\N
+PA	Park	R	t	PA	t	\N
+A	BfS (Spuren)	A	t	A	t	\N
+B	vTI	\N	t	B	t	\N
+D	BfS/ZdB	D	t	D	t	\N
+E	BfE	\N	t	E	t	\N
+F	FhG	\N	t	F	f	\N
+G	BfG	\N	t	G	t	\N
+H	BSH	\N	t	H	t	\N
+I	BfS (LSt. AB)	\N	t	I	t	\N
+L	BfS (LSt. TW ...)	\N	t	L	t	\N
+M	BMU	\N	t	M	t	\N
+N	MRI	\N	t	N	t	\N
+S	Sonstige	\N	t	S	t	\N
+T	PTB	\N	t	T	t	\N
+U	BfS (ABI)	U	t	U	t	\N
+W	DWD	W	t	W	t	\N
+Z	BfS (ODL)	Z	t	Z	t	\N
+01	Schleswig-Holstein	a	f	01	t	\N
+02	Hamburg	b	f	02	t	\N
+03	Niedersachsen	c	f	03	t	\N
+04	Bremen	d	f	04	t	\N
+05	Nordrhein-Westfalen	e	f	05	t	\N
+06	Hessen	f	f	06	t	\N
+07	Rheinland-Pfalz	g	f	07	t	\N
+08	Baden-Württemberg	h	f	08	t	\N
+09	Bayern	i	f	09	t	\N
+10	Saarland	j	f	10	t	\N
+11	Berlin	k	f	11	t	\N
+12	Brandenburg	l	f	12	t	\N
+13	Mecklenburg-Vorpommern	m	f	13	t	\N
+14	Sachsen	n	f	14	t	\N
+15	Sachsen-Anhalt	o	f	15	t	\N
+16	Thüringen	p	f	16	t	\N
+18	Endlager (Bundesaufsicht)	r	f	18	t	\N
+19	ZdB-Testnetz	s	f	19	t	\N
+17	Bundeswehr	q	f	17	t	\N
+\.
+
+
+--
 -- TOC entry 4694 (class 0 OID 535751)
 -- Dependencies: 259
 -- Data for Name: mess_stelle; Type: TABLE DATA; Schema: stammdaten; Owner: lada
@@ -238,53 +285,6 @@
 
 
 --
--- TOC entry 4703 (class 0 OID 535781)
--- Dependencies: 269
--- Data for Name: netz_betreiber; Type: TABLE DATA; Schema: stammdaten; Owner: lada
---
-
-COPY netz_betreiber (id, netzbetreiber, idf_netzbetreiber, is_bmn, mailverteiler, aktiv, zust_mst_id) FROM stdin;
-X	ausländ. Messnetze	\N	t	X	t	\N
-PA	Park	R	t	PA	t	\N
-A	BfS (Spuren)	A	t	A	t	\N
-B	vTI	\N	t	B	t	\N
-D	BfS/ZdB	D	t	D	t	\N
-E	BfE	\N	t	E	t	\N
-F	FhG	\N	t	F	f	\N
-G	BfG	\N	t	G	t	\N
-H	BSH	\N	t	H	t	\N
-I	BfS (LSt. AB)	\N	t	I	t	\N
-L	BfS (LSt. TW ...)	\N	t	L	t	\N
-M	BMU	\N	t	M	t	\N
-N	MRI	\N	t	N	t	\N
-S	Sonstige	\N	t	S	t	\N
-T	PTB	\N	t	T	t	\N
-U	BfS (ABI)	U	t	U	t	\N
-W	DWD	W	t	W	t	\N
-Z	BfS (ODL)	Z	t	Z	t	\N
-01	Schleswig-Holstein	a	f	01	t	\N
-02	Hamburg	b	f	02	t	\N
-03	Niedersachsen	c	f	03	t	\N
-04	Bremen	d	f	04	t	\N
-05	Nordrhein-Westfalen	e	f	05	t	\N
-06	Hessen	f	f	06	t	\N
-07	Rheinland-Pfalz	g	f	07	t	\N
-08	Baden-Württemberg	h	f	08	t	\N
-09	Bayern	i	f	09	t	\N
-10	Saarland	j	f	10	t	\N
-11	Berlin	k	f	11	t	\N
-12	Brandenburg	l	f	12	t	\N
-13	Mecklenburg-Vorpommern	m	f	13	t	\N
-14	Sachsen	n	f	14	t	\N
-15	Sachsen-Anhalt	o	f	15	t	\N
-16	Thüringen	p	f	16	t	\N
-18	Endlager (Bundesaufsicht)	r	f	18	t	\N
-19	ZdB-Testnetz	s	f	19	t	\N
-17	Bundeswehr	q	f	17	t	\N
-\.
-
-
---
 -- TOC entry 4670 (class 0 OID 535676)
 -- Dependencies: 232
 -- Data for Name: auth; Type: TABLE DATA; Schema: stammdaten; Owner: lada
@@ -36944,8 +36944,8 @@
 92	9	ortId	Ort-Id	100	f	9
 93	9	eGemId	Gem-Id	80	f	10
 94	9	eGem	Gemeinde	200	f	11
-95	13	hpNr	Proben-Nr	100	f	1
-96	13	npNr	NP-Nr	50	f	2
+95	13	hauptprobenNr	Proben-Nr	100	f	1
+96	13	nebenprobenNr	NP-Nr	50	f	2
 97	13	statusD	Status-Zeit	120	f	3
 98	13	statusSt	Stufe	40	f	4
 99	13	statusW	Status	100	f	5
@@ -36960,8 +36960,8 @@
 108	13	eGemId	E-Gem Id	80	f	14
 109	13	eGem	E-Gemeinde	200	f	15
 110	13	probeId	Probe_Id	100	f	0
-111	15	hpNr	Proben-Nr	100	f	1
-112	15	npNr	NP-Nr	50	f	2
+111	15	hauptprobenNr	Proben-Nr	100	f	1
+112	15	nebenprobenNr	NP-Nr	50	f	2
 113	15	statusD	Status-Zeit	120	f	3
 114	15	statusSt	Stufe	40	f	4
 115	15	statusW	Status	100	f	5
diff -r 60c6c5910ea9 -r 3a2ed18fe13c db_schema/stammdaten_schema.sql
--- a/db_schema/stammdaten_schema.sql	Thu Jun 02 12:27:34 2016 +0200
+++ b/db_schema/stammdaten_schema.sql	Mon Jun 06 15:15:12 2016 +0200
@@ -140,7 +140,7 @@
 
 CREATE TABLE mess_stelle (
     id character varying(5) PRIMARY KEY,
-    netzbetreiber_id character varying(2) NOT NULL,
+    netzbetreiber_id character varying(2) NOT NULL REFERENCES netz_betreiber,
     beschreibung character varying(300),
     mess_stelle character varying(60),
     mst_typ character varying(1),