# HG changeset patch
# User Tom Gottfried <tom@intevation.de>
# Date 1391695529 -3600
# Node ID 869f54874c3c5002e85d2e51c856f66624f10e45
# Parent  69c8d33a05e8c7a3ab35a25fa22ef4d081bd07f1# Parent  72d0cec59c78ee2543c8230110784405bb896c67
merged

diff -r 72d0cec59c78 -r 869f54874c3c backend/doc/schema/oracle.sql
--- a/backend/doc/schema/oracle.sql	Thu Feb 06 14:47:29 2014 +0100
+++ b/backend/doc/schema/oracle.sql	Thu Feb 06 15:05:29 2014 +0100
@@ -262,7 +262,7 @@
 
 CREATE TABLE rivers (
     id                  NUMBER(38,0) NOT NULL,
-    uuid                CHAR(37 CHAR),
+    model_uuid          CHAR(37 CHAR),
     official_number     NUMBER(38,0),
     km_up               NUMBER(38,0) DEFAULT 0 NOT NULL,
     name                VARCHAR2(255) NOT NULL UNIQUE,
diff -r 72d0cec59c78 -r 869f54874c3c backend/doc/schema/postgresql.sql
--- a/backend/doc/schema/postgresql.sql	Thu Feb 06 14:47:29 2014 +0100
+++ b/backend/doc/schema/postgresql.sql	Thu Feb 06 15:05:29 2014 +0100
@@ -12,7 +12,7 @@
 
 CREATE TABLE rivers (
     id              int PRIMARY KEY NOT NULL,
-    uuid            CHAR(37),
+    model_uuid      CHAR(37),
     official_number int8,
     name            VARCHAR(256)    NOT NULL UNIQUE,
     km_up           BOOLEAN         NOT NULL DEFAULT true,