Use composite primary key for RegistrarContact (#761)

* Use composite primary key for RegistrarPoc

* Increase the serial number for flyway file and resolve comments

* Rebase on HEAD

* Rebase on HEAD

db/src/main/resources/sql/flyway/V50__use_composite_key_for_registrar_poc.sql

@@ -0,0 +1,20 @@
+-- Copyright 2020 The Nomulus Authors. All Rights Reserved.
+--
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+
+alter table "RegistrarPoc" add column registrar_id text;
+
+alter table "RegistrarPoc" drop constraint "RegistrarPoc_pkey";
+
+alter table "RegistrarPoc"
+    add constraint "RegistrarPoc_pkey" primary key (registrar_id, email_address);

db/src/main/resources/sql/schema/db-schema.sql.generated

@@ -518,6 +518,7 @@ create sequence history_id_sequence start 1 increment 1;
 
     create table "RegistrarPoc" (
        email_address text not null,
+        registrar_id text not null,
         allowed_to_set_registry_lock_password boolean not null,
         fax_number text,
         gae_user_id text,
@@ -530,7 +531,7 @@ create sequence history_id_sequence start 1 increment 1;
         visible_in_domain_whois_as_abuse boolean not null,
         visible_in_whois_as_admin boolean not null,
         visible_in_whois_as_tech boolean not null,
-        primary key (email_address)
+        primary key (email_address, registrar_id)
     );
 
     create table "RegistryLock" (

db/src/main/resources/sql/schema/nomulus.golden.sql

@@ -777,7 +777,8 @@ CREATE TABLE public."RegistrarPoc" (
     visible_in_domain_whois_as_abuse boolean NOT NULL,
     visible_in_whois_as_admin boolean NOT NULL,
     visible_in_whois_as_tech boolean NOT NULL,
-    registry_lock_email_address text
+    registry_lock_email_address text,
+    registrar_id text NOT NULL
 );
 
 
@@ -1154,7 +1155,7 @@ ALTER TABLE ONLY public."PremiumList"
 --
 
 ALTER TABLE ONLY public."RegistrarPoc"
-    ADD CONSTRAINT "RegistrarPoc_pkey" PRIMARY KEY (email_address);
+    ADD CONSTRAINT "RegistrarPoc_pkey" PRIMARY KEY (registrar_id, email_address);
 
 
 --