diff --git a/models_and_helper_scripts/sample-management-datamodel.yml b/models_and_helper_scripts/sample-management-datamodel.yml index 74828eaec7cda481c08aea06179a5825d878f6de..8067eacd15690a47649976c9dbcba2ed3cf58157 100644 --- a/models_and_helper_scripts/sample-management-datamodel.yml +++ b/models_and_helper_scripts/sample-management-datamodel.yml @@ -25,18 +25,19 @@ ControlledRecordType: Responsible: inherit_from_obligatory: - ControlledRecordType - obligatory_properties: + recommended_properties: Abbreviation: description: An abbreviation for this entity that is used for identification purposes datatype: TEXT Person: - inherit_from_obligatory: + inherit_from_recommended: - Responsible obligatory_properties: first_name: datatype: TEXT last_name: datatype: TEXT + recommended_properties: Email: datatype: TEXT diff --git a/sample-management-custom/caosdb-server/scripting/bin/sample_helpers/default_constants.yml b/sample-management-custom/caosdb-server/scripting/bin/sample_helpers/default_constants.yml index 2db07b9575fea7526013a45691bcf1cf088e058c..687b32c6884d1cdf3a881a839e9aaaf26a1e70aa 100644 --- a/sample-management-custom/caosdb-server/scripting/bin/sample_helpers/default_constants.yml +++ b/sample-management-custom/caosdb-server/scripting/bin/sample_helpers/default_constants.yml @@ -46,14 +46,14 @@ csv_column_descriptions: Water depth stop: "The bottom depth in meters where the sampling ended as a positive value" entity_names: - abbreviation_prop: Abbreviation + abbreviation_prop: abbreviation child_container_prop: "Child container" container_label_prop: container_label container_rt: Container container_size_prop: "Container size" containertype_rt: ContainerType custom_label_prop: "Custom label" - labelcounter_prop: Counter + labelcounter_prop: counter labelcounter_rt: LabelCounter responsible_rt: Responsible first_name_prop: first_name diff --git a/test-profile/custom/other/restore/caosdb.dump.sql b/test-profile/custom/other/restore/caosdb.dump.sql index 913434bfa2cfe81a8704413a3d483fccbe0f7e9a..3dac8674f2e58ee0d0eeba90fde4df61e751bbef 100644 --- a/test-profile/custom/other/restore/caosdb.dump.sql +++ b/test-profile/custom/other/restore/caosdb.dump.sql @@ -47,7 +47,8 @@ LOCK TABLES `archive_collection_type` WRITE; /*!40000 ALTER TABLE `archive_collection_type` DISABLE KEYS */; INSERT INTO `archive_collection_type` VALUES (0,153,177,'LIST',1), -(0,153,177,'LIST',2); +(0,153,177,'LIST',2), +(0,153,177,'LIST',3); /*!40000 ALTER TABLE `archive_collection_type` ENABLE KEYS */; UNLOCK TABLES; @@ -86,36 +87,53 @@ LOCK TABLES `archive_data_type` WRITE; INSERT INTO `archive_data_type` VALUES (0,0,144,13,1), (0,0,144,13,2), +(0,0,144,13,3), (0,0,145,13,1), (0,0,145,13,2), +(0,0,145,13,3), (0,0,146,13,1), (0,0,146,13,2), +(0,0,146,13,3), (0,0,147,13,1), (0,0,147,13,2), +(0,0,147,13,3), (0,0,102,14,1), +(0,0,107,14,1), +(0,0,108,14,1), (0,0,114,14,1), (0,111,177,101,1), (0,111,177,101,2), +(0,111,177,101,3), (0,111,178,110,1), (0,111,178,110,2), +(0,111,178,110,3), (0,136,177,110,1), (0,136,177,110,2), +(0,136,177,110,3), (0,118,178,111,1), (0,118,178,111,2), +(0,118,178,111,3), (0,118,177,119,1), (0,118,177,119,2), +(0,118,177,119,3), (0,118,179,120,1), (0,118,179,120,2), +(0,118,179,120,3), (0,118,180,121,1), (0,118,180,121,2), +(0,118,180,121,3), (0,119,178,138,1), (0,119,178,138,2), +(0,119,178,138,3), (0,153,177,143,1), (0,153,177,143,2), +(0,153,177,143,3), (0,150,177,148,1), (0,150,177,148,2), +(0,150,177,148,3), (0,153,178,148,1), -(0,153,178,148,2); +(0,153,178,148,2), +(0,153,178,148,3); /*!40000 ALTER TABLE `archive_data_type` ENABLE KEYS */; UNLOCK TABLES; @@ -287,34 +305,50 @@ INSERT INTO `archive_entities` VALUES (102,'An abbreviation for this entity that is used for creating BIS labels','PROPERTY',2,1), (106,NULL,'RECORDTYPE',2,1), (106,NULL,'RECORDTYPE',2,2), +(106,NULL,'RECORDTYPE',2,3), +(107,NULL,'PROPERTY',2,1), +(108,NULL,'PROPERTY',2,1), (110,NULL,'RECORDTYPE',2,1), (111,NULL,'RECORDTYPE',2,1), (111,NULL,'RECORDTYPE',2,2), +(111,NULL,'RECORDTYPE',2,3), (114,'A custom label for a container that doesn\'t have to follow the BIS labeling guidelines.','PROPERTY',2,1), (118,NULL,'RECORDTYPE',2,1), (118,NULL,'RECORDTYPE',2,2), +(118,NULL,'RECORDTYPE',2,3), (119,NULL,'RECORDTYPE',2,1), (119,NULL,'RECORDTYPE',2,2), +(119,NULL,'RECORDTYPE',2,3), (136,NULL,'RECORDTYPE',2,1), (136,NULL,'RECORDTYPE',2,2), +(136,NULL,'RECORDTYPE',2,3), (143,NULL,'RECORDTYPE',2,1), (143,NULL,'RECORDTYPE',2,2), +(143,NULL,'RECORDTYPE',2,3), (144,'The depth of the water in meters as a positive value','PROPERTY',2,1), (144,'The depth of the water in meters as a positive value','PROPERTY',2,2), +(144,'The depth of the water in meters as a positive value','PROPERTY',2,3), (145,'The depth in meters where the sampling took place as a positive value','PROPERTY',2,1), (145,'The depth in meters where the sampling took place as a positive value','PROPERTY',2,2), +(145,'The depth in meters where the sampling took place as a positive value','PROPERTY',2,3), (146,NULL,'PROPERTY',2,1), (146,NULL,'PROPERTY',2,2), +(146,NULL,'PROPERTY',2,3), (147,NULL,'PROPERTY',2,1), (147,NULL,'PROPERTY',2,2), +(147,NULL,'PROPERTY',2,3), (150,NULL,'RECORDTYPE',2,1), (150,NULL,'RECORDTYPE',2,2), +(150,NULL,'RECORDTYPE',2,3), (153,NULL,'RECORDTYPE',2,1), (153,NULL,'RECORDTYPE',2,2), +(153,NULL,'RECORDTYPE',2,3), (161,NULL,'RECORDTYPE',2,1), (161,NULL,'RECORDTYPE',2,2), +(161,NULL,'RECORDTYPE',2,3), (162,NULL,'RECORDTYPE',2,1), (162,NULL,'RECORDTYPE',2,2), +(162,NULL,'RECORDTYPE',2,3), (188,NULL,'RECORD',2,1), (188,NULL,'RECORD',2,2), (192,NULL,'RECORD',2,1), @@ -487,7 +521,12 @@ INSERT INTO `archive_isa` VALUES (162,2,143,1), (188,2,100,0), (188,2,101,0), -(188,2,106,1); +(188,2,106,1), +(106,3,100,0), +(106,3,101,1), +(153,3,150,1), +(161,3,143,1), +(162,3,143,1); /*!40000 ALTER TABLE `archive_isa` ENABLE KEYS */; UNLOCK TABLES; @@ -564,7 +603,23 @@ INSERT INTO `archive_name_data` VALUES (0,153,20,'SourceEvent','FIX',0,2), (0,161,20,'StartPosition','FIX',0,2), (0,162,20,'StopPosition','FIX',0,2), -(0,188,20,'My Name','FIX',0,2); +(0,188,20,'My Name','FIX',0,2), +(0,107,20,'First name','FIX',0,1), +(0,108,20,'Last name','FIX',0,1), +(0,106,20,'Person','FIX',0,3), +(0,111,20,'Container','FIX',0,3), +(0,118,20,'Sample','FIX',0,3), +(0,119,20,'NagoyaCase','FIX',0,3), +(0,136,20,'LabelCounter','FIX',0,3), +(0,143,20,'Position','FIX',0,3), +(0,144,20,'Water depth','FIX',0,3), +(0,145,20,'Sampling depth','FIX',0,3), +(0,146,20,'Latitude','FIX',0,3), +(0,147,20,'Longitude','FIX',0,3), +(0,150,20,'Event','FIX',0,3), +(0,153,20,'SourceEvent','FIX',0,3), +(0,161,20,'StartPosition','FIX',0,3), +(0,162,20,'StopPosition','FIX',0,3); /*!40000 ALTER TABLE `archive_name_data` ENABLE KEYS */; UNLOCK TABLES; @@ -761,7 +816,62 @@ INSERT INTO `archive_null_data` VALUES (0,161,146,'OBLIGATORY',0,2), (0,161,147,'OBLIGATORY',0,2), (0,162,146,'OBLIGATORY',0,2), -(0,162,147,'OBLIGATORY',0,2); +(0,162,147,'OBLIGATORY',0,2), +(0,106,107,'OBLIGATORY',0,3), +(0,106,108,'OBLIGATORY',1,3), +(0,106,109,'OBLIGATORY',2,3), +(0,106,102,'OBLIGATORY',0,3), +(0,111,177,'OBLIGATORY',0,3), +(0,111,178,'OBLIGATORY',0,3), +(0,111,212,'SUGGESTED',2,3), +(0,111,179,'SUGGESTED',0,3), +(0,111,113,'SUGGESTED',4,3), +(0,111,114,'SUGGESTED',5,3), +(0,111,115,'SUGGESTED',6,3), +(0,111,116,'SUGGESTED',7,3), +(0,118,177,'RECOMMENDED',0,3), +(0,118,178,'RECOMMENDED',0,3), +(0,118,179,'RECOMMENDED',0,3), +(0,118,180,'RECOMMENDED',0,3), +(0,118,122,'RECOMMENDED',4,3), +(0,118,123,'RECOMMENDED',5,3), +(0,118,124,'RECOMMENDED',6,3), +(0,118,181,'SUGGESTED',0,3), +(0,118,182,'SUGGESTED',0,3), +(0,118,183,'SUGGESTED',0,3), +(0,118,184,'SUGGESTED',0,3), +(0,118,185,'SUGGESTED',0,3), +(0,118,130,'SUGGESTED',12,3), +(0,118,131,'SUGGESTED',13,3), +(0,118,132,'SUGGESTED',14,3), +(0,118,133,'SUGGESTED',15,3), +(0,118,134,'SUGGESTED',16,3), +(0,119,142,'OBLIGATORY',0,3), +(0,119,140,'RECOMMENDED',1,3), +(0,119,177,'SUGGESTED',0,3), +(0,119,178,'SUGGESTED',0,3), +(0,136,137,'OBLIGATORY',0,3), +(0,136,177,'OBLIGATORY',0,3), +(0,143,146,'OBLIGATORY',0,3), +(0,143,147,'OBLIGATORY',1,3), +(0,143,144,'RECOMMENDED',2,3), +(0,143,145,'RECOMMENDED',3,3), +(0,150,177,'OBLIGATORY',0,3), +(0,150,151,'RECOMMENDED',1,3), +(0,150,152,'SUGGESTED',2,3), +(0,153,177,'OBLIGATORY',0,3), +(0,153,178,'OBLIGATORY',0,3), +(0,153,154,'RECOMMENDED',2,3), +(0,153,155,'RECOMMENDED',3,3), +(0,153,156,'RECOMMENDED',4,3), +(0,153,157,'RECOMMENDED',5,3), +(0,153,158,'SUGGESTED',6,3), +(0,153,151,'RECOMMENDED',0,3), +(0,153,152,'SUGGESTED',0,3), +(0,161,146,'OBLIGATORY',0,3), +(0,161,147,'OBLIGATORY',0,3), +(0,162,146,'OBLIGATORY',0,3), +(0,162,147,'OBLIGATORY',0,3); /*!40000 ALTER TABLE `archive_null_data` ENABLE KEYS */; UNLOCK TABLES; @@ -890,7 +1000,25 @@ INSERT INTO `archive_reference_data` VALUES (0,136,110,177,NULL,'REPLACEMENT',1,2), (0,150,148,177,NULL,'REPLACEMENT',0,2), (0,153,143,177,NULL,'REPLACEMENT',0,2), -(0,153,148,178,NULL,'REPLACEMENT',1,2); +(0,153,148,178,NULL,'REPLACEMENT',1,2), +(0,111,101,177,NULL,'REPLACEMENT',0,3), +(0,111,110,178,NULL,'REPLACEMENT',1,3), +(0,111,112,179,NULL,'REPLACEMENT',3,3), +(0,118,119,177,NULL,'REPLACEMENT',0,3), +(0,118,111,178,NULL,'REPLACEMENT',1,3), +(0,118,120,179,NULL,'REPLACEMENT',2,3), +(0,118,121,180,NULL,'REPLACEMENT',3,3), +(0,118,125,181,NULL,'REPLACEMENT',7,3), +(0,118,126,182,NULL,'REPLACEMENT',8,3), +(0,118,127,183,NULL,'REPLACEMENT',9,3), +(0,118,128,184,NULL,'REPLACEMENT',10,3), +(0,118,129,185,NULL,'REPLACEMENT',11,3), +(0,119,141,177,NULL,'REPLACEMENT',2,3), +(0,119,138,178,NULL,'REPLACEMENT',3,3), +(0,136,110,177,NULL,'REPLACEMENT',1,3), +(0,150,148,177,NULL,'REPLACEMENT',0,3), +(0,153,143,177,NULL,'REPLACEMENT',0,3), +(0,153,148,178,NULL,'REPLACEMENT',1,3); /*!40000 ALTER TABLE `archive_reference_data` ENABLE KEYS */; UNLOCK TABLES; @@ -973,7 +1101,19 @@ INSERT INTO `archive_text_data` VALUES (0,188,107,'My','FIX',0,2), (0,188,102,'myn','FIX',1,2), (0,188,108,'Name','FIX',2,2), -(0,188,109,'my.name@example.com','FIX',3,2); +(0,188,109,'my.name@example.com','FIX',3,2), +(143,146,21,'°','FIX',0,3), +(143,147,21,'°','FIX',0,3), +(143,144,21,'m','FIX',0,3), +(143,145,21,'m','FIX',0,3), +(0,144,21,'m','FIX',0,3), +(0,145,21,'m','FIX',0,3), +(0,146,21,'°','FIX',0,3), +(0,147,21,'°','FIX',0,3), +(161,146,21,'°','FIX',0,3), +(161,147,21,'°','FIX',0,3), +(162,146,21,'°','FIX',0,3), +(162,147,21,'°','FIX',0,3); /*!40000 ALTER TABLE `archive_text_data` ENABLE KEYS */; UNLOCK TABLES; @@ -1629,14 +1769,18 @@ INSERT INTO `entity_version` VALUES (106,NULL,'48edf0033a82b59a298788a8fd1134aaf5f0cb69',1,NULL,'27f2534b-49b9-4e44-9232-53eadf8ba072'), (106,NULL,'32f2857be024df66d734a79c908061ae8d9fcedc',2,1,'a61cf61b-8583-41ec-b204-bfa65e3a7807'), (106,NULL,'00d1bb93d150633c1944bdb05c2361f2feeb485f',3,2,'cf5b2beb-6960-4eaf-8d7b-5e747f29f7be'), +(106,NULL,'6e0b9fdfa9030ad27b3ca0ca4cf81f297f218e62',4,3,'7ef74091-1b29-40bf-b690-0f94a3b1c9b7'), (107,NULL,'c07e48a5242cec75dd484535af46788b845fc0c0',1,NULL,'27f2534b-49b9-4e44-9232-53eadf8ba072'), +(107,NULL,'2b8b4d4c142e82b618fe6350afb9a08bf58e3817',2,1,'ddaf373d-6625-4b97-ab3d-7f91f13e7c27'), (108,NULL,'ee1eae1aa831261b54a3b302f2a8fe3832caa821',1,NULL,'27f2534b-49b9-4e44-9232-53eadf8ba072'), +(108,NULL,'3658ab2ab072727a6caa6d87ae9edbab37cc3058',2,1,'37b23e09-803b-4ea2-8caf-00f0242d9c66'), (109,NULL,'8faa2c5a80f734b894d60dd7f41a69f9686b323f',1,NULL,'27f2534b-49b9-4e44-9232-53eadf8ba072'), (110,NULL,'969e58211cc801b7f29f7d9cf2d386843af3418e',1,NULL,'27f2534b-49b9-4e44-9232-53eadf8ba072'), (110,NULL,'bcac18af5682f2b21c7675fc4eb6de3be39ae49a',2,1,'cf5b2beb-6960-4eaf-8d7b-5e747f29f7be'), (111,NULL,'36c265d80cb5abb79d5671a1b431dd62e971e9b5',1,NULL,'27f2534b-49b9-4e44-9232-53eadf8ba072'), (111,NULL,'83299d432a84245a01410042af78b1e332315114',2,1,'a61cf61b-8583-41ec-b204-bfa65e3a7807'), (111,NULL,'d14f134f53a5225fdf9f0377b8af341ae783b294',3,2,'cf5b2beb-6960-4eaf-8d7b-5e747f29f7be'), +(111,NULL,'04c60831fa49d7597f55e2c85c94e731f3c4d987',4,3,'7ef74091-1b29-40bf-b690-0f94a3b1c9b7'), (112,NULL,'fb580fe4757eee3dba822814fa51c18a18b761ca',1,NULL,'27f2534b-49b9-4e44-9232-53eadf8ba072'), (113,NULL,'271372b1dfdd98d82b290ad3f40335fbf51d23b1',1,NULL,'27f2534b-49b9-4e44-9232-53eadf8ba072'), (114,NULL,'cf3ab7cfb60c2492e90ddf765784084060508a7d',1,NULL,'27f2534b-49b9-4e44-9232-53eadf8ba072'), @@ -1646,9 +1790,11 @@ INSERT INTO `entity_version` VALUES (118,NULL,'68c8f4408696307d47f93015ecf286b079bd50ba',1,NULL,'27f2534b-49b9-4e44-9232-53eadf8ba072'), (118,NULL,'f8a7baed3750fddb91d5109c5ed4fd6865500883',2,1,'a61cf61b-8583-41ec-b204-bfa65e3a7807'), (118,NULL,'a02a1cdfe936c3c73e957e5c097e978f50e50c73',3,2,'cf5b2beb-6960-4eaf-8d7b-5e747f29f7be'), +(118,NULL,'b7faa7d99b719cf37ad085fa3331ddb8c89557b5',4,3,'7ef74091-1b29-40bf-b690-0f94a3b1c9b7'), (119,NULL,'9bfc33ae0c6be37cb027a62afd792d1c311d006a',1,NULL,'27f2534b-49b9-4e44-9232-53eadf8ba072'), (119,NULL,'61ee09a05b915dba2c6d158244966d3688ccef1a',2,1,'a61cf61b-8583-41ec-b204-bfa65e3a7807'), (119,NULL,'74f9449229abf6deadb11c428fd38c437f937f40',3,2,'cf5b2beb-6960-4eaf-8d7b-5e747f29f7be'), +(119,NULL,'8b84a456a3e07f22f76ca80cae004e7c3b278990',4,3,'7ef74091-1b29-40bf-b690-0f94a3b1c9b7'), (120,NULL,'46a17aea4446446e72aeaffc3a01ee2f2d5d9957',1,NULL,'27f2534b-49b9-4e44-9232-53eadf8ba072'), (121,NULL,'cecee2780f2756778d57180bb6579333c6743420',1,NULL,'27f2534b-49b9-4e44-9232-53eadf8ba072'), (122,NULL,'1ae73a81970c7cffda61f4354d3747495252da95',1,NULL,'27f2534b-49b9-4e44-9232-53eadf8ba072'), @@ -1668,6 +1814,7 @@ INSERT INTO `entity_version` VALUES (136,NULL,'6902c75485499ba6513b1faefb733322d9cb0239',1,NULL,'27f2534b-49b9-4e44-9232-53eadf8ba072'), (136,NULL,'a65d632df3b40a0d9cdd748c0c578f9bfd538c27',2,1,'a61cf61b-8583-41ec-b204-bfa65e3a7807'), (136,NULL,'b46bbccd0a67d55e67d8df85a31132a8d77e3c93',3,2,'cf5b2beb-6960-4eaf-8d7b-5e747f29f7be'), +(136,NULL,'103283c5c47772933bbd3d7eb66447c49dbcf7b0',4,3,'7ef74091-1b29-40bf-b690-0f94a3b1c9b7'), (137,NULL,'acd17699d752e90015eb8010e2f17ab5566a4241',1,NULL,'27f2534b-49b9-4e44-9232-53eadf8ba072'), (138,NULL,'3c63009effd95704bc52400dc38ed7c8ccc63495',1,NULL,'27f2534b-49b9-4e44-9232-53eadf8ba072'), (139,NULL,'54edec758a99a74f50577b74ba8a1ef187e08859',1,NULL,'27f2534b-49b9-4e44-9232-53eadf8ba072'), @@ -1677,28 +1824,35 @@ INSERT INTO `entity_version` VALUES (143,NULL,'2a1014ad624089133ffbe85a7a39e82beeab2007',1,NULL,'27f2534b-49b9-4e44-9232-53eadf8ba072'), (143,NULL,'96f98bad0aa7f4cf14e5e59a8608ede0cc2e4507',2,1,'a61cf61b-8583-41ec-b204-bfa65e3a7807'), (143,NULL,'4b5c04e5674df7eaae698b73caed073a6345e90a',3,2,'cf5b2beb-6960-4eaf-8d7b-5e747f29f7be'), +(143,NULL,'b0772c4e25b6d6121491024d7ed6ac541e9e2381',4,3,'7ef74091-1b29-40bf-b690-0f94a3b1c9b7'), (144,NULL,'a1d4da47f82593afbb269cbf6fc2311b059812d7',1,NULL,'27f2534b-49b9-4e44-9232-53eadf8ba072'), (144,NULL,'a80b7c60c82df12adde5a14916dd39832bfc6c02',2,1,'a61cf61b-8583-41ec-b204-bfa65e3a7807'), (144,NULL,'9acc339307deafd15e156c9510ff5ae67fdec6fb',3,2,'cf5b2beb-6960-4eaf-8d7b-5e747f29f7be'), +(144,NULL,'53bd67181fbafaaff7020e358e62b60310b92397',4,3,'7ef74091-1b29-40bf-b690-0f94a3b1c9b7'), (145,NULL,'535909011d32dc82dc3368b463c01f471c72b5f6',1,NULL,'27f2534b-49b9-4e44-9232-53eadf8ba072'), (145,NULL,'b881b96d70e6900c63fb9dd2709a3682e65028e9',2,1,'a61cf61b-8583-41ec-b204-bfa65e3a7807'), (145,NULL,'2c0bf525e0375c3d1ab95d1954202f929924aebf',3,2,'cf5b2beb-6960-4eaf-8d7b-5e747f29f7be'), +(145,NULL,'7b39b67649b72ffa178ce6b74efd9b4d5cf6efe6',4,3,'7ef74091-1b29-40bf-b690-0f94a3b1c9b7'), (146,NULL,'8ab9de04122cf31364610d3372f0d922b4e110a5',1,NULL,'27f2534b-49b9-4e44-9232-53eadf8ba072'), (146,NULL,'26cf3920bc49690f1e071d1362d90ad3dde4051f',2,1,'a61cf61b-8583-41ec-b204-bfa65e3a7807'), (146,NULL,'2cf5987178082192f54fe85144721e28fb29cb20',3,2,'cf5b2beb-6960-4eaf-8d7b-5e747f29f7be'), +(146,NULL,'65f6807c333e902177b44aa3affba219903e6317',4,3,'7ef74091-1b29-40bf-b690-0f94a3b1c9b7'), (147,NULL,'affd3537da482fb6655fc65cd223befedc845cb1',1,NULL,'27f2534b-49b9-4e44-9232-53eadf8ba072'), (147,NULL,'f2f3f1bafbee48263ab7c5184a17b036f528bf8a',2,1,'a61cf61b-8583-41ec-b204-bfa65e3a7807'), (147,NULL,'3b26886ba59708accac6f63a5bb54cc94c4f7ece',3,2,'cf5b2beb-6960-4eaf-8d7b-5e747f29f7be'), +(147,NULL,'760b388bc1624c0cb8e2f61f2513f144ce882bb0',4,3,'7ef74091-1b29-40bf-b690-0f94a3b1c9b7'), (148,NULL,'3dc270e8ab4ffded2b7f3412e97469022a389a62',1,NULL,'27f2534b-49b9-4e44-9232-53eadf8ba072'), (149,NULL,'949f9468c06c34881820eeeea6bb999e510c3fac',1,NULL,'27f2534b-49b9-4e44-9232-53eadf8ba072'), (150,NULL,'5a0c0116c267a8165eec4bdb0f6bc9393af4ebac',1,NULL,'27f2534b-49b9-4e44-9232-53eadf8ba072'), (150,NULL,'ac659db37f8e5c0874677706da69a6d060a93f0f',2,1,'a61cf61b-8583-41ec-b204-bfa65e3a7807'), (150,NULL,'f6fd4f82e33dd54b6299106de95283f573f34973',3,2,'cf5b2beb-6960-4eaf-8d7b-5e747f29f7be'), +(150,NULL,'cb341cff740100314ada1c62dbaac7d3ddb98632',4,3,'7ef74091-1b29-40bf-b690-0f94a3b1c9b7'), (151,NULL,'c5eb1e4ec70baa761c151d708676e4c436f28587',1,NULL,'27f2534b-49b9-4e44-9232-53eadf8ba072'), (152,NULL,'8abed6579e778a2bf94e6e12b38791c7a7308b61',1,NULL,'27f2534b-49b9-4e44-9232-53eadf8ba072'), (153,NULL,'a5e4f99ff9324eae679f20131b8b8da68846b1ad',1,NULL,'27f2534b-49b9-4e44-9232-53eadf8ba072'), (153,NULL,'80a3d9eebdd6664a84a8b445c1716dba3cd747ba',2,1,'a61cf61b-8583-41ec-b204-bfa65e3a7807'), (153,NULL,'bf5595aedf69bb49b3ecf17fa8db422740b39aee',3,2,'cf5b2beb-6960-4eaf-8d7b-5e747f29f7be'), +(153,NULL,'15113924b012e7e32a07e48a7ff1ee437bdc03e5',4,3,'7ef74091-1b29-40bf-b690-0f94a3b1c9b7'), (154,NULL,'3f8eb5ecfd51c5a745a4862013547d518b7b2955',1,NULL,'27f2534b-49b9-4e44-9232-53eadf8ba072'), (155,NULL,'afbd70a177d0724af03b005dfa54d7a67825082a',1,NULL,'27f2534b-49b9-4e44-9232-53eadf8ba072'), (156,NULL,'34e04866309d1f335fc6767aa9993ef6ee88dbd3',1,NULL,'27f2534b-49b9-4e44-9232-53eadf8ba072'), @@ -1709,9 +1863,11 @@ INSERT INTO `entity_version` VALUES (161,NULL,'2e5f4fab2cdd47e184fced9b5ea6dd54ba45cdb3',1,NULL,'27f2534b-49b9-4e44-9232-53eadf8ba072'), (161,NULL,'bae9c9da4e3784233fa93ea8562bdf8109570eb9',2,1,'a61cf61b-8583-41ec-b204-bfa65e3a7807'), (161,NULL,'906ccfbc2adfdaaa0894f188becc08a2aedbf2e1',3,2,'cf5b2beb-6960-4eaf-8d7b-5e747f29f7be'), +(161,NULL,'30577d8ee9a80c7861d1a92d6c91c7cf0cf595b9',4,3,'7ef74091-1b29-40bf-b690-0f94a3b1c9b7'), (162,NULL,'49fd42751089f19e7d6bb5da57df79ba6cc546d2',1,NULL,'27f2534b-49b9-4e44-9232-53eadf8ba072'), (162,NULL,'5d512dd3f177da0402db804e1f2f7d811302bddd',2,1,'a61cf61b-8583-41ec-b204-bfa65e3a7807'), (162,NULL,'97e7860660e9f9bfdc54aff4eb8f1494ae975ca4',3,2,'cf5b2beb-6960-4eaf-8d7b-5e747f29f7be'), +(162,NULL,'df6816d130ef6abccb6e0dd8c3fc700bbbc68461',4,3,'7ef74091-1b29-40bf-b690-0f94a3b1c9b7'), (163,NULL,'ac2b6777efb772874d95a88bc0062c520e4851c9',1,NULL,'27f2534b-49b9-4e44-9232-53eadf8ba072'), (164,NULL,'767121db8cfc7592f4c50814393559b72614384d',1,NULL,'27f2534b-49b9-4e44-9232-53eadf8ba072'), (165,NULL,'162195b8d54378680140bcc63a78109e83756525',1,NULL,'27f2534b-49b9-4e44-9232-53eadf8ba072'), @@ -2039,8 +2195,8 @@ INSERT INTO `name_data` VALUES (0,102,20,'Abbreviation','FIX',0), (0,104,20,'German name','FIX',0), (0,106,20,'Person','FIX',0), -(0,107,20,'First name','FIX',0), -(0,108,20,'Last name','FIX',0), +(0,107,20,'first_name','FIX',0), +(0,108,20,'last_name','FIX',0), (0,109,20,'Email','FIX',0), (0,110,20,'ContainerType','FIX',0), (0,111,20,'Container','FIX',0), @@ -2200,11 +2356,11 @@ INSERT INTO `null_data` VALUES (0,211,144,'FIX',3), (0,197,177,'FIX',0), (0,101,102,'OBLIGATORY',0), +(0,110,102,'OBLIGATORY',0), (0,106,107,'OBLIGATORY',0), (0,106,108,'OBLIGATORY',1), -(0,106,109,'OBLIGATORY',2), -(0,106,102,'OBLIGATORY',0), -(0,110,102,'OBLIGATORY',0), +(0,106,109,'RECOMMENDED',2), +(0,106,102,'RECOMMENDED',0), (0,111,177,'OBLIGATORY',0), (0,111,178,'OBLIGATORY',0), (0,111,212,'SUGGESTED',2), @@ -2472,7 +2628,7 @@ CREATE TABLE `stats` ( LOCK TABLES `stats` WRITE; /*!40000 ALTER TABLE `stats` DISABLE KEYS */; INSERT INTO `stats` VALUES -('RootBenchmark','��\0sr\0-org.caosdb.server.database.misc.RootBenchmark����Qk]\0\0xr\04org.caosdb.server.database.misc.TransactionBenchmark����Qk]\0J\0sinceL\0measurementst\0Ljava/util/Map;[\0stackTraceElementst\0[Ljava/lang/StackTraceElement;L\0\rsubBenchmarksq\0~\0xp\0\0��ͻUsr\0java.util.HashMap���`�\0F\0\nloadFactorI\0 thresholdxp?@\0\0\0\0\0\0w\0\0\0\0\0\0\0xur\0[Ljava.lang.StackTraceElement;F*<<�\"9\0\0xp\0\0\0sr\0java.lang.StackTraceElementa Ś&6݅\0B\0formatI\0\nlineNumberL\0classLoaderNamet\0Ljava/lang/String;L\0declaringClassq\0~\0\nL\0fileNameq\0~\0\nL\0\nmethodNameq\0~\0\nL\0\nmoduleNameq\0~\0\nL\0\rmoduleVersionq\0~\0\nxp\0\0Spt\0java.lang.Threadt\0Thread.javat\0\rgetStackTracet\0 java.baset\017.0.13sq\0~\0 \0\0!t\0appt\04org.caosdb.server.database.misc.TransactionBenchmarkt\0TransactionBenchmark.javat\0<init>ppsq\0~\0 \0\0\0�q\0~\0t\0-org.caosdb.server.database.misc.RootBenchmarkq\0~\0q\0~\0ppsq\0~\0 \0\0q\0~\0q\0~\0q\0~\0t\0<clinit>ppsq\0~\0 \0\0fq\0~\0t\0org.caosdb.server.CaosDBServert\0CaosDBServer.javat\0initBackendppsq\0~\0 \0\0\0�q\0~\0q\0~\0q\0~\0t\0mainppsq\0~\0?@\0\0\0\0\0w\0\0\0\0\0\0t\0Infosr\0,org.caosdb.server.database.misc.SubBenchmark����Qk]\0L\0nameq\0~\0\nxq\0~\0\0\0��ͻXsq\0~\0?@\0\0\0\0\0\0w\0\0\0\0\0\0\0xuq\0~\0\0\0\0\nsq\0~\0 \0\0Spq\0~\0q\0~\0\rq\0~\0q\0~\0q\0~\0sq\0~\0 \0\0!q\0~\0q\0~\0q\0~\0q\0~\0ppsq\0~\0 \0\0\0�q\0~\0t\0,org.caosdb.server.database.misc.SubBenchmarkq\0~\0q\0~\0ppsq\0~\0 \0\0�q\0~\0q\0~\0q\0~\0t\0getBenchmarkppsq\0~\0 \0\0�q\0~\0q\0~\0q\0~\0q\0~\0+ppsq\0~\0 \0\0\0$q\0~\0t\02org.caosdb.server.transaction.TransactionInterfacet\0TransactionInterface.javat\0getTransactionBenchmarkppsq\0~\0 \0\0\00q\0~\0q\0~\0.q\0~\0/t\0executeppsq\0~\0 \0\0\0�q\0~\0t\0org.caosdb.server.utils.Infot\0 Info.javat\0syncDatabaseppsq\0~\0 \0\0\0�q\0~\0t\0/org.caosdb.server.database.misc.RootBenchmark$1q\0~\0t\0runppsq\0~\0 \0\0Hpq\0~\0q\0~\0\rq\0~\09q\0~\0q\0~\0sq\0~\0?@\0\0\0\0\0w\0\0\0\0\0\0t\0 SyncStatssq\0~\0\"\0\0��ͻXsq\0~\0?@\0\0\0\0\0\0w\0\0\0\0\0\0\0xuq\0~\0\0\0\0 sq\0~\0 \0\0Spq\0~\0q\0~\0\rq\0~\0q\0~\0q\0~\0sq\0~\0 \0\0!q\0~\0q\0~\0q\0~\0q\0~\0ppsq\0~\0 \0\0\0�q\0~\0q\0~\0)q\0~\0q\0~\0ppsq\0~\0 \0\0�q\0~\0q\0~\0q\0~\0q\0~\0+ppsq\0~\0 \0\0�q\0~\0q\0~\0q\0~\0q\0~\0+ppsq\0~\0 \0\0\00q\0~\0q\0~\0.q\0~\0/q\0~\02ppsq\0~\0 \0\0\0�q\0~\0q\0~\04q\0~\05q\0~\06ppsq\0~\0 \0\0\0�q\0~\0q\0~\08q\0~\0q\0~\09ppsq\0~\0 \0\0Hpq\0~\0q\0~\0\rq\0~\09q\0~\0q\0~\0sq\0~\0?@\0\0\0\0\0w\0\0\0\0\0\0t\0MySQLSyncStatssq\0~\0\"\0\0��ͻYsq\0~\0?@\0\0\0\0\0\0w\0\0\0\0\0\0\0xuq\0~\0\0\0\0sq\0~\0 \0\0Spq\0~\0q\0~\0\rq\0~\0q\0~\0q\0~\0sq\0~\0 \0\0!q\0~\0q\0~\0q\0~\0q\0~\0ppsq\0~\0 \0\0\0�q\0~\0q\0~\0)q\0~\0q\0~\0ppsq\0~\0 \0\0�q\0~\0q\0~\0q\0~\0q\0~\0+ppsq\0~\0 \0\0�q\0~\0q\0~\0q\0~\0q\0~\0+ppsq\0~\0 \0\0q\0~\0t\0-org.caosdb.server.database.BackendTransactiont\0BackendTransaction.javat\0getImplementationppsq\0~\0 \0\0\0+q\0~\0t\08org.caosdb.server.database.backend.transaction.SyncStatst\0SyncStats.javaq\0~\02ppsq\0~\0 \0\0\0�q\0~\0q\0~\0Tq\0~\0Ut\0executeTransactionppsq\0~\0 \0\0\01q\0~\0q\0~\0.q\0~\0/q\0~\02ppsq\0~\0 \0\0\0�q\0~\0q\0~\04q\0~\05q\0~\06ppsq\0~\0 \0\0\0�q\0~\0q\0~\08q\0~\0q\0~\09ppsq\0~\0 \0\0Hpq\0~\0q\0~\0\rq\0~\09q\0~\0q\0~\0sq\0~\0?@\0\0\0\0\0\0w\0\0\0\0\0\0\0xq\0~\0Jxq\0~\0<xq\0~\0!x'), +('RootBenchmark','��\0sr\0-org.caosdb.server.database.misc.RootBenchmark����Qk]\0\0xr\04org.caosdb.server.database.misc.TransactionBenchmark����Qk]\0J\0sinceL\0measurementst\0Ljava/util/Map;[\0stackTraceElementst\0[Ljava/lang/StackTraceElement;L\0\rsubBenchmarksq\0~\0xp\0\0��4��sr\0java.util.HashMap���`�\0F\0\nloadFactorI\0 thresholdxp?@\0\0\0\0\0\0w\0\0\0\0\0\0\0xur\0[Ljava.lang.StackTraceElement;F*<<�\"9\0\0xp\0\0\0sr\0java.lang.StackTraceElementa Ś&6݅\0B\0formatI\0\nlineNumberL\0classLoaderNamet\0Ljava/lang/String;L\0declaringClassq\0~\0\nL\0fileNameq\0~\0\nL\0\nmethodNameq\0~\0\nL\0\nmoduleNameq\0~\0\nL\0\rmoduleVersionq\0~\0\nxp\0\0Spt\0java.lang.Threadt\0Thread.javat\0\rgetStackTracet\0 java.baset\017.0.13sq\0~\0 \0\0!t\0appt\04org.caosdb.server.database.misc.TransactionBenchmarkt\0TransactionBenchmark.javat\0<init>ppsq\0~\0 \0\0\0�q\0~\0t\0-org.caosdb.server.database.misc.RootBenchmarkq\0~\0q\0~\0ppsq\0~\0 \0\0q\0~\0q\0~\0q\0~\0t\0<clinit>ppsq\0~\0 \0\0fq\0~\0t\0org.caosdb.server.CaosDBServert\0CaosDBServer.javat\0initBackendppsq\0~\0 \0\0\0�q\0~\0q\0~\0q\0~\0t\0mainppsq\0~\0?@\0\0\0\0\0w\0\0\0\0\0\0t\0Infosr\0,org.caosdb.server.database.misc.SubBenchmark����Qk]\0L\0nameq\0~\0\nxq\0~\0\0\0��4��sq\0~\0?@\0\0\0\0\0\0w\0\0\0\0\0\0\0xuq\0~\0\0\0\0\nsq\0~\0 \0\0Spq\0~\0q\0~\0\rq\0~\0q\0~\0q\0~\0sq\0~\0 \0\0!q\0~\0q\0~\0q\0~\0q\0~\0ppsq\0~\0 \0\0\0�q\0~\0t\0,org.caosdb.server.database.misc.SubBenchmarkq\0~\0q\0~\0ppsq\0~\0 \0\0�q\0~\0q\0~\0q\0~\0t\0getBenchmarkppsq\0~\0 \0\0�q\0~\0q\0~\0q\0~\0q\0~\0+ppsq\0~\0 \0\0\0$q\0~\0t\02org.caosdb.server.transaction.TransactionInterfacet\0TransactionInterface.javat\0getTransactionBenchmarkppsq\0~\0 \0\0\00q\0~\0q\0~\0.q\0~\0/t\0executeppsq\0~\0 \0\0\0�q\0~\0t\0org.caosdb.server.utils.Infot\0 Info.javat\0syncDatabaseppsq\0~\0 \0\0\0�q\0~\0t\0/org.caosdb.server.database.misc.RootBenchmark$1q\0~\0t\0runppsq\0~\0 \0\0Hpq\0~\0q\0~\0\rq\0~\09q\0~\0q\0~\0sq\0~\0?@\0\0\0\0\0w\0\0\0\0\0\0t\0 SyncStatssq\0~\0\"\0\0��4��sq\0~\0?@\0\0\0\0\0\0w\0\0\0\0\0\0\0xuq\0~\0\0\0\0 sq\0~\0 \0\0Spq\0~\0q\0~\0\rq\0~\0q\0~\0q\0~\0sq\0~\0 \0\0!q\0~\0q\0~\0q\0~\0q\0~\0ppsq\0~\0 \0\0\0�q\0~\0q\0~\0)q\0~\0q\0~\0ppsq\0~\0 \0\0�q\0~\0q\0~\0q\0~\0q\0~\0+ppsq\0~\0 \0\0�q\0~\0q\0~\0q\0~\0q\0~\0+ppsq\0~\0 \0\0\00q\0~\0q\0~\0.q\0~\0/q\0~\02ppsq\0~\0 \0\0\0�q\0~\0q\0~\04q\0~\05q\0~\06ppsq\0~\0 \0\0\0�q\0~\0q\0~\08q\0~\0q\0~\09ppsq\0~\0 \0\0Hpq\0~\0q\0~\0\rq\0~\09q\0~\0q\0~\0sq\0~\0?@\0\0\0\0\0w\0\0\0\0\0\0t\0MySQLSyncStatssq\0~\0\"\0\0��4��sq\0~\0?@\0\0\0\0\0\0w\0\0\0\0\0\0\0xuq\0~\0\0\0\0sq\0~\0 \0\0Spq\0~\0q\0~\0\rq\0~\0q\0~\0q\0~\0sq\0~\0 \0\0!q\0~\0q\0~\0q\0~\0q\0~\0ppsq\0~\0 \0\0\0�q\0~\0q\0~\0)q\0~\0q\0~\0ppsq\0~\0 \0\0�q\0~\0q\0~\0q\0~\0q\0~\0+ppsq\0~\0 \0\0�q\0~\0q\0~\0q\0~\0q\0~\0+ppsq\0~\0 \0\0q\0~\0t\0-org.caosdb.server.database.BackendTransactiont\0BackendTransaction.javat\0getImplementationppsq\0~\0 \0\0\0+q\0~\0t\08org.caosdb.server.database.backend.transaction.SyncStatst\0SyncStats.javaq\0~\02ppsq\0~\0 \0\0\0�q\0~\0q\0~\0Tq\0~\0Ut\0executeTransactionppsq\0~\0 \0\0\01q\0~\0q\0~\0.q\0~\0/q\0~\02ppsq\0~\0 \0\0\0�q\0~\0q\0~\04q\0~\05q\0~\06ppsq\0~\0 \0\0\0�q\0~\0q\0~\08q\0~\0q\0~\09ppsq\0~\0 \0\0Hpq\0~\0q\0~\0\rq\0~\09q\0~\0q\0~\0sq\0~\0?@\0\0\0\0\0\0w\0\0\0\0\0\0\0xq\0~\0Jxq\0~\0<xq\0~\0!x'), ('TransactionBenchmark','��\0sr\00caosdb.server.database.misc.TransactionBenchmark�Cl=���E\0J\0sinceL\0acct\0Ljava/util/HashMap;L\0countsq\0~\0xp\0\0l���Wsr\0java.util.HashMap���`�\0F\0\nloadFactorI\0 thresholdxp?@\0\0\0\0\0w\0\0\0\0\0\0t\0 SyncStatssr\0java.lang.Long;��̏#�\0J\0valuexr\0java.lang.Number������\0\0xp\0\0\0\0\0\0\0t\0GetInfosq\0~\0\0\0\0\0\0\0 xsq\0~\0?@\0\0\0\0\0w\0\0\0\0\0\0q\0~\0sr\0java.lang.Integer⠤���8\0I\0valuexq\0~\0\0\0\0q\0~\0 sq\0~\0\0\0\0x'); /*!40000 ALTER TABLE `stats` ENABLE KEYS */; UNLOCK TABLES; @@ -2521,6 +2677,10 @@ INSERT INTO `text_data` VALUES (0,193,113,'20 rooms','FIX',2), (0,195,113,'30 m²','FIX',2), (0,197,113,'300 l','FIX',2), +(0,188,107,'My','FIX',0), +(0,188,102,'myn','FIX',1), +(0,188,108,'Name','FIX',2), +(0,188,109,'my.name@example.com','FIX',3), (143,146,21,'°','FIX',0), (143,147,21,'°','FIX',0), (143,144,21,'m','FIX',0), @@ -2532,11 +2692,7 @@ INSERT INTO `text_data` VALUES (161,146,21,'°','FIX',0), (161,147,21,'°','FIX',0), (162,146,21,'°','FIX',0), -(162,147,21,'°','FIX',0), -(0,188,107,'My','FIX',0), -(0,188,102,'myn','FIX',1), -(0,188,108,'Name','FIX',2), -(0,188,109,'my.name@example.com','FIX',3); +(162,147,21,'°','FIX',0); /*!40000 ALTER TABLE `text_data` ENABLE KEYS */; UNLOCK TABLES; @@ -2721,7 +2877,23 @@ INSERT INTO `transaction_log` VALUES ('Delete','180','admin',1737714483,466000000,'PAM'), ('Delete','179','admin',1737714485,611000000,'PAM'), ('Delete','107','admin',1737714497,308000000,'PAM'), -('Delete','105','admin',1737714500,565000000,'PAM'); +('Delete','105','admin',1737714500,565000000,'PAM'), +('Update','109','admin',1737990337,853000000,'PAM'), +('Update','110','admin',1737990350,365000000,'PAM'), +('Update','108','admin',1737990395,730000000,'PAM'), +('Update','113','admin',1737990395,730000000,'PAM'), +('Update','120','admin',1737990395,730000000,'PAM'), +('Update','121','admin',1737990395,730000000,'PAM'), +('Update','138','admin',1737990395,730000000,'PAM'), +('Update','145','admin',1737990395,730000000,'PAM'), +('Update','146','admin',1737990395,730000000,'PAM'), +('Update','147','admin',1737990395,730000000,'PAM'), +('Update','148','admin',1737990395,730000000,'PAM'), +('Update','149','admin',1737990395,730000000,'PAM'), +('Update','152','admin',1737990395,730000000,'PAM'), +('Update','155','admin',1737990395,730000000,'PAM'), +('Update','163','admin',1737990395,730000000,'PAM'), +('Update','164','admin',1737990395,730000000,'PAM'); /*!40000 ALTER TABLE `transaction_log` ENABLE KEYS */; UNLOCK TABLES; @@ -2765,10 +2937,12 @@ INSERT INTO `transactions` VALUES ('2df660f0-e3a6-447e-837f-4778e5323f5d','admin','PAM',1736265392,576000000), ('34fade63-2811-4725-becf-0f2b1f84ad90','admin','PAM',1736265204,999000000), ('372c0d25-a1ab-45d2-bf7e-76e583bf5192','admin','PAM',1737714467,357000000), +('37b23e09-803b-4ea2-8caf-00f0242d9c66','admin','PAM',1737990350,365000000), ('3c931e13-7e9f-4835-99df-d325020b887d','admin','PAM',1736265488,391000000), ('488967a3-a042-43d4-b74d-485f4bf622a2','admin','PAM',1736265441,647000000), ('55dcaf7b-7372-4778-995a-a6a8bde1b471','admin','PAM',1736264805,952000000), ('7663f26d-982f-4710-aeab-073a44290f3a','admin','PAM',1736265841,217000000), +('7ef74091-1b29-40bf-b690-0f94a3b1c9b7','admin','PAM',1737990395,730000000), ('80009e0c-8c91-4add-9ada-6aed2ac526b7','admin','PAM',1737542797,604000000), ('8205d330-42ef-4519-9e5e-ade1e2465bed','admin','PAM',1736265392,368000000), ('84bd4faf-510c-4950-b827-4bab81546887','admin','PAM',1736264663,736000000), @@ -2796,6 +2970,7 @@ INSERT INTO `transactions` VALUES ('da56170f-ae54-4ecf-9aa4-342d7512384f','admin','PAM',1736265798,309000000), ('daa492ef-1495-4123-9966-9951328211b3','admin','PAM',1736265204,580000000), ('dbf1dd0f-405c-4952-b8b6-62e169c79397','admin','PAM',1736265204,802000000), +('ddaf373d-6625-4b97-ab3d-7f91f13e7c27','admin','PAM',1737990337,853000000), ('df3a0e97-6feb-42aa-8800-074ee5520428','admin','PAM',1736265392,321000000), ('e27923fa-df80-4883-9f70-03ed7dbe8fcc','admin','PAM',1737714483,466000000), ('f284f0d8-aba2-44e9-bfc7-ae68fab970b9','admin','PAM',1736265770,375000000), @@ -7269,4 +7444,4 @@ DELIMITER ; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2025-01-24 10:29:19 +-- Dump completed on 2025-01-27 15:08:09