# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1462906705 -7200
# Node ID 0d4e3b79f680ae783e6792e8e8969f608e69d1eb
# Parent  406daa6b57b8328f1b5693924f1ec0860ba7409f
Fixed primary keys for journal group and limit tables.
Added a test that illustrates the requirement for a fix.

diff -r 406daa6b57b8 -r 0d4e3b79f680 conf/postgresql/schema.sql
--- a/conf/postgresql/schema.sql	Tue May 10 16:47:33 2016 +0200
+++ b/conf/postgresql/schema.sql	Tue May 10 20:58:25 2016 +0200
@@ -152,12 +152,12 @@
     quota varchar not null,
     user_group varchar not null,
     quota_limit varchar not null,
-    primary key(user_group)
+    primary key(quota, user_group)
 );
 
 create table user_groups (
     quota varchar not null,
     store_user varchar not null,
     user_group varchar not null,
-    primary key(store_user, user_group)
+    primary key(quota, store_user, user_group)
 );
diff -r 406daa6b57b8 -r 0d4e3b79f680 tests/test_resource_invitation_constraints_quota.sh
--- a/tests/test_resource_invitation_constraints_quota.sh	Tue May 10 16:47:33 2016 +0200
+++ b/tests/test_resource_invitation_constraints_quota.sh	Tue May 10 20:58:25 2016 +0200
@@ -6,6 +6,7 @@
 USER2="mailto:resource-car-fiat500@example.com"
 SENDER="mailto:paul.boddie@example.com"
 QUOTA=cars
+OTHER_QUOTA=rooms
 
 mkdir -p "$PREFS/$USER1"
 echo 'Europe/Oslo' > "$PREFS/$USER1/TZID"
@@ -24,6 +25,7 @@
 EOF
 
 "$SET_QUOTA_LIMIT" "$QUOTA" '*' 'PT1H' $SET_QUOTA_LIMIT_ARGS
+"$SET_QUOTA_LIMIT" "$OTHER_QUOTA" '*' 'PT1H' $SET_QUOTA_LIMIT_ARGS
 
   "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/fb-request-car.txt" 2>> $ERROR \
 | "$SHOWMAIL" \