1.1 --- a/conf/postgresql/schema.sql Tue May 10 16:47:33 2016 +0200
1.2 +++ b/conf/postgresql/schema.sql Tue May 10 20:58:25 2016 +0200
1.3 @@ -152,12 +152,12 @@
1.4 quota varchar not null,
1.5 user_group varchar not null,
1.6 quota_limit varchar not null,
1.7 - primary key(user_group)
1.8 + primary key(quota, user_group)
1.9 );
1.10
1.11 create table user_groups (
1.12 quota varchar not null,
1.13 store_user varchar not null,
1.14 user_group varchar not null,
1.15 - primary key(store_user, user_group)
1.16 + primary key(quota, store_user, user_group)
1.17 );
2.1 --- a/tests/test_resource_invitation_constraints_quota.sh Tue May 10 16:47:33 2016 +0200
2.2 +++ b/tests/test_resource_invitation_constraints_quota.sh Tue May 10 20:58:25 2016 +0200
2.3 @@ -6,6 +6,7 @@
2.4 USER2="mailto:resource-car-fiat500@example.com"
2.5 SENDER="mailto:paul.boddie@example.com"
2.6 QUOTA=cars
2.7 +OTHER_QUOTA=rooms
2.8
2.9 mkdir -p "$PREFS/$USER1"
2.10 echo 'Europe/Oslo' > "$PREFS/$USER1/TZID"
2.11 @@ -24,6 +25,7 @@
2.12 EOF
2.13
2.14 "$SET_QUOTA_LIMIT" "$QUOTA" '*' 'PT1H' $SET_QUOTA_LIMIT_ARGS
2.15 +"$SET_QUOTA_LIMIT" "$OTHER_QUOTA" '*' 'PT1H' $SET_QUOTA_LIMIT_ARGS
2.16
2.17 "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/fb-request-car.txt" 2>> $ERROR \
2.18 | "$SHOWMAIL" \