diff --git a/server-application-server/source/sql/generic/197/schema-197.sql b/server-application-server/source/sql/generic/197/schema-197.sql
index c0270112da46cc7d08dbff47190ee6d7c04374e2..36810b9ebdf57bebf6fedfc70d19050643dc1859 100644
--- a/server-application-server/source/sql/generic/197/schema-197.sql
+++ b/server-application-server/source/sql/generic/197/schema-197.sql
@@ -16,7 +16,7 @@ CREATE TABLE ATTACHMENT_CONTENTS (ID TECH_ID NOT NULL,VALUE FILE NOT NULL);
CREATE TABLE EXPERIMENT_PROPERTIES (ID TECH_ID NOT NULL,EXPE_ID TECH_ID NOT NULL,ETPT_ID TECH_ID NOT NULL,VALUE TEXT_VALUE, CVTE_ID TECH_ID, MATE_PROP_ID TECH_ID, SAMP_PROP_ID TECH_ID, PERS_ID_REGISTERER TECH_ID NOT NULL, REGISTRATION_TIMESTAMP TIME_STAMP_DFL NOT NULL DEFAULT CURRENT_TIMESTAMP, PERS_ID_AUTHOR TECH_ID NOT NULL, MODIFICATION_TIMESTAMP TIME_STAMP DEFAULT CURRENT_TIMESTAMP, EXPE_FROZEN BOOLEAN_CHAR NOT NULL DEFAULT 'F', TSVECTOR_DOCUMENT TSVECTOR NOT NULL, IS_UNIQUE BOOLEAN_CHAR NOT NULL DEFAULT 'F', INTEGER_ARRAY_VALUE LONG_VALUE[], REAL_ARRAY_VALUE DOUBLE_VALUE[], STRING_ARRAY_VALUE TEXT_VALUE[], TIMESTAMP_ARRAY_VALUE TIME_STAMP[], JSON_VALUE JSONB);
CREATE TABLE EXPERIMENT_PROPERTIES_HISTORY (ID TECH_ID NOT NULL, EXPE_ID TECH_ID NOT NULL, ETPT_ID TECH_ID NOT NULL, VALUE TEXT_VALUE, VOCABULARY_TERM IDENTIFIER, MATERIAL IDENTIFIER, SAMPLE IDENTIFIER, PERS_ID_AUTHOR TECH_ID NOT NULL, VALID_FROM_TIMESTAMP TIME_STAMP NOT NULL, VALID_UNTIL_TIMESTAMP TIME_STAMP DEFAULT CURRENT_TIMESTAMP, INTEGER_ARRAY_VALUE LONG_VALUE[], REAL_ARRAY_VALUE DOUBLE_VALUE[], STRING_ARRAY_VALUE TEXT_VALUE[], TIMESTAMP_ARRAY_VALUE TIME_STAMP[], JSON_VALUE JSONB);
CREATE TABLE EXPERIMENT_TYPES (ID TECH_ID NOT NULL,CODE CODE NOT NULL,DESCRIPTION DESCRIPTION_2000, MODIFICATION_TIMESTAMP TIME_STAMP DEFAULT CURRENT_TIMESTAMP, VALIDATION_SCRIPT_ID TECH_ID, META_DATA JSONB, IS_MANAGED_INTERNALLY BOOLEAN_CHAR NOT NULL DEFAULT 'F');
-CREATE TABLE EXPERIMENT_TYPE_PROPERTY_TYPES (ID TECH_ID NOT NULL,EXTY_ID TECH_ID NOT NULL,PRTY_ID TECH_ID NOT NULL,IS_MANDATORY BOOLEAN_CHAR NOT NULL DEFAULT 'F',IS_MANAGED_INTERNALLY BOOLEAN_CHAR NOT NULL DEFAULT 'F',PERS_ID_REGISTERER TECH_ID NOT NULL,REGISTRATION_TIMESTAMP TIME_STAMP_DFL NOT NULL DEFAULT CURRENT_TIMESTAMP, ORDINAL ORDINAL_INT NOT NULL, SECTION DESCRIPTION_2000,SCRIPT_ID TECH_ID,IS_SHOWN_EDIT BOOLEAN_CHAR NOT NULL DEFAULT 'T',SHOW_RAW_VALUE BOOLEAN_CHAR NOT NULL DEFAULT 'F', IS_UNIQUE BOOLEAN_CHAR NOT NULL DEFAULT 'F', IS_MANAGED_INTERNALLY_NAMESPACE BOOLEAN_CHAR NOT NULL DEFAULT 'F');
+CREATE TABLE EXPERIMENT_TYPE_PROPERTY_TYPES (ID TECH_ID NOT NULL,EXTY_ID TECH_ID NOT NULL,PRTY_ID TECH_ID NOT NULL,IS_MANDATORY BOOLEAN_CHAR NOT NULL DEFAULT 'F',IS_MANAGED_INTERNALLY BOOLEAN_CHAR NOT NULL DEFAULT 'F',PERS_ID_REGISTERER TECH_ID NOT NULL,REGISTRATION_TIMESTAMP TIME_STAMP_DFL NOT NULL DEFAULT CURRENT_TIMESTAMP, ORDINAL ORDINAL_INT NOT NULL, SECTION DESCRIPTION_2000,SCRIPT_ID TECH_ID,IS_SHOWN_EDIT BOOLEAN_CHAR NOT NULL DEFAULT 'T',SHOW_RAW_VALUE BOOLEAN_CHAR NOT NULL DEFAULT 'F', IS_UNIQUE BOOLEAN_CHAR NOT NULL DEFAULT 'F', IS_MANAGED_INTERNALLY_NAMESPACE BOOLEAN_CHAR NOT NULL DEFAULT 'F', PATTERN TEXT_VALUE, PATTERN_TYPE PATTERN_TYPE, PATTERN_REGEX TEXT_VALUE);
CREATE TABLE EXTERNAL_DATA (ID TECH_ID NOT NULL,SHARE_ID CODE,SIZE ORDINAL_INT,LOCATION VARCHAR(1024) NOT NULL,FFTY_ID TECH_ID NOT NULL,LOTY_ID TECH_ID NOT NULL,CVTE_ID_STOR_FMT TECH_ID NOT NULL,IS_COMPLETE BOOLEAN_CHAR_OR_UNKNOWN NOT NULL DEFAULT 'U',CVTE_ID_STORE TECH_ID, STATUS ARCHIVING_STATUS NOT NULL DEFAULT 'AVAILABLE', PRESENT_IN_ARCHIVE BOOLEAN_CHAR DEFAULT 'F', SPEED_HINT INTEGER NOT NULL DEFAULT -50, STORAGE_CONFIRMATION BOOLEAN_CHAR NOT NULL DEFAULT 'F', H5_FOLDERS BOOLEAN_CHAR NOT NULL, H5AR_FOLDERS BOOLEAN_CHAR NOT NULL, ARCHIVING_REQUESTED BOOLEAN_CHAR NOT NULL DEFAULT 'F');
CREATE TABLE FILE_FORMAT_TYPES (ID TECH_ID NOT NULL,CODE CODE NOT NULL,DESCRIPTION DESCRIPTION_2000);
CREATE TABLE GRID_CUSTOM_COLUMNS (ID TECH_ID NOT NULL, CODE VARCHAR(200) NOT NULL, LABEL column_label NOT NULL, DESCRIPTION DESCRIPTION_2000,REGISTRATION_TIMESTAMP TIME_STAMP_DFL NOT NULL DEFAULT CURRENT_TIMESTAMP, PERS_ID_REGISTERER TECH_ID NOT NULL, MODIFICATION_TIMESTAMP TIME_STAMP DEFAULT CURRENT_TIMESTAMP, EXPRESSION GRID_EXPRESSION NOT NULL, IS_PUBLIC BOOLEAN NOT NULL, GRID_ID GRID_ID NOT NULL);
@@ -27,21 +27,21 @@ CREATE TABLE MATERIALS (ID TECH_ID NOT NULL,CODE CODE NOT NULL,MATY_ID TECH_ID N
CREATE TABLE MATERIAL_PROPERTIES (ID TECH_ID NOT NULL,MATE_ID TECH_ID NOT NULL,MTPT_ID TECH_ID NOT NULL,VALUE TEXT_VALUE,REGISTRATION_TIMESTAMP TIME_STAMP_DFL NOT NULL DEFAULT CURRENT_TIMESTAMP, PERS_ID_AUTHOR TECH_ID NOT NULL, MODIFICATION_TIMESTAMP TIME_STAMP DEFAULT CURRENT_TIMESTAMP, PERS_ID_REGISTERER TECH_ID NOT NULL,CVTE_ID TECH_ID, MATE_PROP_ID TECH_ID, TSVECTOR_DOCUMENT TSVECTOR NOT NULL, IS_UNIQUE BOOLEAN_CHAR NOT NULL DEFAULT 'F', INTEGER_ARRAY_VALUE LONG_VALUE[], REAL_ARRAY_VALUE DOUBLE_VALUE[], STRING_ARRAY_VALUE TEXT_VALUE[], TIMESTAMP_ARRAY_VALUE TIME_STAMP[], JSON_VALUE JSONB);
CREATE TABLE MATERIAL_PROPERTIES_HISTORY (ID TECH_ID NOT NULL, MATE_ID TECH_ID NOT NULL, MTPT_ID TECH_ID NOT NULL, VALUE TEXT_VALUE, VOCABULARY_TERM IDENTIFIER, MATERIAL IDENTIFIER, PERS_ID_AUTHOR TECH_ID NOT NULL, VALID_FROM_TIMESTAMP TIME_STAMP NOT NULL, VALID_UNTIL_TIMESTAMP TIME_STAMP DEFAULT CURRENT_TIMESTAMP, INTEGER_ARRAY_VALUE LONG_VALUE[], REAL_ARRAY_VALUE DOUBLE_VALUE[], STRING_ARRAY_VALUE TEXT_VALUE[], TIMESTAMP_ARRAY_VALUE TIME_STAMP[], JSON_VALUE JSONB);
CREATE TABLE MATERIAL_TYPES (ID TECH_ID NOT NULL,CODE CODE NOT NULL,DESCRIPTION DESCRIPTION_2000, MODIFICATION_TIMESTAMP TIME_STAMP DEFAULT CURRENT_TIMESTAMP, VALIDATION_SCRIPT_ID TECH_ID, IS_MANAGED_INTERNALLY BOOLEAN_CHAR NOT NULL DEFAULT 'F');
-CREATE TABLE MATERIAL_TYPE_PROPERTY_TYPES (ID TECH_ID NOT NULL,MATY_ID TECH_ID NOT NULL,PRTY_ID TECH_ID NOT NULL,IS_MANDATORY BOOLEAN_CHAR NOT NULL DEFAULT 'F',IS_MANAGED_INTERNALLY BOOLEAN_CHAR NOT NULL DEFAULT 'F',REGISTRATION_TIMESTAMP TIME_STAMP_DFL NOT NULL DEFAULT CURRENT_TIMESTAMP,PERS_ID_REGISTERER TECH_ID NOT NULL, ORDINAL ORDINAL_INT NOT NULL, SECTION DESCRIPTION_2000,SCRIPT_ID TECH_ID,IS_SHOWN_EDIT BOOLEAN_CHAR NOT NULL DEFAULT 'T',SHOW_RAW_VALUE BOOLEAN_CHAR NOT NULL DEFAULT 'F', IS_UNIQUE BOOLEAN_CHAR NOT NULL DEFAULT 'F', IS_MANAGED_INTERNALLY_NAMESPACE BOOLEAN_CHAR NOT NULL DEFAULT 'F');
+CREATE TABLE MATERIAL_TYPE_PROPERTY_TYPES (ID TECH_ID NOT NULL,MATY_ID TECH_ID NOT NULL,PRTY_ID TECH_ID NOT NULL,IS_MANDATORY BOOLEAN_CHAR NOT NULL DEFAULT 'F',IS_MANAGED_INTERNALLY BOOLEAN_CHAR NOT NULL DEFAULT 'F',REGISTRATION_TIMESTAMP TIME_STAMP_DFL NOT NULL DEFAULT CURRENT_TIMESTAMP,PERS_ID_REGISTERER TECH_ID NOT NULL, ORDINAL ORDINAL_INT NOT NULL, SECTION DESCRIPTION_2000,SCRIPT_ID TECH_ID,IS_SHOWN_EDIT BOOLEAN_CHAR NOT NULL DEFAULT 'T',SHOW_RAW_VALUE BOOLEAN_CHAR NOT NULL DEFAULT 'F', IS_UNIQUE BOOLEAN_CHAR NOT NULL DEFAULT 'F', IS_MANAGED_INTERNALLY_NAMESPACE BOOLEAN_CHAR NOT NULL DEFAULT 'F', PATTERN TEXT_VALUE, PATTERN_TYPE PATTERN_TYPE, PATTERN_REGEX TEXT_VALUE);
CREATE TABLE DATA_SET_TYPES (ID TECH_ID NOT NULL,CODE CODE NOT NULL,DESCRIPTION DESCRIPTION_2000, MODIFICATION_TIMESTAMP TIME_STAMP DEFAULT CURRENT_TIMESTAMP, MAIN_DS_PATTERN VARCHAR(300), MAIN_DS_PATH VARCHAR(1000), DELETION_DISALLOW BOOLEAN_CHAR DEFAULT 'F', VALIDATION_SCRIPT_ID TECH_ID, META_DATA JSONB, IS_MANAGED_INTERNALLY BOOLEAN_CHAR NOT NULL DEFAULT 'F');
CREATE TABLE PERSONS (ID TECH_ID NOT NULL,FIRST_NAME TEXT,LAST_NAME TEXT,USER_ID USER_ID NOT NULL,EMAIL EMAIL_VALUE,SPACE_ID TECH_ID,REGISTRATION_TIMESTAMP TIME_STAMP_DFL NOT NULL DEFAULT CURRENT_TIMESTAMP,PERS_ID_REGISTERER TECH_ID, DISPLAY_SETTINGS FILE, IS_ACTIVE BOOLEAN DEFAULT TRUE);
CREATE TABLE PROJECTS (ID TECH_ID NOT NULL,PERM_ID CODE NOT NULL,CODE CODE NOT NULL,SPACE_ID TECH_ID NOT NULL,PERS_ID_LEADER TECH_ID,DESCRIPTION TEXT_VALUE,PERS_ID_REGISTERER TECH_ID NOT NULL,REGISTRATION_TIMESTAMP TIME_STAMP_DFL NOT NULL DEFAULT CURRENT_TIMESTAMP, MODIFICATION_TIMESTAMP TIME_STAMP DEFAULT CURRENT_TIMESTAMP, PERS_ID_MODIFIER TECH_ID, VERSION INTEGER DEFAULT 0, FROZEN BOOLEAN_CHAR NOT NULL DEFAULT 'F', FROZEN_FOR_EXP BOOLEAN_CHAR NOT NULL DEFAULT 'F', FROZEN_FOR_SAMP BOOLEAN_CHAR NOT NULL DEFAULT 'F', SPACE_FROZEN BOOLEAN_CHAR NOT NULL DEFAULT 'F');
-CREATE TABLE PROPERTY_TYPES (ID TECH_ID NOT NULL,CODE CODE NOT NULL,DESCRIPTION DESCRIPTION_2000 NOT NULL,LABEL COLUMN_LABEL NOT NULL,DATY_ID TECH_ID NOT NULL,REGISTRATION_TIMESTAMP TIME_STAMP_DFL NOT NULL DEFAULT CURRENT_TIMESTAMP,PERS_ID_REGISTERER TECH_ID NOT NULL,COVO_ID TECH_ID,IS_MANAGED_INTERNALLY BOOLEAN_CHAR NOT NULL DEFAULT 'F', MATY_PROP_ID TECH_ID, SATY_PROP_ID TECH_ID, SCHEMA TEXT_VALUE, TRANSFORMATION TEXT_VALUE, META_DATA JSONB, IS_MULTI_VALUE BOOLEAN_CHAR NOT NULL DEFAULT 'F', PATTERN TEXT_VALUE, PATTERN_TYPE PATTERN_TYPE, PATTERN_REGEX TEXT_VALUE);
+CREATE TABLE PROPERTY_TYPES (ID TECH_ID NOT NULL,CODE CODE NOT NULL,DESCRIPTION DESCRIPTION_2000 NOT NULL,LABEL COLUMN_LABEL NOT NULL,DATY_ID TECH_ID NOT NULL,REGISTRATION_TIMESTAMP TIME_STAMP_DFL NOT NULL DEFAULT CURRENT_TIMESTAMP,PERS_ID_REGISTERER TECH_ID NOT NULL,COVO_ID TECH_ID,IS_MANAGED_INTERNALLY BOOLEAN_CHAR NOT NULL DEFAULT 'F', MATY_PROP_ID TECH_ID, SATY_PROP_ID TECH_ID, SCHEMA TEXT_VALUE, TRANSFORMATION TEXT_VALUE, META_DATA JSONB, IS_MULTI_VALUE BOOLEAN_CHAR NOT NULL DEFAULT 'F');
CREATE TABLE ROLE_ASSIGNMENTS (ID TECH_ID NOT NULL,ROLE_CODE AUTHORIZATION_ROLE NOT NULL,SPACE_ID TECH_ID, PROJECT_ID TECH_ID, PERS_ID_GRANTEE TECH_ID, AG_ID_GRANTEE TECH_ID, PERS_ID_REGISTERER TECH_ID NOT NULL,REGISTRATION_TIMESTAMP TIME_STAMP_DFL NOT NULL DEFAULT CURRENT_TIMESTAMP);
CREATE TABLE SAMPLES_ALL (ID TECH_ID NOT NULL,PERM_ID CODE NOT NULL, sample_identifier sample_identifier, CODE CODE NOT NULL, EXPE_ID TECH_ID,SATY_ID TECH_ID NOT NULL,REGISTRATION_TIMESTAMP TIME_STAMP_DFL NOT NULL DEFAULT CURRENT_TIMESTAMP,MODIFICATION_TIMESTAMP TIME_STAMP DEFAULT CURRENT_TIMESTAMP,PERS_ID_REGISTERER TECH_ID NOT NULL,DEL_ID TECH_ID, ORIG_DEL TECH_ID, SPACE_ID TECH_ID, SAMP_ID_PART_OF TECH_ID, PERS_ID_MODIFIER TECH_ID, code_unique_check character varying(300), subcode_unique_check character varying(300), VERSION INTEGER DEFAULT 0, PROJ_ID TECH_ID, FROZEN BOOLEAN_CHAR NOT NULL DEFAULT 'F', FROZEN_FOR_COMP BOOLEAN_CHAR NOT NULL DEFAULT 'F', FROZEN_FOR_CHILDREN BOOLEAN_CHAR NOT NULL DEFAULT 'F', FROZEN_FOR_PARENTS BOOLEAN_CHAR NOT NULL DEFAULT 'F', FROZEN_FOR_DATA BOOLEAN_CHAR NOT NULL DEFAULT 'F', SPACE_FROZEN BOOLEAN_CHAR NOT NULL DEFAULT 'F', PROJ_FROZEN BOOLEAN_CHAR NOT NULL DEFAULT 'F', EXPE_FROZEN BOOLEAN_CHAR NOT NULL DEFAULT 'F', CONT_FROZEN BOOLEAN_CHAR NOT NULL DEFAULT 'F', TSVECTOR_DOCUMENT TSVECTOR NOT NULL, META_DATA JSONB);
CREATE TABLE SAMPLE_PROPERTIES (ID TECH_ID NOT NULL,SAMP_ID TECH_ID NOT NULL,STPT_ID TECH_ID NOT NULL,VALUE TEXT_VALUE,CVTE_ID TECH_ID,MATE_PROP_ID TECH_ID,SAMP_PROP_ID TECH_ID,PERS_ID_REGISTERER TECH_ID NOT NULL, REGISTRATION_TIMESTAMP TIME_STAMP_DFL NOT NULL DEFAULT CURRENT_TIMESTAMP, PERS_ID_AUTHOR TECH_ID NOT NULL, MODIFICATION_TIMESTAMP TIME_STAMP DEFAULT CURRENT_TIMESTAMP, SAMP_FROZEN BOOLEAN_CHAR NOT NULL DEFAULT 'F', TSVECTOR_DOCUMENT TSVECTOR NOT NULL, IS_UNIQUE BOOLEAN_CHAR NOT NULL DEFAULT 'F', INTEGER_ARRAY_VALUE LONG_VALUE[], REAL_ARRAY_VALUE DOUBLE_VALUE[], STRING_ARRAY_VALUE TEXT_VALUE[], TIMESTAMP_ARRAY_VALUE TIME_STAMP[], JSON_VALUE JSONB);
CREATE TABLE SAMPLE_PROPERTIES_HISTORY (ID TECH_ID NOT NULL, SAMP_ID TECH_ID NOT NULL, STPT_ID TECH_ID NOT NULL, VALUE TEXT_VALUE, VOCABULARY_TERM IDENTIFIER, MATERIAL IDENTIFIER, SAMPLE IDENTIFIER, PERS_ID_AUTHOR TECH_ID NOT NULL, VALID_FROM_TIMESTAMP TIME_STAMP NOT NULL, VALID_UNTIL_TIMESTAMP TIME_STAMP DEFAULT CURRENT_TIMESTAMP, INTEGER_ARRAY_VALUE LONG_VALUE[], REAL_ARRAY_VALUE DOUBLE_VALUE[], STRING_ARRAY_VALUE TEXT_VALUE[], TIMESTAMP_ARRAY_VALUE TIME_STAMP[], JSON_VALUE JSONB);
CREATE TABLE SAMPLE_TYPES (ID TECH_ID NOT NULL,CODE CODE NOT NULL,DESCRIPTION DESCRIPTION_2000, IS_LISTABLE BOOLEAN_CHAR NOT NULL DEFAULT 'T', GENERATED_FROM_DEPTH INTEGER NOT NULL DEFAULT 0, PART_OF_DEPTH INTEGER NOT NULL DEFAULT 0, MODIFICATION_TIMESTAMP TIME_STAMP DEFAULT CURRENT_TIMESTAMP, is_auto_generated_code BOOLEAN_CHAR NOT NULL DEFAULT 'F', generated_code_prefix CODE NOT NULL DEFAULT 'S', is_subcode_unique BOOLEAN_CHAR NOT NULL DEFAULT 'F', INHERIT_PROPERTIES BOOLEAN_CHAR NOT NULL DEFAULT 'F', VALIDATION_SCRIPT_ID TECH_ID, SHOW_PARENT_METADATA BOOLEAN_CHAR NOT NULL DEFAULT 'F', META_DATA JSONB, IS_MANAGED_INTERNALLY BOOLEAN_CHAR NOT NULL DEFAULT 'F');
-CREATE TABLE SAMPLE_TYPE_PROPERTY_TYPES (ID TECH_ID NOT NULL,SATY_ID TECH_ID NOT NULL,PRTY_ID TECH_ID NOT NULL,IS_MANDATORY BOOLEAN_CHAR NOT NULL DEFAULT 'F',IS_MANAGED_INTERNALLY BOOLEAN_CHAR NOT NULL DEFAULT 'F',PERS_ID_REGISTERER TECH_ID NOT NULL,REGISTRATION_TIMESTAMP TIME_STAMP_DFL NOT NULL DEFAULT CURRENT_TIMESTAMP, IS_DISPLAYED BOOLEAN_CHAR NOT NULL DEFAULT 'T', ORDINAL ORDINAL_INT NOT NULL, SECTION DESCRIPTION_2000,SCRIPT_ID TECH_ID,IS_SHOWN_EDIT BOOLEAN_CHAR NOT NULL DEFAULT 'T',SHOW_RAW_VALUE BOOLEAN_CHAR NOT NULL DEFAULT 'F', IS_UNIQUE BOOLEAN_CHAR NOT NULL DEFAULT 'F', IS_MANAGED_INTERNALLY_NAMESPACE BOOLEAN_CHAR NOT NULL DEFAULT 'F');
+CREATE TABLE SAMPLE_TYPE_PROPERTY_TYPES (ID TECH_ID NOT NULL,SATY_ID TECH_ID NOT NULL,PRTY_ID TECH_ID NOT NULL,IS_MANDATORY BOOLEAN_CHAR NOT NULL DEFAULT 'F',IS_MANAGED_INTERNALLY BOOLEAN_CHAR NOT NULL DEFAULT 'F',PERS_ID_REGISTERER TECH_ID NOT NULL,REGISTRATION_TIMESTAMP TIME_STAMP_DFL NOT NULL DEFAULT CURRENT_TIMESTAMP, IS_DISPLAYED BOOLEAN_CHAR NOT NULL DEFAULT 'T', ORDINAL ORDINAL_INT NOT NULL, SECTION DESCRIPTION_2000,SCRIPT_ID TECH_ID,IS_SHOWN_EDIT BOOLEAN_CHAR NOT NULL DEFAULT 'T',SHOW_RAW_VALUE BOOLEAN_CHAR NOT NULL DEFAULT 'F', IS_UNIQUE BOOLEAN_CHAR NOT NULL DEFAULT 'F', IS_MANAGED_INTERNALLY_NAMESPACE BOOLEAN_CHAR NOT NULL DEFAULT 'F', PATTERN TEXT_VALUE, PATTERN_TYPE PATTERN_TYPE, PATTERN_REGEX TEXT_VALUE);
CREATE TABLE DATA_SET_PROPERTIES (ID TECH_ID NOT NULL,DS_ID TECH_ID NOT NULL,DSTPT_ID TECH_ID NOT NULL,VALUE TEXT_VALUE,CVTE_ID TECH_ID, MATE_PROP_ID TECH_ID, SAMP_PROP_ID TECH_ID, PERS_ID_REGISTERER TECH_ID NOT NULL, REGISTRATION_TIMESTAMP TIME_STAMP_DFL NOT NULL DEFAULT CURRENT_TIMESTAMP, PERS_ID_AUTHOR TECH_ID NOT NULL, MODIFICATION_TIMESTAMP TIME_STAMP DEFAULT CURRENT_TIMESTAMP, DASE_FROZEN BOOLEAN_CHAR NOT NULL DEFAULT 'F', TSVECTOR_DOCUMENT TSVECTOR NOT NULL, IS_UNIQUE BOOLEAN_CHAR NOT NULL DEFAULT 'F', INTEGER_ARRAY_VALUE LONG_VALUE[], REAL_ARRAY_VALUE DOUBLE_VALUE[], STRING_ARRAY_VALUE TEXT_VALUE[], TIMESTAMP_ARRAY_VALUE TIME_STAMP[], JSON_VALUE JSONB);
CREATE TABLE DATA_SET_PROPERTIES_HISTORY (ID TECH_ID NOT NULL, DS_ID TECH_ID NOT NULL, DSTPT_ID TECH_ID NOT NULL, VALUE TEXT_VALUE, VOCABULARY_TERM IDENTIFIER, MATERIAL IDENTIFIER, SAMPLE IDENTIFIER, PERS_ID_AUTHOR TECH_ID NOT NULL, VALID_FROM_TIMESTAMP TIME_STAMP NOT NULL, VALID_UNTIL_TIMESTAMP TIME_STAMP DEFAULT CURRENT_TIMESTAMP, INTEGER_ARRAY_VALUE LONG_VALUE[], REAL_ARRAY_VALUE DOUBLE_VALUE[], STRING_ARRAY_VALUE TEXT_VALUE[], TIMESTAMP_ARRAY_VALUE TIME_STAMP[], JSON_VALUE JSONB);
-CREATE TABLE DATA_SET_TYPE_PROPERTY_TYPES (ID TECH_ID NOT NULL,DSTY_ID TECH_ID NOT NULL,PRTY_ID TECH_ID NOT NULL,IS_MANDATORY BOOLEAN_CHAR NOT NULL DEFAULT 'F',IS_MANAGED_INTERNALLY BOOLEAN_CHAR NOT NULL DEFAULT 'F',PERS_ID_REGISTERER TECH_ID NOT NULL,REGISTRATION_TIMESTAMP TIME_STAMP_DFL NOT NULL DEFAULT CURRENT_TIMESTAMP, ORDINAL ORDINAL_INT NOT NULL, SECTION DESCRIPTION_2000,SCRIPT_ID TECH_ID, IS_SHOWN_EDIT BOOLEAN_CHAR NOT NULL DEFAULT 'T',SHOW_RAW_VALUE BOOLEAN_CHAR NOT NULL DEFAULT 'F', IS_UNIQUE BOOLEAN_CHAR NOT NULL DEFAULT 'F', IS_MANAGED_INTERNALLY_NAMESPACE BOOLEAN_CHAR NOT NULL DEFAULT 'F');
+CREATE TABLE DATA_SET_TYPE_PROPERTY_TYPES (ID TECH_ID NOT NULL,DSTY_ID TECH_ID NOT NULL,PRTY_ID TECH_ID NOT NULL,IS_MANDATORY BOOLEAN_CHAR NOT NULL DEFAULT 'F',IS_MANAGED_INTERNALLY BOOLEAN_CHAR NOT NULL DEFAULT 'F',PERS_ID_REGISTERER TECH_ID NOT NULL,REGISTRATION_TIMESTAMP TIME_STAMP_DFL NOT NULL DEFAULT CURRENT_TIMESTAMP, ORDINAL ORDINAL_INT NOT NULL, SECTION DESCRIPTION_2000,SCRIPT_ID TECH_ID, IS_SHOWN_EDIT BOOLEAN_CHAR NOT NULL DEFAULT 'T',SHOW_RAW_VALUE BOOLEAN_CHAR NOT NULL DEFAULT 'F', IS_UNIQUE BOOLEAN_CHAR NOT NULL DEFAULT 'F', IS_MANAGED_INTERNALLY_NAMESPACE BOOLEAN_CHAR NOT NULL DEFAULT 'F', PATTERN TEXT_VALUE, PATTERN_TYPE PATTERN_TYPE, PATTERN_REGEX TEXT_VALUE);
CREATE TABLE AUTHORIZATION_GROUPS (ID TECH_ID NOT NULL, CODE CODE NOT NULL, DESCRIPTION DESCRIPTION_2000,REGISTRATION_TIMESTAMP TIME_STAMP_DFL NOT NULL DEFAULT CURRENT_TIMESTAMP, PERS_ID_REGISTERER TECH_ID NOT NULL, MODIFICATION_TIMESTAMP TIME_STAMP DEFAULT CURRENT_TIMESTAMP);
CREATE TABLE AUTHORIZATION_GROUP_PERSONS (AG_ID TECH_ID NOT NULL, PERS_ID TECH_ID NOT NULL);
@@ -908,7 +908,17 @@ ALTER TABLE SEMANTIC_ANNOTATIONS ADD CONSTRAINT SEMANTIC_ANNOTATIONS_SSP_CK CHEC
(SATY_ID IS NULL AND STPT_ID IS NULL AND PRTY_ID IS NOT NULL)
);
-ALTER TABLE PROPERTY_TYPES ADD CONSTRAINT PROPERTY_TYPES_PATTERN_CK CHECK
+ALTER TABLE EXPERIMENT_TYPE_PROPERTY_TYPES ADD CONSTRAINT PROPERTY_TYPES_PATTERN_CK CHECK
+ ((PATTERN IS NULL AND PATTERN_TYPE IS NULL AND PATTERN_REGEX IS NULL) OR
+ (PATTERN IS NOT NULL AND PATTERN_TYPE IS NOT NULL AND PATTERN_REGEX IS NOT NULL)
+ );
+
+ALTER TABLE SAMPLE_TYPE_PROPERTY_TYPES ADD CONSTRAINT PROPERTY_TYPES_PATTERN_CK CHECK
+ ((PATTERN IS NULL AND PATTERN_TYPE IS NULL AND PATTERN_REGEX IS NULL) OR
+ (PATTERN IS NOT NULL AND PATTERN_TYPE IS NOT NULL AND PATTERN_REGEX IS NOT NULL)
+ );
+
+ALTER TABLE DATA_SET_TYPE_PROPERTY_TYPES ADD CONSTRAINT PROPERTY_TYPES_PATTERN_CK CHECK
((PATTERN IS NULL AND PATTERN_TYPE IS NULL AND PATTERN_REGEX IS NULL) OR
(PATTERN IS NOT NULL AND PATTERN_TYPE IS NOT NULL AND PATTERN_REGEX IS NOT NULL)
);
diff --git a/server-application-server/sourceTest/sql/postgresql/197/015=data_set_type_property_types.tsv b/server-application-server/sourceTest/sql/postgresql/197/015=data_set_type_property_types.tsv
index c299c38a73660289a28cbcaf9fafca7c48eca7a5..19aace5f9757fafd7ad98709fd053582b87b5e36 100644
--- a/server-application-server/sourceTest/sql/postgresql/197/015=data_set_type_property_types.tsv
+++ b/server-application-server/sourceTest/sql/postgresql/197/015=data_set_type_property_types.tsv
@@ -1,11 +1,11 @@
-1 2 14 t f 2 2009-04-24 14:45:06.348563+02 \N 1 \N t f f f
-2 2 26 f f 2 2009-09-15 08:44:10.351183+02 \N 2 \N t f f f
-3 2 25 f f 2 2009-09-15 08:44:16.365221+02 \N 3 \N t f f f
-4 2 13 f f 2 2009-09-15 08:44:36.342115+02 \N 4 \N t f f f
-5 10 1 f f 2 2009-02-09 12:12:05.238758+01 \N 3 \N t f f f
-6 10 15 f f 2 2009-02-09 12:12:05.238758+01 \N 3 \N t f f f
-7 10 25 f f 2 2009-02-09 12:12:05.238758+01 \N 3 \N t f f f
-8 11 1 f f 2 2009-02-09 12:12:05.238758+01 \N 3 \N t f f f
-9 11 15 f f 2 2009-02-09 12:12:05.238758+01 \N 3 \N t f f f
-10 11 25 f f 2 2009-02-09 12:12:05.238758+01 \N 3 \N t f f f
-11 12 29 t t 2 2009-02-09 12:12:05.238758+01 \N 1 \N t f f f
+1 2 14 t f 2 2009-04-24 14:45:06.348563+02 \N 1 \N t f f \N \N \N f
+2 2 26 f f 2 2009-09-15 08:44:10.351183+02 \N 2 \N t f f \N \N \N f
+3 2 25 f f 2 2009-09-15 08:44:16.365221+02 \N 3 \N t f f \N \N \N f
+4 2 13 f f 2 2009-09-15 08:44:36.342115+02 \N 4 \N t f f \N \N \N f
+5 10 1 f f 2 2009-02-09 12:12:05.238758+01 \N 3 \N t f f \N \N \N f
+6 10 15 f f 2 2009-02-09 12:12:05.238758+01 \N 3 \N t f f \N \N \N f
+7 10 25 f f 2 2009-02-09 12:12:05.238758+01 \N 3 \N t f f \N \N \N f
+8 11 1 f f 2 2009-02-09 12:12:05.238758+01 \N 3 \N t f f \N \N \N f
+9 11 15 f f 2 2009-02-09 12:12:05.238758+01 \N 3 \N t f f \N \N \N f
+10 11 25 f f 2 2009-02-09 12:12:05.238758+01 \N 3 \N t f f \N \N \N f
+11 12 29 t t 2 2009-02-09 12:12:05.238758+01 \N 1 \N t f f \N \N \N f
diff --git a/server-application-server/sourceTest/sql/postgresql/197/029=experiment_type_property_types.tsv b/server-application-server/sourceTest/sql/postgresql/197/029=experiment_type_property_types.tsv
index 65ac1b2c9e1615d2d1fb28cca9696fa1b64f841e..67cd6ce13b932cc890ef4b1627374b40719d1126 100644
--- a/server-application-server/sourceTest/sql/postgresql/197/029=experiment_type_property_types.tsv
+++ b/server-application-server/sourceTest/sql/postgresql/197/029=experiment_type_property_types.tsv
@@ -1,9 +1,9 @@
-1 1 1 t t 1 2008-11-05 09:18:00.622+01 \N 1 \N t f f f
-2 2 1 t t 1 2008-11-05 09:18:00.622+01 \N 1 \N t f f f
-3 1 11 f f 2 2008-11-05 09:18:24.239+01 \N 2 \N t f f f
-5 1 13 f f 2 2008-11-05 09:21:53.256+01 \N 3 \N t f f f
-7 2 14 f f 2 2009-02-09 12:12:05.238758+01 \N 2 \N t f f f
-8 2 26 f f 2 2009-02-09 12:12:05.238758+01 \N 3 \N t f f f
-9 3 1 f f 2 2009-02-09 12:12:05.238758+01 \N 3 \N t f f f
-10 3 15 f f 2 2009-02-09 12:12:05.238758+01 \N 3 \N t f f f
-11 3 25 f f 2 2009-02-09 12:12:05.238758+01 \N 3 \N t f f f
+1 1 1 t t 1 2008-11-05 09:18:00.622+01 \N 1 \N t f f \N \N \N f
+2 2 1 t t 1 2008-11-05 09:18:00.622+01 \N 1 \N t f f \N \N \N f
+3 1 11 f f 2 2008-11-05 09:18:24.239+01 \N 2 \N t f f \N \N \N f
+5 1 13 f f 2 2008-11-05 09:21:53.256+01 \N 3 \N t f f \N \N \N f
+7 2 14 f f 2 2009-02-09 12:12:05.238758+01 \N 2 \N t f f \N \N \N f
+8 2 26 f f 2 2009-02-09 12:12:05.238758+01 \N 3 \N t f f \N \N \N f
+9 3 1 f f 2 2009-02-09 12:12:05.238758+01 \N 3 \N t f f \N \N \N f
+10 3 15 f f 2 2009-02-09 12:12:05.238758+01 \N 3 \N t f f \N \N \N f
+11 3 25 f f 2 2009-02-09 12:12:05.238758+01 \N 3 \N t f f \N \N \N f
diff --git a/server-application-server/sourceTest/sql/postgresql/197/041=material_type_property_types.tsv b/server-application-server/sourceTest/sql/postgresql/197/041=material_type_property_types.tsv
index 0ef971dec21bcc803e9d46e553dcb9869183ef8d..f7378062c96a2b33c683b9d6c00707f0ee210fb1 100644
--- a/server-application-server/sourceTest/sql/postgresql/197/041=material_type_property_types.tsv
+++ b/server-application-server/sourceTest/sql/postgresql/197/041=material_type_property_types.tsv
@@ -1,25 +1,25 @@
-1 1 1 t t 2008-11-05 09:18:00.622+01 1 \N 1 \N t f f f
-2 6 1 t t 2008-11-05 09:18:00.622+01 1 \N 1 \N t f f f
-3 7 1 t t 2008-11-05 09:18:00.622+01 1 \N 1 \N t f f f
-4 3 2 t t 2008-11-05 09:18:00.622+01 1 \N 1 \N t f f f
-5 3 1 f t 2008-11-05 09:18:00.622+01 1 \N 2 \N t f f f
-6 4 3 t t 2008-11-05 09:18:00.622+01 1 \N 1 \N t f f f
-7 4 5 f t 2008-11-05 09:18:00.622+01 1 \N 2 \N t f f f
-8 4 1 f t 2008-11-05 09:18:00.622+01 1 \N 3 \N t f f f
-9 5 1 f t 2008-11-05 09:18:00.622+01 1 \N 1 \N t f f f
-10 4 4 t f 2008-11-05 09:18:16.435+01 2 \N 4 \N t f f f
-11 5 10 f f 2008-11-05 09:18:16.903+01 2 \N 2 \N t f f f
-12 5 11 f f 2008-11-05 09:18:17.106+01 2 \N 3 \N t f f f
-17 5 7 f f 2008-11-05 09:18:28.391+01 2 \N 4 \N t f f f
-18 5 9 f f 2008-11-05 09:18:28.86+01 2 \N 5 \N t f f f
-19 5 8 f f 2008-11-05 09:18:29+01 2 \N 6 \N t f f f
-22 6 15 f f 2008-11-05 09:18:32.512+01 2 \N 2 \N t f f f
-23 8 1 t t 2008-11-05 09:18:32.512+01 2 \N 1 \N t f f f
-24 8 26 f f 2012-03-13 09:18:32.512+01 2 \N 2 \N t f f f
-25 9 2 t t 2008-11-05 09:18:00.622+01 1 \N 1 \N t f f f
-26 9 1 f t 2008-11-05 09:18:00.622+01 1 \N 2 \N t f f f
-27 10 1 t t 2008-11-05 09:18:32.512+01 2 \N 1 \N t f f f
-28 10 26 f f 2012-03-13 09:18:32.512+01 2 \N 2 \N t f f f
-29 11 1 f f 2012-03-13 09:18:32.512+01 2 \N 2 \N t f f f
-30 11 15 f f 2012-03-13 09:18:32.512+01 2 \N 2 \N t f f f
-31 11 25 f f 2012-03-13 09:18:32.512+01 2 \N 2 \N t f f f
+1 1 1 t t 2008-11-05 09:18:00.622+01 1 \N 1 \N t f f \N \N \N f
+2 6 1 t t 2008-11-05 09:18:00.622+01 1 \N 1 \N t f f \N \N \N f
+3 7 1 t t 2008-11-05 09:18:00.622+01 1 \N 1 \N t f f \N \N \N f
+4 3 2 t t 2008-11-05 09:18:00.622+01 1 \N 1 \N t f f \N \N \N f
+5 3 1 f t 2008-11-05 09:18:00.622+01 1 \N 2 \N t f f \N \N \N f
+6 4 3 t t 2008-11-05 09:18:00.622+01 1 \N 1 \N t f f \N \N \N f
+7 4 5 f t 2008-11-05 09:18:00.622+01 1 \N 2 \N t f f \N \N \N f
+8 4 1 f t 2008-11-05 09:18:00.622+01 1 \N 3 \N t f f \N \N \N f
+9 5 1 f t 2008-11-05 09:18:00.622+01 1 \N 1 \N t f f \N \N \N f
+10 4 4 t f 2008-11-05 09:18:16.435+01 2 \N 4 \N t f f \N \N \N f
+11 5 10 f f 2008-11-05 09:18:16.903+01 2 \N 2 \N t f f \N \N \N f
+12 5 11 f f 2008-11-05 09:18:17.106+01 2 \N 3 \N t f f \N \N \N f
+17 5 7 f f 2008-11-05 09:18:28.391+01 2 \N 4 \N t f f \N \N \N f
+18 5 9 f f 2008-11-05 09:18:28.86+01 2 \N 5 \N t f f \N \N \N f
+19 5 8 f f 2008-11-05 09:18:29+01 2 \N 6 \N t f f \N \N \N f
+22 6 15 f f 2008-11-05 09:18:32.512+01 2 \N 2 \N t f f \N \N \N f
+23 8 1 t t 2008-11-05 09:18:32.512+01 2 \N 1 \N t f f \N \N \N f
+24 8 26 f f 2012-03-13 09:18:32.512+01 2 \N 2 \N t f f \N \N \N f
+25 9 2 t t 2008-11-05 09:18:00.622+01 1 \N 1 \N t f f \N \N \N f
+26 9 1 f t 2008-11-05 09:18:00.622+01 1 \N 2 \N t f f \N \N \N f
+27 10 1 t t 2008-11-05 09:18:32.512+01 2 \N 1 \N t f f \N \N \N f
+28 10 26 f f 2012-03-13 09:18:32.512+01 2 \N 2 \N t f f \N \N \N f
+29 11 1 f f 2012-03-13 09:18:32.512+01 2 \N 2 \N t f f \N \N \N f
+30 11 15 f f 2012-03-13 09:18:32.512+01 2 \N 2 \N t f f \N \N \N f
+31 11 25 f f 2012-03-13 09:18:32.512+01 2 \N 2 \N t f f \N \N \N f
diff --git a/server-application-server/sourceTest/sql/postgresql/197/051=property_types.tsv b/server-application-server/sourceTest/sql/postgresql/197/051=property_types.tsv
index cd97b5e5971d435fbc378612572cf0c31d12efe8..cdefea1af0cb5a4265e59b12b953528fe0ee0c60 100644
--- a/server-application-server/sourceTest/sql/postgresql/197/051=property_types.tsv
+++ b/server-application-server/sourceTest/sql/postgresql/197/051=property_types.tsv
@@ -1,19 +1,19 @@
-1 DESCRIPTION A Description Description 1 2008-11-05 09:18:00.622+01 1 \N f \N \N \N \N \N f \N \N \N
-2 GENE_SYMBOL Gene Symbol, e.g. BMP15 Gene Symbol 1 2008-11-05 09:18:00.622+01 1 \N f \N \N \N \N \N f \N \N \N
-3 NUCLEOTIDE_SEQUENCE A sequence of nucleotides Nucleotide Sequence 1 2008-11-05 09:18:00.622+01 1 \N f \N \N \N \N \N f \N \N \N
-4 REFSEQ NCBI Reference Sequence code, applicable to sequences of type: DNA, RNA, protein RefSeq 1 2008-11-05 09:18:00.622+01 1 \N f \N \N \N \N \N f \N \N \N
-5 OFFSET Offset from the start of the sequence Offset 2 2008-11-05 09:18:00.622+01 1 \N f \N \N \N \N \N f \N \N \N
-6 PLATE_GEOMETRY Plate Geometry Plate Geometry 6 2008-11-05 09:18:00.622+01 1 1 t \N \N \N \N \N f \N \N \N
-7 EYE_COLOR The color of the eyes Eye color 1 2008-11-05 09:18:16.559+01 2 \N f \N \N \N \N \N f \N \N \N
-8 SIZE The size of the object Size 2 2008-11-05 09:18:16.559+01 2 \N f \N \N \N \N \N f \N \N \N
-9 VOLUME The volume of this person Volume 3 2008-11-05 09:18:16.559+01 2 \N f \N \N \N \N \N f \N \N \N
-10 IS_VALID Can the material be used? Valid? 4 2008-11-05 09:18:16.559+01 2 \N f \N \N \N \N \N f \N \N \N
-11 PURCHASE_DATE When material has been bought Purchased 5 2008-11-05 09:18:16.559+01 2 \N f \N \N \N \N \N f \N \N \N
-13 GENDER The gender of the living organism Gender 6 2008-11-05 09:18:31.545+01 2 4 f \N \N \N \N \N f \N \N \N
-14 COMMENT Any other comments Comment 1 2008-11-05 09:18:31.545+01 2 \N f \N \N \N \N \N f \N \N \N
-15 ORGANISM The organism from which cells come Organism 6 2008-11-05 09:18:31.545+01 2 3 f \N \N \N \N \N f \N \N \N
-25 BACTERIUM bacterium bacterium 7 2009-08-18 17:52:05.435021+02 2 \N f 6 \N \N \N \N f \N \N \N
-26 ANY_MATERIAL any_material any_material 7 2009-08-18 17:52:47.771005+02 2 \N f \N \N \N \N \N f \N \N \N
-27 DYNAMIC_DESCRIPTION A Dynamic Dynamic_Description 1 2008-11-05 09:18:00.622+01 1 \N f \N \N \N \N \N f \N \N \N
-28 TEST_VOCABULARY The test controlled vocabulary property Organism 6 2008-11-05 09:18:31.545+01 2 6 f \N \N \N \N \N f \N \N \N
-29 IMAGING_DATA_CONFIG The test imaging data property Imaging_Data_Config 17 2008-11-05 09:18:31.545+01 2 \N t \N \N \N \N \N f \N \N \N
+1 DESCRIPTION A Description Description 1 2008-11-05 09:18:00.622+01 1 \N f \N \N \N \N \N f
+2 GENE_SYMBOL Gene Symbol, e.g. BMP15 Gene Symbol 1 2008-11-05 09:18:00.622+01 1 \N f \N \N \N \N \N f
+3 NUCLEOTIDE_SEQUENCE A sequence of nucleotides Nucleotide Sequence 1 2008-11-05 09:18:00.622+01 1 \N f \N \N \N \N \N f
+4 REFSEQ NCBI Reference Sequence code, applicable to sequences of type: DNA, RNA, protein RefSeq 1 2008-11-05 09:18:00.622+01 1 \N f \N \N \N \N \N f
+5 OFFSET Offset from the start of the sequence Offset 2 2008-11-05 09:18:00.622+01 1 \N f \N \N \N \N \N f
+6 PLATE_GEOMETRY Plate Geometry Plate Geometry 6 2008-11-05 09:18:00.622+01 1 1 t \N \N \N \N \N f
+7 EYE_COLOR The color of the eyes Eye color 1 2008-11-05 09:18:16.559+01 2 \N f \N \N \N \N \N f
+8 SIZE The size of the object Size 2 2008-11-05 09:18:16.559+01 2 \N f \N \N \N \N \N f
+9 VOLUME The volume of this person Volume 3 2008-11-05 09:18:16.559+01 2 \N f \N \N \N \N \N f
+10 IS_VALID Can the material be used? Valid? 4 2008-11-05 09:18:16.559+01 2 \N f \N \N \N \N \N f
+11 PURCHASE_DATE When material has been bought Purchased 5 2008-11-05 09:18:16.559+01 2 \N f \N \N \N \N \N f
+13 GENDER The gender of the living organism Gender 6 2008-11-05 09:18:31.545+01 2 4 f \N \N \N \N \N f
+14 COMMENT Any other comments Comment 1 2008-11-05 09:18:31.545+01 2 \N f \N \N \N \N \N f
+15 ORGANISM The organism from which cells come Organism 6 2008-11-05 09:18:31.545+01 2 3 f \N \N \N \N \N f
+25 BACTERIUM bacterium bacterium 7 2009-08-18 17:52:05.435021+02 2 \N f 6 \N \N \N \N f
+26 ANY_MATERIAL any_material any_material 7 2009-08-18 17:52:47.771005+02 2 \N f \N \N \N \N \N f
+27 DYNAMIC_DESCRIPTION A Dynamic Dynamic_Description 1 2008-11-05 09:18:00.622+01 1 \N f \N \N \N \N \N f
+28 TEST_VOCABULARY The test controlled vocabulary property Organism 6 2008-11-05 09:18:31.545+01 2 6 f \N \N \N \N \N f
+29 IMAGING_DATA_CONFIG The test imaging data property Imaging_Data_Config 17 2008-11-05 09:18:31.545+01 2 \N t \N \N \N \N \N f
diff --git a/server-application-server/sourceTest/sql/postgresql/197/059=sample_type_property_types.tsv b/server-application-server/sourceTest/sql/postgresql/197/059=sample_type_property_types.tsv
index cfa33ffcd3c5ed5ba63e41df32acc6591996c3eb..e76042fac48c690bc6c33f655115f36b25a60adb 100644
--- a/server-application-server/sourceTest/sql/postgresql/197/059=sample_type_property_types.tsv
+++ b/server-application-server/sourceTest/sql/postgresql/197/059=sample_type_property_types.tsv
@@ -1,18 +1,18 @@
-14 7 27 f f 2 2012-04-16 14:49:35.990096+02 t \N 1 2 t f f f
-1 1 6 t t 1 2008-11-05 09:18:00.622+01 t \N 1 \N t f f f
-2 5 6 t t 1 2008-11-05 09:18:00.622+01 t \N 1 \N t f f f
-3 1 1 f f 2 2008-11-05 09:18:18.183+01 f \N 2 \N t f f f
-4 5 1 f f 2 2008-11-05 09:18:19.432+01 f \N 2 \N t f f f
-7 3 14 f f 2 2009-02-09 12:07:19.107679+01 f \N 1 \N t f f f
-8 3 15 f f 2 2009-02-09 12:07:26.839487+01 f \N 2 \N t f f f
-9 3 8 f f 2 2009-02-09 12:07:34.437531+01 f \N 3 \N t f f f
-11 3 26 f f 2 2009-08-18 17:53:21.362126+02 f \N 4 \N t f f f
-12 3 25 f f 2 2009-08-18 17:53:26.884669+02 f \N 5 \N t f f f
-13 2 5 f f 2 2010-10-25 14:49:35.990096+02 t \N 1 \N t f f f
-15 7 14 f f 2 2009-02-09 12:07:19.107679+01 f \N 2 \N t f f f
-16 11 28 f f 2 2009-02-09 12:07:19.107679+01 f \N 1 \N t f f f
-17 12 1 f f 2 2009-02-09 12:12:05.238758+01 f \N 1 \N t f f f
-18 12 15 f f 2 2009-02-09 12:12:05.238758+01 f \N 1 \N t f f f
-19 12 25 f f 2 2009-02-09 12:12:05.238758+01 f \N 1 \N t f f f
-20 10 14 f f 2 2009-02-09 12:07:19.107679+01 f \N 1 \N t f f f
-21 11 15 f f 2 2009-02-09 12:12:05.238758+01 f \N 1 \N t f f f
+14 7 27 f f 2 2012-04-16 14:49:35.990096+02 t \N 1 2 t f f \N \N \N f
+1 1 6 t t 1 2008-11-05 09:18:00.622+01 t \N 1 \N t f f \N \N \N f
+2 5 6 t t 1 2008-11-05 09:18:00.622+01 t \N 1 \N t f f \N \N \N f
+3 1 1 f f 2 2008-11-05 09:18:18.183+01 f \N 2 \N t f f \N \N \N f
+4 5 1 f f 2 2008-11-05 09:18:19.432+01 f \N 2 \N t f f \N \N \N f
+7 3 14 f f 2 2009-02-09 12:07:19.107679+01 f \N 1 \N t f f \N \N \N f
+8 3 15 f f 2 2009-02-09 12:07:26.839487+01 f \N 2 \N t f f \N \N \N f
+9 3 8 f f 2 2009-02-09 12:07:34.437531+01 f \N 3 \N t f f \N \N \N f
+11 3 26 f f 2 2009-08-18 17:53:21.362126+02 f \N 4 \N t f f \N \N \N f
+12 3 25 f f 2 2009-08-18 17:53:26.884669+02 f \N 5 \N t f f \N \N \N f
+13 2 5 f f 2 2010-10-25 14:49:35.990096+02 t \N 1 \N t f f \N \N \N f
+15 7 14 f f 2 2009-02-09 12:07:19.107679+01 f \N 2 \N t f f \N \N \N f
+16 11 28 f f 2 2009-02-09 12:07:19.107679+01 f \N 1 \N t f f \N \N \N f
+17 12 1 f f 2 2009-02-09 12:12:05.238758+01 f \N 1 \N t f f \N \N \N f
+18 12 15 f f 2 2009-02-09 12:12:05.238758+01 f \N 1 \N t f f \N \N \N f
+19 12 25 f f 2 2009-02-09 12:12:05.238758+01 f \N 1 \N t f f \N \N \N f
+20 10 14 f f 2 2009-02-09 12:07:19.107679+01 f \N 1 \N t f f \N \N \N f
+21 11 15 f f 2 2009-02-09 12:12:05.238758+01 f \N 1 \N t f f \N \N \N f
diff --git a/server-application-server/sourceTest/sql/postgresql/197/schema-197.sql b/server-application-server/sourceTest/sql/postgresql/197/schema-197.sql
index 6ce362f2e42caa7546b33cfbde5e214fdbbb45fd..513cfdfd283d594499c22dc320be66554f91a921 100644
--- a/server-application-server/sourceTest/sql/postgresql/197/schema-197.sql
+++ b/server-application-server/sourceTest/sql/postgresql/197/schema-197.sql
@@ -1487,7 +1487,11 @@ CREATE TABLE data_set_type_property_types (
is_shown_edit boolean_char DEFAULT true NOT NULL,
show_raw_value boolean_char DEFAULT false NOT NULL,
is_unique boolean_char DEFAULT false NOT NULL,
- is_managed_internally_namespace boolean_char DEFAULT false NOT NULL
+ pattern text_value,
+ pattern_type pattern_type,
+ pattern_regex text_value,
+ is_managed_internally_namespace boolean_char DEFAULT false NOT NULL,
+ CONSTRAINT property_types_pattern_ck CHECK ((pattern IS NULL AND pattern_type IS NULL AND pattern_regex IS NULL) OR (pattern IS NOT NULL AND pattern_type IS NOT NULL AND pattern_regex IS NOT NULL))
);
CREATE TABLE data_set_types (
id tech_id NOT NULL,
@@ -1804,7 +1808,11 @@ CREATE TABLE experiment_type_property_types (
is_shown_edit boolean_char DEFAULT true NOT NULL,
show_raw_value boolean_char DEFAULT false NOT NULL,
is_unique boolean_char DEFAULT false NOT NULL,
- is_managed_internally_namespace boolean_char DEFAULT false NOT NULL
+ pattern text_value,
+ pattern_type pattern_type,
+ pattern_regex text_value,
+ is_managed_internally_namespace boolean_char DEFAULT false NOT NULL,
+ CONSTRAINT property_types_pattern_ck CHECK ((pattern IS NULL AND pattern_type IS NULL AND pattern_regex IS NULL) OR (pattern IS NOT NULL AND pattern_type IS NOT NULL AND pattern_regex IS NOT NULL))
);
CREATE TABLE experiment_types (
id tech_id NOT NULL,
@@ -2053,6 +2061,9 @@ CREATE TABLE material_type_property_types (
is_shown_edit boolean_char DEFAULT true NOT NULL,
show_raw_value boolean_char DEFAULT false NOT NULL,
is_unique boolean_char DEFAULT false NOT NULL,
+ pattern text_value,
+ pattern_type pattern_type,
+ pattern_regex text_value,
is_managed_internally_namespace boolean_char DEFAULT false NOT NULL
);
CREATE TABLE material_types (
@@ -2247,11 +2258,7 @@ CREATE TABLE property_types (
transformation text_value,
meta_data jsonb,
saty_prop_id tech_id,
- is_multi_value boolean_char DEFAULT false NOT NULL,
- pattern text_value,
- pattern_type pattern_type,
- pattern_regex text_value,
- CONSTRAINT property_types_pattern_ck CHECK ((pattern IS NULL AND pattern_type IS NULL AND pattern_regex IS NULL) OR (pattern IS NOT NULL AND pattern_type IS NOT NULL AND pattern_regex IS NOT NULL))
+ is_multi_value boolean_char DEFAULT false NOT NULL
);
CREATE TABLE queries (
id tech_id NOT NULL,
@@ -2516,7 +2523,11 @@ CREATE TABLE sample_type_property_types (
is_shown_edit boolean_char DEFAULT true NOT NULL,
show_raw_value boolean_char DEFAULT false NOT NULL,
is_unique boolean_char DEFAULT false NOT NULL,
- is_managed_internally_namespace boolean_char DEFAULT false NOT NULL
+ pattern text_value,
+ pattern_type pattern_type,
+ pattern_regex text_value,
+ is_managed_internally_namespace boolean_char DEFAULT false NOT NULL,
+ CONSTRAINT property_types_pattern_ck CHECK ((pattern IS NULL AND pattern_type IS NULL AND pattern_regex IS NULL) OR (pattern IS NOT NULL AND pattern_type IS NOT NULL AND pattern_regex IS NOT NULL))
);
CREATE TABLE sample_types (
id tech_id NOT NULL,