SSDM-4824: test data base forward ported from stage 16.05

SVN: 37791

openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/PersonDAOTest.java

@@ -87,7 +87,7 @@ public final class PersonDAOTest extends AbstractDAOTest
         personDAO.createPerson(testPerson2);
         personDAO.createPerson(testPerson3);
         final List<PersonPE> persons = personDAO.listPersons();
-        assertEquals(13, persons.size());
+        assertEquals(15, persons.size());
         final PersonPE testPersonFromDB = personDAO.getPerson(testPerson.getId());
         assertEquals(testPerson, testPersonFromDB);
         final PersonPE testPersonFromDB2 = personDAO.getPerson(testPerson2.getId());

openbis/sourceTest/sql/postgresql/159/045=persons.tsv

@@ -8,3 +8,5 @@
 8	Jane	Doe test role	test_v3	ganime.akin@in.active	1	2008-11-05 09:18:10.581+01	\N	\\xaced00057372004163682e73797374656d73782e636973642e6f70656e6269732e67656e657269632e7368617265642e62617369632e64746f2e446973706c617953657474696e677300000000000000010200035a001575736557696c64636172645365617263684d6f64654c000e636f6c756d6e53657474696e677374000f4c6a6176612f7574696c2f4d61703b4c000f73656374696f6e53657474696e677371007e0001787001737200176a6176612e7574696c2e4c696e6b6564486173684d617034c04e5c106cc0fb0200015a000b6163636573734f72646572787200116a6176612e7574696c2e486173684d61700507dac1c31660d103000246000a6c6f6164466163746f724900097468726573686f6c6478703f4000000000000c7708000000100000000078007371007e00043f4000000000000c7708000000100000000078	t
 9	John	Power User	poweruser	poweruser@o.o	1	2008-11-05 09:18:10.581+01	\N	\\xaced00057372004163682e73797374656d73782e636973642e6f70656e6269732e67656e657269632e7368617265642e62617369632e64746f2e446973706c617953657474696e677300000000000000010200035a001575736557696c64636172645365617263684d6f64654c000e636f6c756d6e53657474696e677374000f4c6a6176612f7574696c2f4d61703b4c000f73656374696f6e53657474696e677371007e0001787001737200176a6176612e7574696c2e4c696e6b6564486173684d617034c04e5c106cc0fb0200015a000b6163636573734f72646572787200116a6176612e7574696c2e486173684d61700507dac1c31660d103000246000a6c6f6164466163746f724900097468726573686f6c6478703f4000000000000c7708000000100000000078007371007e00043f4000000000000c7708000000100000000078	t
 10	John	Admin	admin	admin@o.o	1	2008-11-05 09:18:10.581+01	\N	\\xaced00057372004163682e73797374656d73782e636973642e6f70656e6269732e67656e657269632e7368617265642e62617369632e64746f2e446973706c617953657474696e677300000000000000010200035a001575736557696c64636172645365617263684d6f64654c000e636f6c756d6e53657474696e677374000f4c6a6176612f7574696c2f4d61703b4c000f73656374696f6e53657474696e677371007e0001787001737200176a6176612e7574696c2e4c696e6b6564486173684d617034c04e5c106cc0fb0200015a000b6163636573734f72646572787200116a6176612e7574696c2e486173684d61700507dac1c31660d103000246000a6c6f6164466163746f724900097468726573686f6c6478703f4000000000000c7708000000100000000078007371007e00043f4000000000000c7708000000100000000078	t
+11  John  Homeless  homeless  admin@o.o \N  2008-11-05 09:18:10.581+01  \N  \\xaced00057372004163682e73797374656d73782e636973642e6f70656e6269732e67656e657269632e7368617265642e62617369632e64746f2e446973706c617953657474696e677300000000000000010200035a001575736557696c64636172645365617263684d6f64654c000e636f6c756d6e53657474696e677374000f4c6a6176612f7574696c2f4d61703b4c000f73656374696f6e53657474696e677371007e0001787001737200176a6176612e7574696c2e4c696e6b6564486173684d617034c04e5c106cc0fb0200015a000b6163636573734f72646572787200116a6176612e7574696c2e486173684d61700507dac1c31660d103000246000a6c6f6164466163746f724900097468726573686f6c6478703f4000000000000c7708000000100000000078007371007e00043f4000000000000c7708000000100000000078 t
+12  John  ObserverCISD  observer_cisd observer_cisd@o.o 1 2008-11-05 09:18:10.581+01  \N  \\xaced00057372004163682e73797374656d73782e636973642e6f70656e6269732e67656e657269632e7368617265642e62617369632e64746f2e446973706c617953657474696e677300000000000000010200035a001575736557696c64636172645365617263684d6f64654c000e636f6c756d6e53657474696e677374000f4c6a6176612f7574696c2f4d61703b4c000f73656374696f6e53657474696e677371007e0001787001737200176a6176612e7574696c2e4c696e6b6564486173684d617034c04e5c106cc0fb0200015a000b6163636573734f72646572787200116a6176612e7574696c2e486173684d61700507dac1c31660d103000246000a6c6f6164466163746f724900097468726573686f6c6478703f4000000000000c7708000000100000000078007371007e00043f4000000000000c7708000000100000000078 t
\ No newline at end of file

openbis/sourceTest/sql/postgresql/159/052=role_assignments.tsv

@@ -11,3 +11,7 @@
 11	ADMIN	1	8	2	2008-11-05 09:18:11.471+01	\N
 12	POWER_USER	2	9	2	2008-11-05 09:18:11.471+01	\N
 13	ADMIN	2	10	2	2008-11-05 09:18:11.471+01	\N
+14  POWER_USER  1 11  2 2008-11-05 09:18:11.471+01  \N
+15  OBSERVER  1 12  2 2008-11-05 09:18:11.471+01  \N
+16  ADMIN 2 12  2 2008-11-05 09:18:11.471+01  \N
+17  ADMIN 2 11  2 2008-11-05 09:18:11.471+01  \N
\ No newline at end of file

openbis/sourceTest/sql/postgresql/159/schema-159.sql

@@ -1761,14 +1761,14 @@ SELECT pg_catalog.setval('metaproject_id_seq', 5, true);
 SELECT pg_catalog.setval('mtpt_id_seq', 31, true);
 SELECT pg_catalog.setval('operation_executions_id_seq', 1, false);
 SELECT pg_catalog.setval('perm_id_seq', 1035, true);
-SELECT pg_catalog.setval('person_id_seq', 10, true);
+SELECT pg_catalog.setval('person_id_seq', 100, true);
 SELECT pg_catalog.setval('post_registration_dataset_queue_id_seq', 1, true);
 SELECT pg_catalog.setval('project_id_seq', 7, true);
 SELECT pg_catalog.setval('project_relationships_history_id_seq', 1, false);
 SELECT pg_catalog.setval('property_type_id_seq', 28, true);
 SELECT pg_catalog.setval('query_id_seq', 1, false);
 SELECT pg_catalog.setval('relationship_type_id_seq', 3, true);
-SELECT pg_catalog.setval('role_assignment_id_seq', 13, true);
+SELECT pg_catalog.setval('role_assignment_id_seq', 100, true);
 SELECT pg_catalog.setval('sample_code_seq', 8, true);
 SELECT pg_catalog.setval('sample_id_seq', 1061, true);
 SELECT pg_catalog.setval('sample_property_id_seq', 53, true);