diff --git a/openbis/sourceTest/sql/postgresql/060/034=persons.tsv b/openbis/sourceTest/sql/postgresql/060/034=persons.tsv
index 706f8ab52dd5f2b4caa81c2429f32337f87ac39d..0af3910f3bc846c5b357ccaa66729d947bed48f3 100644
--- a/openbis/sourceTest/sql/postgresql/060/034=persons.tsv
+++ b/openbis/sourceTest/sql/postgresql/060/034=persons.tsv
@@ -1,4 +1,4 @@
1 System User system 1 \N 2008-11-05 09:18:00.622+01 \N \\254\\355\\000\\005sr\\000Ach.systemsx.cisd.openbis.generic.shared.basic.dto.DisplaySettings\\000\\000\\000\\000\\000\\000\\000\\001\\002\\000\\003Z\\000\\025useWildcardSearchModeL\\000\\016columnSettingst\\000\\017Ljava/util/Map;L\\000\\017sectionSettingsq\\000~\\000\\001xp\\000sr\\000\\027java.util.LinkedHashMap4\\300N\\\\\\020l\\300\\373\\002\\000\\001Z\\000\\013accessOrderxr\\000\\021java.util.HashMap\\005\\007\\332\\301\\303\\026`\\321\\003\\000\\002F\\000\\012loadFactorI\\000\\011thresholdxp?@\\000\\000\\000\\000\\000\\014w\\010\\000\\000\\000\\020\\000\\000\\000\\000x\\000sq\\000~\\000\\004?@\\000\\000\\000\\000\\000\\014w\\010\\000\\000\\000\\020\\000\\000\\000\\000x
-2 John Doe test franz-josef.elmer@systemsx.ch 1 1 2008-11-05 09:18:10.581+01 \N \\254\\355\\000\\005sr\\000Ach.systemsx.cisd.openbis.generic.shared.basic.dto.DisplaySettings\\000\\000\\000\\000\\000\\000\\000\\001\\002\\000\\006Z\\000)displayCustomColumnDebuggingErrorMessagesZ\\000\\025useWildcardSearchModeL\\000\\016columnSettingst\\000\\017Ljava/util/Map;L\\000\\020dropDownSettingsq\\000~\\000\\001L\\000\\035realNumberFormatingParameterst\\000QLch/systemsx/cisd/openbis/generic/shared/basic/dto/RealNumberFormatingParameters;L\\000\\017sectionSettingsq\\000~\\000\\001xp\\000\\001sr\\000\\027java.util.LinkedHashMap4\\300N\\\\\\020l\\300\\373\\002\\000\\001Z\\000\\013accessOrderxr\\000\\021java.util.HashMap\\005\\007\\332\\301\\303\\026`\\321\\003\\000\\002F\\000\\012loadFactorI\\000\\011thresholdxp?@\\000\\000\\000\\000\\000\\014w\\010\\000\\000\\000\\020\\000\\000\\000\\000x\\000sq\\000~\\000\\005?@\\000\\000\\000\\000\\000\\014w\\010\\000\\000\\000\\020\\000\\000\\000\\001t\\000\\036sample-typemain_sample_browsert\\000\\005(all)xsr\\000Och.systemsx.cisd.openbis.generic.shared.basic.dto.RealNumberFormatingParameters\\000\\000\\000\\000\\000\\000\\000\\001\\002\\000\\003Z\\000\\020formatingEnabledI\\000\\011precisionZ\\000\\012scientificxp\\001\\000\\000\\000\\004\\000sq\\000~\\000\\005?@\\000\\000\\000\\000\\000\\014w\\010\\000\\000\\000\\020\\000\\000\\000\\002t\\0002sample-sectiongeneric-sample-viewer-CONTROL_LAYOUTsr\\000\\021java.lang.Boolean\\315 r\\200\\325\\234\\372\\356\\002\\000\\001Z\\000\\005valuexp\\001t\\0007derived-samples-sectiongeneric-sample-viewer-CELL_PLATEq\\000~\\000\\017x
3 John Observer observer observer@o.o 1 1 2008-11-05 09:18:10.581+01 \N \\254\\355\\000\\005sr\\000Ach.systemsx.cisd.openbis.generic.shared.basic.dto.DisplaySettings\\000\\000\\000\\000\\000\\000\\000\\001\\002\\000\\003Z\\000\\025useWildcardSearchModeL\\000\\016columnSettingst\\000\\017Ljava/util/Map;L\\000\\017sectionSettingsq\\000~\\000\\001xp\\001sr\\000\\027java.util.LinkedHashMap4\\300N\\\\\\020l\\300\\373\\002\\000\\001Z\\000\\013accessOrderxr\\000\\021java.util.HashMap\\005\\007\\332\\301\\303\\026`\\321\\003\\000\\002F\\000\\012loadFactorI\\000\\011thresholdxp?@\\000\\000\\000\\000\\000\\014w\\010\\000\\000\\000\\020\\000\\000\\000\\000x\\000sq\\000~\\000\\004?@\\000\\000\\000\\000\\000\\014w\\010\\000\\000\\000\\020\\000\\000\\000\\000x
4 ETL Server etlserver franz-josef.elmer@systemsx.ch 1 1 2008-11-05 09:18:10.581+01 \N \\254\\355\\000\\005sr\\000Ach.systemsx.cisd.openbis.generic.shared.basic.dto.DisplaySettings\\000\\000\\000\\000\\000\\000\\000\\001\\002\\000\\003Z\\000\\025useWildcardSearchModeL\\000\\016columnSettingst\\000\\017Ljava/util/Map;L\\000\\017sectionSettingsq\\000~\\000\\001xp\\001sr\\000\\027java.util.LinkedHashMap4\\300N\\\\\\020l\\300\\373\\002\\000\\001Z\\000\\013accessOrderxr\\000\\021java.util.HashMap\\005\\007\\332\\301\\303\\026`\\321\\003\\000\\002F\\000\\012loadFactorI\\000\\011thresholdxp?@\\000\\000\\000\\000\\000\\014w\\010\\000\\000\\000\\020\\000\\000\\000\\000x\\000sq\\000~\\000\\004?@\\000\\000\\000\\000\\000\\014w\\010\\000\\000\\000\\020\\000\\000\\000\\000x
+2 John Doe test franz-josef.elmer@systemsx.ch 1 1 2008-11-05 09:18:10.581+01 \N \\254\\355\\000\\005sr\\000Ach.systemsx.cisd.openbis.generic.shared.basic.dto.DisplaySettings\\000\\000\\000\\000\\000\\000\\000\\001\\002\\000\\010Z\\000)displayCustomColumnDebuggingErrorMessagesZ\\000\\025useWildcardSearchModeL\\000\\016columnSettingst\\000\\017Ljava/util/Map;L\\000\\020dropDownSettingsq\\000~\\000\\001L\\000\\026panelCollapsedSettingsq\\000~\\000\\001L\\000\\021panelSizeSettingsq\\000~\\000\\001L\\000\\035realNumberFormatingParameterst\\000QLch/systemsx/cisd/openbis/generic/shared/basic/dto/RealNumberFormatingParameters;L\\000\\013tabSettingsq\\000~\\000\\001xp\\000\\001sr\\000\\027java.util.LinkedHashMap4\\300N\\\\\\020l\\300\\373\\002\\000\\001Z\\000\\013accessOrderxr\\000\\021java.util.HashMap\\005\\007\\332\\301\\303\\026`\\321\\003\\000\\002F\\000\\012loadFactorI\\000\\011thresholdxp?@\\000\\000\\000\\000\\000\\014w\\010\\000\\000\\000\\020\\000\\000\\000\\000x\\000sq\\000~\\000\\005?@\\000\\000\\000\\000\\000\\014w\\010\\000\\000\\000\\020\\000\\000\\000\\001t\\000\\036sample-typemain_sample_browsert\\000\\012CELL_PLATExsq\\000~\\000\\005?@\\000\\000\\000\\000\\000\\014w\\010\\000\\000\\000\\020\\000\\000\\000\\000xsq\\000~\\000\\005?@\\000\\000\\000\\000\\000\\014w\\010\\000\\000\\000\\020\\000\\000\\000\\002t\\000\\025left_panel_CELL_PLATEsr\\000\\021java.lang.Integer\\022\\342\\240\\244\\367\\201\\2078\\002\\000\\001I\\000\\005valuexr\\000\\020java.lang.Number\\206\\254\\225\\035\\013\\224\\340\\213\\002\\000\\000xp\\000\\000\\001,t\\000\\031left_panel_DILUTION_PLATEsq\\000~\\000\\015\\000\\000\\001,xsr\\000Och.systemsx.cisd.openbis.generic.shared.basic.dto.RealNumberFormatingParameters\\000\\000\\000\\000\\000\\000\\000\\001\\002\\000\\003Z\\000\\020formatingEnabledI\\000\\011precisionZ\\000\\012scientificxp\\001\\000\\000\\000\\004\\000sq\\000~\\000\\005?@\\000\\000\\000\\000\\000\\014w\\010\\000\\000\\000\\020\\000\\000\\000\\002t\\000#generic_sample_viewerDILUTION_PLATEt\\000\\030container-sample-sectiont\\000\\037generic_sample_viewerCELL_PLATEt\\000\\026parent-samples-sectionx
diff --git a/openbis/sourceTest/sql/postgresql/060/040=sample_properties.tsv b/openbis/sourceTest/sql/postgresql/060/040=sample_properties.tsv
index 2f5ed9dbb6f05c4a8c214d430e458a4da76d0164..0272266ec62d3323b07ab2ce3978426012920255 100644
--- a/openbis/sourceTest/sql/postgresql/060/040=sample_properties.tsv
+++ b/openbis/sourceTest/sql/postgresql/060/040=sample_properties.tsv
@@ -24,3 +24,14 @@
37 1042 12 \N \N 2 2009-08-18 17:54:10.841346+02 2009-08-18 17:54:11.378+02 34
38 1043 11 \N \N 2 2009-08-18 17:54:36.563339+02 2009-08-18 17:54:36.826+02 41
39 1043 12 \N \N 2 2009-08-18 17:54:36.563339+02 2009-08-18 17:54:36.827+02 35
+40 988 9 4711 \N 2 2010-10-25 14:48:35.941121+02 2010-10-25 14:48:36.141+02 \N
+41 988 7 test comment \N 2 2010-10-25 14:48:35.941121+02 2010-10-25 14:48:36.143+02 \N
+42 988 8 \N 6 2 2010-10-25 14:48:35.941121+02 2010-10-25 14:48:36.144+02 \N
+44 980 13 42 \N 2 2010-10-25 14:49:35.990096+02 2010-10-25 14:49:35.990096+02 \N
+45 981 13 42 \N 2 2010-10-25 14:49:35.990096+02 2010-10-25 14:49:35.990096+02 \N
+46 977 13 42 \N 2 2010-10-25 14:49:35.990096+02 2010-10-25 14:49:35.990096+02 \N
+47 978 13 42 \N 2 2010-10-25 14:49:35.990096+02 2010-10-25 14:49:35.990096+02 \N
+48 1019 13 42 \N 2 2010-10-25 14:49:35.990096+02 2010-10-25 14:49:35.990096+02 \N
+49 1020 13 42 \N 2 2010-10-25 14:49:35.990096+02 2010-10-25 14:49:35.990096+02 \N
+50 1021 13 42 \N 2 2010-10-25 14:49:35.990096+02 2010-10-25 14:49:35.990096+02 \N
+43 979 13 49 \N 2 2010-10-25 14:49:35.990096+02 2010-10-25 14:50:02.171+02 \N
diff --git a/openbis/sourceTest/sql/postgresql/060/042=sample_type_property_types.tsv b/openbis/sourceTest/sql/postgresql/060/042=sample_type_property_types.tsv
index 27d7dafd2c0ce67dcba8ea5905c2784a21b2b668..322a609778d2a0c98a734d415ed22edf18d83f08 100644
--- a/openbis/sourceTest/sql/postgresql/060/042=sample_type_property_types.tsv
+++ b/openbis/sourceTest/sql/postgresql/060/042=sample_type_property_types.tsv
@@ -7,3 +7,4 @@
9 3 8 f f 2 2009-02-09 12:07:34.437531+01 f \N 3 f \N
11 3 26 f f 2 2009-08-18 17:53:21.362126+02 f \N 4 f \N
12 3 25 f f 2 2009-08-18 17:53:26.884669+02 f \N 5 f \N
+13 2 5 f f 2 2010-10-25 14:49:35.990096+02 t \N 1 f \N
diff --git a/openbis/sourceTest/sql/postgresql/060/044=samples.tsv b/openbis/sourceTest/sql/postgresql/060/044=samples.tsv
index 705b287196eae086ad9767b73403648149137530..6ebbcc642eaa7d562e96f2a1b4c3ec32071deae3 100644
--- a/openbis/sourceTest/sql/postgresql/060/044=samples.tsv
+++ b/openbis/sourceTest/sql/postgresql/060/044=samples.tsv
@@ -966,12 +966,10 @@
974 CL-3V 5 2008-11-05 09:21:44.03+01 2 \N \N 1 \N 2009-03-18 10:50:19.475958+01 \N 200811050944030-973
975 A01 6 2008-11-05 09:21:44.03+01 2 \N \N 1 974 2009-03-18 10:50:19.475958+01 \N 200811050944030-974
976 A02 6 2008-11-05 09:21:44.03+01 2 \N \N 1 974 2009-03-18 10:50:19.475958+01 \N 200811050944030-975
-979 3V-125 2 2008-11-05 09:21:45.092+01 2 \N \N 1 \N 2009-03-18 10:50:19.475958+01 \N 200811050945092-976
980 3V-126 2 2008-11-05 09:21:45.092+01 2 \N \N 1 \N 2009-03-18 10:50:19.475958+01 \N 200811050945092-977
981 DP 2 2008-11-05 09:21:45.092+01 2 \N 1 \N \N 2009-03-18 10:50:19.475958+01 \N 200811050945092-978
986 3VCP5 3 2008-11-05 09:21:46.559+01 2 \N \N 1 \N 2009-03-18 10:50:19.475958+01 3 200811050946559-979
987 3VCP6 3 2008-11-05 09:21:46.559+01 2 \N \N 1 \N 2009-03-18 10:50:19.475958+01 4 200811050946559-980
-988 3VCP7 3 2008-11-05 09:21:46.559+01 2 \N \N 1 \N 2009-03-18 10:50:19.475958+01 \N 200811050946559-981
989 3VCP8 3 2008-11-05 09:21:46.559+01 2 \N \N 1 \N 2009-03-18 10:50:19.475958+01 \N 200811050946559-982
982 3VCP1 3 2008-11-05 09:21:46.559+01 2 1 \N 1 \N 2009-03-18 10:50:19.475958+01 2 200811050946559-983
990 3VRP1A 4 2008-11-05 09:21:47.449+01 2 1 \N 1 \N 2009-03-18 10:50:19.475958+01 \N 200811050947449-984
@@ -1008,6 +1006,7 @@
1020 DP1-B 2 2008-11-05 09:22:29.035+01 2 \N \N 1 \N 2009-03-18 10:50:19.475958+01 \N 200811050929035-1015
1021 DP2-A 2 2008-11-05 09:22:29.035+01 2 \N \N 1 \N 2009-03-18 10:50:19.475958+01 \N 200811050929035-1016
1023 CP1-A1 3 2008-11-05 09:22:29.94+01 2 \N \N 1 \N 2009-03-18 10:50:19.475958+01 8 200811050929940-1017
+979 3V-125 2 2008-11-05 09:21:45.092+01 2 \N \N 1 \N 2010-10-25 14:50:02.17+02 \N 200811050945092-976
1024 CP1-A2 3 2008-11-05 09:22:29.94+01 2 \N \N 1 \N 2009-03-18 10:50:19.475958+01 8 200811050929940-1018
1025 CP1-B1 3 2008-11-05 09:22:29.94+01 2 \N \N 1 \N 2009-03-18 10:50:19.475958+01 8 200811050929940-1019
1026 CP2-A1 3 2008-11-05 09:22:29.94+01 2 \N \N 1 \N 2009-03-18 10:50:19.475958+01 8 200811050929940-1020
@@ -1018,3 +1017,4 @@
1044 CP-TEST-3 3 2009-02-09 12:16:25.616106+01 2 \N \N 1 \N 2009-03-18 10:50:19.475958+01 20 200902091225616-1027
1042 CP-TEST-1 3 2009-02-09 12:09:19.327518+01 2 \N \N 1 \N 2009-08-18 17:54:11.56+02 18 200902091219327-1025
1043 CP-TEST-2 3 2009-02-09 12:09:50.077973+01 2 \N \N 1 \N 2009-08-18 17:54:36.929+02 19 200902091250077-1026
+988 3VCP7 3 2008-11-05 09:21:46.559+01 2 \N \N 1 \N 2010-10-25 14:48:36.245+02 \N 200811050946559-981
diff --git a/openbis/sourceTest/sql/postgresql/060/schema-060.sql b/openbis/sourceTest/sql/postgresql/060/schema-060.sql
index 86f944d67dc38f3c5bc6818ad9042fe391562aa8..23f2fda2896e1bf9351e199878f9d7295ccf2cda 100644
--- a/openbis/sourceTest/sql/postgresql/060/schema-060.sql
+++ b/openbis/sourceTest/sql/postgresql/060/schema-060.sql
@@ -16,7 +16,7 @@ CREATE DOMAIN column_label AS character varying(128);
CREATE DOMAIN data_store_service_kind AS character varying(40)
CONSTRAINT data_store_service_kind_check CHECK (((VALUE)::text = ANY (ARRAY[('PROCESSING'::character varying)::text, ('QUERIES'::character varying)::text])));
CREATE DOMAIN data_store_service_reporting_plugin_type AS character varying(40)
- CONSTRAINT data_store_service_reporting_plugin_type_check CHECK (((VALUE)::text = ANY ((ARRAY['TABLE_MODEL'::character varying, 'DSS_LINK'::character varying])::text[])));
+ CONSTRAINT data_store_service_reporting_plugin_type_check CHECK (((VALUE)::text = ANY (ARRAY[('TABLE_MODEL'::character varying)::text, ('DSS_LINK'::character varying)::text])));
CREATE DOMAIN description_2000 AS character varying(2000);
CREATE DOMAIN event_type AS character varying(40)
CONSTRAINT event_type_check CHECK (((VALUE)::text = ANY (ARRAY[('DELETION'::character varying)::text, ('INVALIDATION'::character varying)::text, ('MOVEMENT'::character varying)::text])));
@@ -936,7 +936,7 @@ CREATE SEQUENCE sample_property_id_seq
NO MAXVALUE
NO MINVALUE
CACHE 1;
-SELECT pg_catalog.setval('sample_property_id_seq', 39, true);
+SELECT pg_catalog.setval('sample_property_id_seq', 50, true);
CREATE SEQUENCE sample_relationship_id_seq
START WITH 1
INCREMENT BY 1
@@ -1022,5 +1022,5 @@ CREATE SEQUENCE stpt_id_seq
NO MAXVALUE
NO MINVALUE
CACHE 1;
-SELECT pg_catalog.setval('stpt_id_seq', 12, true);
+SELECT pg_catalog.setval('stpt_id_seq', 13, true);