diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml
index e5bb4c9b8ca6ad1750922cb07c92cd6c5eb77c6b..02ccac5c48e039a3374a0d169f3b355f897e45fc 100644
--- a/.docker/docker-compose.yml
+++ b/.docker/docker-compose.yml
@@ -34,6 +34,7 @@ services:
DEBUG: 1
CAOSDB_CONFIG_AUTHTOKEN_CONFIG: "conf/core/authtoken.example.yaml"
CAOSDB_CONFIG_TRANSACTION_BENCHMARK_ENABLED: "TRUE"
+ CAOSDB_CONFIG__CAOSDB_INTEGRATION_TEST_SUITE_KEY: 10b128cf8a1372f30aa3697466bb55e76974e0c16a599bb44ace88f19c8f61e2
volumes:
scripting:
authtoken:
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 30a8cd8fe4c08fd3fe0f3f98aaa56b83cb623086..bfac6b0012cb067657567381752a600736e7d788 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,7 +3,7 @@
#
# Copyright (C) 2018 Research Group Biomedical Physics,
# Max-Planck-Institute for Dynamics and Self-Organization Göttingen
-# Copyright (C) 2019 Henrik tom Wörden
+# Copyright (C) 2019 Henrik tom Wörden
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
@@ -113,14 +113,34 @@ info:
script:
- *env
-unittest:
+unittest_py3.9:
tags: [cached-dind]
- image: docker:20.10
stage: test
image: $CI_REGISTRY_IMAGE
script:
- tox
+unittest_py3.8:
+ tags: [cached-dind]
+ stage: test
+ image: python:3.8
+ script: &python_test_script
+ # install dependencies
+ - pip install pytest pytest-cov
+ # TODO: Use f-branch logic here
+ - pip install git+https://gitlab.indiscale.com/caosdb/src/caosdb-pylib.git@dev
+ - pip install git+https://gitlab.indiscale.com/caosdb/src/caosdb-advanced-user-tools.git@dev
+ - pip install .
+ # actual test
+ - caosdb-crawler --help
+ - pytest --cov=caosdb -vv ./unittests
+
+unittest_py3.10:
+ tags: [cached-dind]
+ stage: test
+ image: python:3.10
+ script: *python_test_script
+
inttest:
tags: [docker]
services:
@@ -224,7 +244,7 @@ build-testenv:
- docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
# use here general latest or specific branch latest...
- - docker build
+ - docker build
--build-arg PYLIB=${PYLIB}
--build-arg ADVANCED=${ADVANCED:dev}
--file .docker/Dockerfile
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6fd18cee55ad484fa54aa527b997fd757fbedde0..f03b7c4c8ea737af4f5afda6c31e6af0956db811 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,7 +11,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Changed ###
-- `_AbstractDictElementConverter` uses `re.DOTALL` for `match_value`
+- There are no DictXYElements any more. For example, DictTextElement is now
+ simply a TextElement. The behavior of the following classes changed:
+ - DictElementConverter (old: DictConverter) now can use "match" keywords. If
+ none are in the definition, the behavior is as before.
+ - TextElement used the 'match' keyword before, which was applied to the
+ value. This is will in future be applied to the key instead and is now
+ forbidden to used. Please use 'match_name' or 'match_value'.
### Deprecated ###
@@ -19,13 +25,39 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Fixed ###
+### Security ###
+
+### Documentation ###
+
+## [0.2.0] - 2022-11-18 ##
+(Florian Spreckelsen)
+
+### Added ###
+- the -c/--add-cwd-to-path option allows to plays for example custom converter
+ modules into the current working directory(cwd) since the cwd is added to
+ the Python path.
+
+### Changed ###
+
+- Converters often used in dicts (DictFloatElementConverter,
+ DictIntegerElementConverter, ...) do now accept other StructureElements by
+ default. For example a DictIntegerElement is accepted by default instead of a
+ DictFloatElement. This behavior can be changed (see converter documentation).
+ **Note** This might lead to additional matches compared to previous versions.
+- `_AbstractDictElementConverter` uses `re.DOTALL` for `match_value`
+- The "fallback" parent, the name of the element in the cfood, is only used
+ when the object is created and only if there are no parents given.
+
+### Fixed ###
+
* [#31](https://gitlab.com/caosdb/caosdb-crawler/-/issues/31) Identified cache:
Hash is the same for Records without IDs
* [#30](https://gitlab.com/caosdb/caosdb-crawler/-/issues/30)
* [#23](https://gitlab.com/caosdb/caosdb-crawler/-/issues/23) Crawler may
overwrite and delete existing data in case of manually added properties
-
-### Security ###
+* [#10](https://gitlab.com/caosdb/caosdb-crawler/-/issues/10) floats can be
+ interpreted as integers and vice versa, there are defaults for allowing other
+ types and this can be changed per converter
## [0.1.0] - 2022-10-11
(Florian Spreckelsen)
@@ -54,5 +86,5 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
* FIX: #35 Parent cannot be set from value
* [#6](https://gitlab.com/caosdb/caosdb-crawler/-/issues/6): Fixed many type
hints to be compatible to python 3.8
-* [#9](https://gitlab.com/caosdb/caosdb-crawler/-/issues/9): Sclaras of types
+* [#9](https://gitlab.com/caosdb/caosdb-crawler/-/issues/9): Scalars of types
different than string can now be given in cfood definitions
diff --git a/README.md b/README.md
index b97fc8775ba334c03c5c0a42238e9f396301e6b3..109285abd91898b810b9f7b95104358af9e12537 100644
--- a/README.md
+++ b/README.md
@@ -25,7 +25,12 @@ After installation of the package run (within the project folder):
pytest
```
+There is the file `unittests/records.xml` that servers as a dummy for a server state with files.
+You can recreate this by uncommenting a section in `integrationtests/basic_example/test_basic.py`
+and rerunning the integration test.
+
## Integration Tests
+
see `integrationtests/README.md`
# Contributers
diff --git a/integrationtests/basic_example/test_basic.py b/integrationtests/basic_example/test_basic.py
index 571720ab1dafd0384672a55ec5c6e8a8aeffb605..a4261cd92fec32b757f3abd210881d49e6a5e381 100755
--- a/integrationtests/basic_example/test_basic.py
+++ b/integrationtests/basic_example/test_basic.py
@@ -1,7 +1,6 @@
#!/usr/bin/env python3
# encoding: utf-8
#
-# ** header v3.0
# This file is a part of the CaosDB Project.
#
# Copyright (C) 2021 Indiscale GmbH <info@indiscale.com>
@@ -21,11 +20,10 @@
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <https://www.gnu.org/licenses/>.
#
-# ** end header
#
"""
-module description
+an integration test module that does basic integration tests
"""
from caosadvancedtools.crawler import Crawler as OldCrawler
@@ -41,9 +39,8 @@ import pytest
from caosadvancedtools.models.parser import parse_model_from_yaml
import yaml
-# TODO is not yet merged in caosadvancedtools
-#from caosadvancedtools.testutils import clear_database, set_test_key
-# set_test_key("10b128cf8a1372f30aa3697466bb55e76974e0c16a599bb44ace88f19c8f61e2")
+from caosdb.utils.register_tests import clear_database, set_test_key
+set_test_key("10b128cf8a1372f30aa3697466bb55e76974e0c16a599bb44ace88f19c8f61e2")
def rfp(*pathcomponents):
@@ -54,11 +51,6 @@ def rfp(*pathcomponents):
return os.path.join(os.path.dirname(__file__), *pathcomponents)
-@pytest.fixture
-def clear_database():
- db.execute_query("FIND Entity").delete()
-
-
@pytest.fixture
def usemodel():
model = parse_model_from_yaml(rfp("model.yml"))
@@ -122,14 +114,15 @@ def test_single_insertion(clear_database, usemodel, crawler, ident):
for i in reversed(range(len(res))):
if res[i].parents[0].name == "PyTestInfo":
del res[i]
- filename = rfp("..", "..", "unittests", "records.xml")
- with open(filename, "w") as f:
- xml = res.to_xml()
- # Remove noscript and transaction benchmark:
- for tag in ("noscript", "TransactionBenchmark"):
- if xml.find(tag) is not None:
- xml.remove(xml.find(tag))
- f.write(db.common.utils.xml2str(xml))
+ # uncomment this to recreate the `records.xml` file
+ # filename = rfp("..", "..", "unittests", "records.xml")
+ # with open(filename, "w") as f:
+ # xml = res.to_xml()
+ # # Remove noscript and transaction benchmark:
+ # for tag in ("noscript", "TransactionBenchmark"):
+ # if xml.find(tag) is not None:
+ # xml.remove(xml.find(tag))
+ # f.write(db.common.utils.xml2str(xml))
assert len(ins) == 18
assert len(ups) == 0
diff --git a/integrationtests/test-profile/custom/other/restore/caosroot.example.tar.gz b/integrationtests/test-profile/custom/other/restore/caosroot.example.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..5e02a693960c64d3c82401e2de4abd72f7fd5fd1
Binary files /dev/null and b/integrationtests/test-profile/custom/other/restore/caosroot.example.tar.gz differ
diff --git a/integrationtests/test-profile/custom/other/restore/restore.dump.sql b/integrationtests/test-profile/custom/other/restore/restore.dump.sql
new file mode 100644
index 0000000000000000000000000000000000000000..eebed86273bbea2e343842d7ac6f6771709373e1
--- /dev/null
+++ b/integrationtests/test-profile/custom/other/restore/restore.dump.sql
@@ -0,0 +1,3189 @@
+-- MySQL dump 10.16 Distrib 10.1.38-MariaDB, for debian-linux-gnu (x86_64)
+--
+-- Host: sqldb Database: caosdb
+-- ------------------------------------------------------
+-- Server version 10.4.2-MariaDB-1:10.4.2+maria~bionic
+
+/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
+/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
+/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
+/*!40101 SET NAMES utf8 */;
+/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
+/*!40103 SET TIME_ZONE='+00:00' */;
+/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
+/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
+/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
+/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
+
+--
+-- Table structure for table `collection_type`
+--
+
+DROP TABLE IF EXISTS `collection_type`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `collection_type` (
+ `domain_id` int(10) unsigned NOT NULL,
+ `entity_id` int(10) unsigned NOT NULL,
+ `property_id` int(10) unsigned NOT NULL,
+ `collection` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
+ KEY `domain_id` (`domain_id`,`entity_id`),
+ KEY `entity_id` (`entity_id`),
+ KEY `property_id` (`property_id`),
+ CONSTRAINT `collection_type_domain_id_entity` FOREIGN KEY (`domain_id`) REFERENCES `entities` (`id`),
+ CONSTRAINT `collection_type_entity_id_entity` FOREIGN KEY (`entity_id`) REFERENCES `entities` (`id`),
+ CONSTRAINT `collection_type_property_id_entity` FOREIGN KEY (`property_id`) REFERENCES `entities` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `collection_type`
+--
+
+LOCK TABLES `collection_type` WRITE;
+/*!40000 ALTER TABLE `collection_type` DISABLE KEYS */;
+/*!40000 ALTER TABLE `collection_type` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `data_type`
+--
+
+DROP TABLE IF EXISTS `data_type`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `data_type` (
+ `domain_id` int(10) unsigned NOT NULL,
+ `entity_id` int(10) unsigned NOT NULL,
+ `property_id` int(10) unsigned NOT NULL,
+ `datatype` int(10) unsigned NOT NULL,
+ UNIQUE KEY `datatype_ukey` (`domain_id`,`entity_id`,`property_id`),
+ KEY `name_ov_dom_ent_idx` (`domain_id`,`entity_id`),
+ KEY `datatype_forkey_ent` (`entity_id`),
+ KEY `datatype_forkey_pro` (`property_id`),
+ KEY `datatype_forkey_type` (`datatype`),
+ CONSTRAINT `datatype_forkey_dom` FOREIGN KEY (`domain_id`) REFERENCES `entities` (`id`),
+ CONSTRAINT `datatype_forkey_ent` FOREIGN KEY (`entity_id`) REFERENCES `entities` (`id`),
+ CONSTRAINT `datatype_forkey_pro` FOREIGN KEY (`property_id`) REFERENCES `entities` (`id`),
+ CONSTRAINT `datatype_forkey_type` FOREIGN KEY (`datatype`) REFERENCES `entities` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `data_type`
+--
+
+LOCK TABLES `data_type` WRITE;
+/*!40000 ALTER TABLE `data_type` DISABLE KEYS */;
+INSERT INTO `data_type` VALUES (0,0,20,14),(0,0,21,14),(0,0,24,14);
+/*!40000 ALTER TABLE `data_type` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `date_data`
+--
+
+DROP TABLE IF EXISTS `date_data`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `date_data` (
+ `domain_id` int(10) unsigned DEFAULT NULL,
+ `entity_id` int(10) unsigned DEFAULT NULL,
+ `property_id` int(10) unsigned DEFAULT NULL,
+ `value` int(11) NOT NULL,
+ `status` enum('OBLIGATORY','RECOMMENDED','SUGGESTED','FIX') COLLATE utf8_unicode_ci DEFAULT NULL,
+ `pidx` int(10) unsigned NOT NULL DEFAULT 0,
+ KEY `date_data_dom_ent_idx` (`domain_id`,`entity_id`),
+ KEY `date_ov_forkey_ent` (`entity_id`),
+ KEY `date_ov_forkey_pro` (`property_id`),
+ CONSTRAINT `date_ov_forkey_dom` FOREIGN KEY (`domain_id`) REFERENCES `entities` (`id`),
+ CONSTRAINT `date_ov_forkey_ent` FOREIGN KEY (`entity_id`) REFERENCES `entities` (`id`),
+ CONSTRAINT `date_ov_forkey_pro` FOREIGN KEY (`property_id`) REFERENCES `entities` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `date_data`
+--
+
+LOCK TABLES `date_data` WRITE;
+/*!40000 ALTER TABLE `date_data` DISABLE KEYS */;
+/*!40000 ALTER TABLE `date_data` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `datetime_data`
+--
+
+DROP TABLE IF EXISTS `datetime_data`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `datetime_data` (
+ `domain_id` int(10) unsigned NOT NULL COMMENT 'Domain.',
+ `entity_id` int(10) unsigned NOT NULL COMMENT 'Entity.',
+ `property_id` int(10) unsigned NOT NULL COMMENT 'Property.',
+ `status` enum('OBLIGATORY','RECOMMENDED','SUGGESTED','FIX','REPLACEMENT') COLLATE utf8_unicode_ci NOT NULL COMMENT 'Status of this statement.',
+ `pidx` int(10) unsigned NOT NULL DEFAULT 0,
+ `value_ns` int(10) unsigned DEFAULT NULL,
+ `value` bigint(20) NOT NULL,
+ KEY `domain_id` (`domain_id`,`entity_id`),
+ KEY `dat_entity_id_entity` (`entity_id`),
+ KEY `dat_property_id_entity` (`property_id`),
+ CONSTRAINT `dat_domain_id_entity` FOREIGN KEY (`domain_id`) REFERENCES `entities` (`id`),
+ CONSTRAINT `dat_entity_id_entity` FOREIGN KEY (`entity_id`) REFERENCES `entities` (`id`),
+ CONSTRAINT `dat_property_id_entity` FOREIGN KEY (`property_id`) REFERENCES `entities` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `datetime_data`
+--
+
+LOCK TABLES `datetime_data` WRITE;
+/*!40000 ALTER TABLE `datetime_data` DISABLE KEYS */;
+/*!40000 ALTER TABLE `datetime_data` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `desc_overrides`
+--
+
+DROP TABLE IF EXISTS `desc_overrides`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `desc_overrides` (
+ `domain_id` int(10) unsigned DEFAULT NULL,
+ `entity_id` int(10) unsigned DEFAULT NULL,
+ `property_id` int(10) unsigned DEFAULT NULL,
+ `description` text COLLATE utf8_unicode_ci DEFAULT NULL,
+ UNIQUE KEY `desc_ov_ukey` (`domain_id`,`entity_id`,`property_id`),
+ KEY `desc_ov_dom_ent_idx` (`domain_id`,`entity_id`),
+ KEY `desc_ov_forkey_ent` (`entity_id`),
+ KEY `desc_ov_forkey_pro` (`property_id`),
+ CONSTRAINT `desc_ov_forkey_dom` FOREIGN KEY (`domain_id`) REFERENCES `entities` (`id`),
+ CONSTRAINT `desc_ov_forkey_ent` FOREIGN KEY (`entity_id`) REFERENCES `entities` (`id`),
+ CONSTRAINT `desc_ov_forkey_pro` FOREIGN KEY (`property_id`) REFERENCES `entities` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `desc_overrides`
+--
+
+LOCK TABLES `desc_overrides` WRITE;
+/*!40000 ALTER TABLE `desc_overrides` DISABLE KEYS */;
+/*!40000 ALTER TABLE `desc_overrides` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `double_data`
+--
+
+DROP TABLE IF EXISTS `double_data`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `double_data` (
+ `domain_id` int(10) unsigned NOT NULL COMMENT 'Domain.',
+ `entity_id` int(10) unsigned NOT NULL COMMENT 'Entity.',
+ `property_id` int(10) unsigned NOT NULL COMMENT 'Property.',
+ `value` double NOT NULL,
+ `status` enum('OBLIGATORY','RECOMMENDED','SUGGESTED','FIX','REPLACEMENT') COLLATE utf8_unicode_ci NOT NULL COMMENT 'Status of this statement.',
+ `pidx` int(10) unsigned NOT NULL DEFAULT 0,
+ `unit_sig` bigint(20) DEFAULT NULL,
+ KEY `domain_id` (`domain_id`,`entity_id`),
+ KEY `dou_entity_id_entity` (`entity_id`),
+ KEY `dou_property_id_entity` (`property_id`),
+ CONSTRAINT `dou_domain_id_entity` FOREIGN KEY (`domain_id`) REFERENCES `entities` (`id`),
+ CONSTRAINT `dou_entity_id_entity` FOREIGN KEY (`entity_id`) REFERENCES `entities` (`id`),
+ CONSTRAINT `dou_property_id_entity` FOREIGN KEY (`property_id`) REFERENCES `entities` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `double_data`
+--
+
+LOCK TABLES `double_data` WRITE;
+/*!40000 ALTER TABLE `double_data` DISABLE KEYS */;
+/*!40000 ALTER TABLE `double_data` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `entities`
+--
+
+DROP TABLE IF EXISTS `entities`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `entities` (
+ `id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT 'Unique identifier.',
+ `name` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL COMMENT 'Name of the entity.',
+ `description` text COLLATE utf8_unicode_ci DEFAULT NULL,
+ `role` enum('RECORDTYPE','RECORD','FILE','DOMAIN','PROPERTY','DATATYPE','ROLE','QUERYTEMPLATE') COLLATE utf8_unicode_ci NOT NULL,
+ `acl` int(10) unsigned DEFAULT NULL COMMENT 'Access Control List for the entity.',
+ PRIMARY KEY (`id`),
+ KEY `entity_entity_acl` (`acl`),
+ CONSTRAINT `entity_entity_acl` FOREIGN KEY (`acl`) REFERENCES `entity_acl` (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=100 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `entities`
+--
+
+LOCK TABLES `entities` WRITE;
+/*!40000 ALTER TABLE `entities` DISABLE KEYS */;
+INSERT INTO `entities` VALUES (0,'DOMAIN','The default domain.','ROLE',0),(1,'RECORDTYPE','The default recordtype.','ROLE',0),(2,'RECORD','The default record.','ROLE',0),(3,'FILE','The default file.','ROLE',0),(4,'PROPERTY','The default property.','ROLE',0),(7,'DATATYPE','The default datatype.','ROLE',0),(8,'QUERYTEMPLATE','The QueryTemplate role.','ROLE',0),(11,'REFERENCE','The default reference data type.','DATATYPE',0),(12,'INTEGER','The default integer data type.','DATATYPE',0),(13,'DOUBLE','The default double data type.','DATATYPE',0),(14,'TEXT','The default text data type.','DATATYPE',0),(15,'DATETIME','The default datetime data type.','DATATYPE',0),(16,'TIMESPAN','The default timespan data type.','DATATYPE',0),(17,'FILE','The default file reference data type.','DATATYPE',0),(18,'BOOLEAN','The defaulf boolean data type','DATATYPE',0),(20,'name','Name of an entity','PROPERTY',0),(21,'unit','Unit of an entity.','PROPERTY',0),(24,'description','Description of an entity.','PROPERTY',0),(50,'SQLITE','The SQLite file data type.','DATATYPE',0),(99,NULL,NULL,'RECORDTYPE',0);
+/*!40000 ALTER TABLE `entities` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `entity_acl`
+--
+
+DROP TABLE IF EXISTS `entity_acl`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `entity_acl` (
+ `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `acl` varbinary(65525) NOT NULL,
+ PRIMARY KEY (`id`),
+ KEY `entity_acl_acl` (`acl`(3072))
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `entity_acl`
+--
+
+LOCK TABLES `entity_acl` WRITE;
+/*!40000 ALTER TABLE `entity_acl` DISABLE KEYS */;
+INSERT INTO `entity_acl` VALUES (0,'');
+/*!40000 ALTER TABLE `entity_acl` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `enum_data`
+--
+
+DROP TABLE IF EXISTS `enum_data`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `enum_data` (
+ `domain_id` int(10) unsigned DEFAULT NULL,
+ `entity_id` int(10) unsigned DEFAULT NULL,
+ `property_id` int(10) unsigned DEFAULT NULL,
+ `value` varbinary(255) NOT NULL,
+ `status` enum('OBLIGATORY','RECOMMENDED','SUGGESTED','FIX') COLLATE utf8_unicode_ci DEFAULT NULL,
+ `pidx` int(10) unsigned NOT NULL DEFAULT 0,
+ KEY `enum_ov_dom_ent_idx` (`domain_id`,`entity_id`),
+ KEY `enum_ov_forkey_ent` (`entity_id`),
+ KEY `enum_ov_forkey_pro` (`property_id`),
+ CONSTRAINT `enum_ov_forkey_dom` FOREIGN KEY (`domain_id`) REFERENCES `entities` (`id`),
+ CONSTRAINT `enum_ov_forkey_ent` FOREIGN KEY (`entity_id`) REFERENCES `entities` (`id`),
+ CONSTRAINT `enum_ov_forkey_pro` FOREIGN KEY (`property_id`) REFERENCES `entities` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `enum_data`
+--
+
+LOCK TABLES `enum_data` WRITE;
+/*!40000 ALTER TABLE `enum_data` DISABLE KEYS */;
+/*!40000 ALTER TABLE `enum_data` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `files`
+--
+
+DROP TABLE IF EXISTS `files`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `files` (
+ `file_id` int(10) unsigned NOT NULL COMMENT 'The file''s ID.',
+ `path` varchar(255) COLLATE utf8_unicode_ci NOT NULL COMMENT 'Directory of the file.',
+ `size` bigint(20) unsigned NOT NULL COMMENT 'Size in kB (oktet bytes).',
+ `hash` binary(64) DEFAULT NULL,
+ `checked_timestamp` bigint(20) NOT NULL DEFAULT 0,
+ PRIMARY KEY (`file_id`),
+ CONSTRAINT `fil_file_id_entity` FOREIGN KEY (`file_id`) REFERENCES `entities` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `files`
+--
+
+LOCK TABLES `files` WRITE;
+/*!40000 ALTER TABLE `files` DISABLE KEYS */;
+/*!40000 ALTER TABLE `files` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `integer_data`
+--
+
+DROP TABLE IF EXISTS `integer_data`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `integer_data` (
+ `domain_id` int(10) unsigned NOT NULL COMMENT 'Domain.',
+ `entity_id` int(10) unsigned NOT NULL COMMENT 'Entity.',
+ `property_id` int(10) unsigned NOT NULL COMMENT 'Property.',
+ `value` bigint(20) NOT NULL,
+ `status` enum('OBLIGATORY','RECOMMENDED','SUGGESTED','FIX','REPLACEMENT') COLLATE utf8_unicode_ci NOT NULL COMMENT 'Status of this statement.',
+ `pidx` int(10) unsigned NOT NULL DEFAULT 0,
+ `unit_sig` bigint(20) DEFAULT NULL,
+ KEY `domain_id` (`domain_id`,`entity_id`),
+ KEY `int_entity_id_entity` (`entity_id`),
+ KEY `int_property_id_entity` (`property_id`),
+ CONSTRAINT `int_domain_id_entity` FOREIGN KEY (`domain_id`) REFERENCES `entities` (`id`),
+ CONSTRAINT `int_entity_id_entity` FOREIGN KEY (`entity_id`) REFERENCES `entities` (`id`),
+ CONSTRAINT `int_property_id_entity` FOREIGN KEY (`property_id`) REFERENCES `entities` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `integer_data`
+--
+
+LOCK TABLES `integer_data` WRITE;
+/*!40000 ALTER TABLE `integer_data` DISABLE KEYS */;
+/*!40000 ALTER TABLE `integer_data` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `isa_cache`
+--
+
+DROP TABLE IF EXISTS `isa_cache`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `isa_cache` (
+ `child` int(10) unsigned NOT NULL,
+ `parent` int(10) unsigned NOT NULL,
+ `rpath` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
+ PRIMARY KEY (`child`,`parent`,`rpath`),
+ KEY `isa_cache_parent_entity` (`parent`),
+ CONSTRAINT `isa_cache_child_entity` FOREIGN KEY (`child`) REFERENCES `entities` (`id`),
+ CONSTRAINT `isa_cache_parent_entity` FOREIGN KEY (`parent`) REFERENCES `entities` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `isa_cache`
+--
+
+LOCK TABLES `isa_cache` WRITE;
+/*!40000 ALTER TABLE `isa_cache` DISABLE KEYS */;
+/*!40000 ALTER TABLE `isa_cache` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `logging`
+--
+
+DROP TABLE IF EXISTS `logging`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `logging` (
+ `level` int(11) NOT NULL,
+ `logger` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
+ `message` mediumtext COLLATE utf8_unicode_ci NOT NULL,
+ `millis` bigint(20) NOT NULL,
+ `logRecord` blob NOT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `logging`
+--
+
+LOCK TABLES `logging` WRITE;
+/*!40000 ALTER TABLE `logging` DISABLE KEYS */;
+/*!40000 ALTER TABLE `logging` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `name_data`
+--
+
+DROP TABLE IF EXISTS `name_data`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `name_data` (
+ `domain_id` int(10) unsigned NOT NULL,
+ `entity_id` int(10) unsigned NOT NULL,
+ `property_id` int(10) unsigned NOT NULL,
+ `value` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
+ `status` enum('OBLIGATORY','RECOMMENDED','SUGGESTED','FIX','REPLACEMENT') COLLATE utf8_unicode_ci NOT NULL,
+ `pidx` int(10) unsigned NOT NULL DEFAULT 0,
+ KEY `domain_id` (`domain_id`,`entity_id`),
+ KEY `entity_id` (`entity_id`),
+ KEY `property_id` (`property_id`),
+ KEY `value` (`value`),
+ CONSTRAINT `name_data_domain_id_entity` FOREIGN KEY (`domain_id`) REFERENCES `entities` (`id`),
+ CONSTRAINT `name_data_entity_id_entity` FOREIGN KEY (`entity_id`) REFERENCES `entities` (`id`),
+ CONSTRAINT `name_data_property_id_entity` FOREIGN KEY (`property_id`) REFERENCES `entities` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `name_data`
+--
+
+LOCK TABLES `name_data` WRITE;
+/*!40000 ALTER TABLE `name_data` DISABLE KEYS */;
+/*!40000 ALTER TABLE `name_data` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `name_overrides`
+--
+
+DROP TABLE IF EXISTS `name_overrides`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `name_overrides` (
+ `domain_id` int(10) unsigned DEFAULT NULL,
+ `entity_id` int(10) unsigned DEFAULT NULL,
+ `property_id` int(10) unsigned DEFAULT NULL,
+ `name` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+ UNIQUE KEY `name_ov_ukey` (`domain_id`,`entity_id`,`property_id`),
+ KEY `name_ov_dom_ent_idx` (`domain_id`,`entity_id`),
+ KEY `name_ov_forkey_ent` (`entity_id`),
+ KEY `name_ov_forkey_pro` (`property_id`),
+ CONSTRAINT `name_ov_forkey_dom` FOREIGN KEY (`domain_id`) REFERENCES `entities` (`id`),
+ CONSTRAINT `name_ov_forkey_ent` FOREIGN KEY (`entity_id`) REFERENCES `entities` (`id`),
+ CONSTRAINT `name_ov_forkey_pro` FOREIGN KEY (`property_id`) REFERENCES `entities` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `name_overrides`
+--
+
+LOCK TABLES `name_overrides` WRITE;
+/*!40000 ALTER TABLE `name_overrides` DISABLE KEYS */;
+/*!40000 ALTER TABLE `name_overrides` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `null_data`
+--
+
+DROP TABLE IF EXISTS `null_data`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `null_data` (
+ `domain_id` int(10) unsigned DEFAULT NULL,
+ `entity_id` int(10) unsigned DEFAULT NULL,
+ `property_id` int(10) unsigned DEFAULT NULL,
+ `status` enum('OBLIGATORY','RECOMMENDED','SUGGESTED','FIX') COLLATE utf8_unicode_ci DEFAULT NULL,
+ `pidx` int(10) unsigned NOT NULL DEFAULT 0,
+ KEY `null_data_dom_ent_idx` (`domain_id`,`entity_id`),
+ KEY `null_forkey_ent` (`entity_id`),
+ KEY `null_forkey_pro` (`property_id`),
+ CONSTRAINT `null_forkey_dom` FOREIGN KEY (`domain_id`) REFERENCES `entities` (`id`),
+ CONSTRAINT `null_forkey_ent` FOREIGN KEY (`entity_id`) REFERENCES `entities` (`id`),
+ CONSTRAINT `null_forkey_pro` FOREIGN KEY (`property_id`) REFERENCES `entities` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `null_data`
+--
+
+LOCK TABLES `null_data` WRITE;
+/*!40000 ALTER TABLE `null_data` DISABLE KEYS */;
+/*!40000 ALTER TABLE `null_data` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `passwd`
+--
+
+DROP TABLE IF EXISTS `passwd`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `passwd` (
+ `principal` varbinary(255) NOT NULL,
+ `hash` varbinary(255) NOT NULL,
+ `alg` varchar(255) COLLATE utf8_unicode_ci DEFAULT 'SHA-512',
+ `it` int(10) unsigned DEFAULT 5000,
+ `salt` varbinary(255) NOT NULL,
+ PRIMARY KEY (`principal`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `passwd`
+--
+
+LOCK TABLES `passwd` WRITE;
+/*!40000 ALTER TABLE `passwd` DISABLE KEYS */;
+/*!40000 ALTER TABLE `passwd` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `permissions`
+--
+
+DROP TABLE IF EXISTS `permissions`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `permissions` (
+ `role` varbinary(255) NOT NULL,
+ `permissions` mediumtext COLLATE utf8_unicode_ci NOT NULL,
+ PRIMARY KEY (`role`),
+ CONSTRAINT `perm_name_roles` FOREIGN KEY (`role`) REFERENCES `roles` (`name`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `permissions`
+--
+
+LOCK TABLES `permissions` WRITE;
+/*!40000 ALTER TABLE `permissions` DISABLE KEYS */;
+INSERT INTO `permissions` VALUES ('administration','[{\"grant\":\"true\",\"priority\":\"true\",\"permission\":\"*\"}]');
+/*!40000 ALTER TABLE `permissions` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `query_template_def`
+--
+
+DROP TABLE IF EXISTS `query_template_def`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `query_template_def` (
+ `id` int(10) unsigned NOT NULL,
+ `definition` mediumtext COLLATE utf8_unicode_ci NOT NULL,
+ PRIMARY KEY (`id`),
+ CONSTRAINT `query_template_def_ibfk_1` FOREIGN KEY (`id`) REFERENCES `entities` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `query_template_def`
+--
+
+LOCK TABLES `query_template_def` WRITE;
+/*!40000 ALTER TABLE `query_template_def` DISABLE KEYS */;
+/*!40000 ALTER TABLE `query_template_def` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `reference_data`
+--
+
+DROP TABLE IF EXISTS `reference_data`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `reference_data` (
+ `domain_id` int(10) unsigned NOT NULL COMMENT 'Domain.',
+ `entity_id` int(10) unsigned NOT NULL COMMENT 'Entity.',
+ `property_id` int(10) unsigned NOT NULL COMMENT 'Property.',
+ `value` int(10) unsigned NOT NULL,
+ `status` enum('OBLIGATORY','RECOMMENDED','SUGGESTED','FIX','REPLACEMENT') COLLATE utf8_unicode_ci NOT NULL COMMENT 'Status of this statement.',
+ `pidx` int(10) unsigned NOT NULL DEFAULT 0,
+ KEY `entity_id` (`entity_id`,`property_id`),
+ KEY `ref_domain_id_entity` (`domain_id`),
+ KEY `ref_property_id_entity` (`property_id`),
+ KEY `ref_value_entity` (`value`),
+ CONSTRAINT `ref_domain_id_entity` FOREIGN KEY (`domain_id`) REFERENCES `entities` (`id`),
+ CONSTRAINT `ref_entity_id_entity` FOREIGN KEY (`entity_id`) REFERENCES `entities` (`id`),
+ CONSTRAINT `ref_property_id_entity` FOREIGN KEY (`property_id`) REFERENCES `entities` (`id`),
+ CONSTRAINT `ref_value_entity` FOREIGN KEY (`value`) REFERENCES `entities` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `reference_data`
+--
+
+LOCK TABLES `reference_data` WRITE;
+/*!40000 ALTER TABLE `reference_data` DISABLE KEYS */;
+/*!40000 ALTER TABLE `reference_data` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `roles`
+--
+
+DROP TABLE IF EXISTS `roles`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `roles` (
+ `name` varbinary(255) NOT NULL,
+ `description` mediumtext COLLATE utf8_unicode_ci DEFAULT NULL,
+ PRIMARY KEY (`name`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `roles`
+--
+
+LOCK TABLES `roles` WRITE;
+/*!40000 ALTER TABLE `roles` DISABLE KEYS */;
+INSERT INTO `roles` VALUES ('administration','Users with this role have unrestricted permissions.'),('anonymous','Users who did not authenticate themselves.');
+/*!40000 ALTER TABLE `roles` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `rules`
+--
+
+DROP TABLE IF EXISTS `rules`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `rules` (
+ `domain_id` int(10) unsigned NOT NULL,
+ `entity_id` int(10) unsigned NOT NULL,
+ `transaction` enum('INSERT','RETRIEVE','UPDATE','DELETE') COLLATE utf8_unicode_ci NOT NULL,
+ `criterion` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
+ `modus` enum('MUST','SHOULD','SHOULDNT','MUSTNOT') COLLATE utf8_unicode_ci NOT NULL,
+ KEY `rule_entity_id_entity` (`entity_id`),
+ KEY `rule_domain_id_entity` (`domain_id`),
+ CONSTRAINT `rule_domain_id_entity` FOREIGN KEY (`domain_id`) REFERENCES `entities` (`id`),
+ CONSTRAINT `rule_entity_id_entity` FOREIGN KEY (`entity_id`) REFERENCES `entities` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `rules`
+--
+
+LOCK TABLES `rules` WRITE;
+/*!40000 ALTER TABLE `rules` DISABLE KEYS */;
+INSERT INTO `rules` VALUES (0,0,'INSERT','CheckPropValid','MUST'),(0,0,'INSERT','CheckParValid','MUST'),(0,0,'INSERT','CheckParOblPropPresent','SHOULD'),(0,0,'INSERT','CheckValueParsable','MUST'),(0,0,'UPDATE','CheckPropValid','MUST'),(0,0,'UPDATE','CheckParValid','MUST'),(0,0,'UPDATE','CheckParOblPropPresent','SHOULD'),(0,0,'UPDATE','CheckValueParsable','MUST'),(0,0,'DELETE','CheckReferenceDependencyExistent','MUST'),(0,0,'DELETE','CheckChildDependencyExistent','MUST'),(0,1,'INSERT','CheckNamePresent','MUST'),(0,1,'INSERT','CheckPropPresent','SHOULD'),(0,1,'INSERT','SetImpToRecByDefault','MUST'),(0,1,'UPDATE','CheckNamePresent','MUST'),(0,1,'UPDATE','CheckPropPresent','SHOULD'),(0,1,'UPDATE','SetImpToRecByDefault','MUST'),(0,2,'INSERT','CheckNamePresent','SHOULD'),(0,2,'INSERT','CheckPropPresent','SHOULD'),(0,2,'INSERT','CheckParPresent','MUST'),(0,2,'INSERT','SetImpToFix','MUST'),(0,2,'UPDATE','CheckNamePresent','SHOULD'),(0,2,'UPDATE','CheckPropPresent','SHOULD'),(0,2,'UPDATE','CheckParPresent','MUST'),(0,2,'UPDATE','SetImpToFix','MUST'),(0,3,'INSERT','CheckNamePresent','SHOULD'),(0,3,'INSERT','MatchFileProp','MUST'),(0,3,'INSERT','CheckTargetPathValid','MUST'),(0,3,'INSERT','SetImpToFix','MUST'),(0,3,'UPDATE','CheckNamePresent','SHOULD'),(0,3,'UPDATE','MatchFileProp','MUST'),(0,3,'UPDATE','CheckTargetPathValid','MUST'),(0,3,'UPDATE','SetImpToFix','MUST'),(0,4,'INSERT','CheckDatatypePresent','MUST'),(0,4,'UPDATE','CheckDatatypePresent','MUST'),(0,4,'INSERT','CheckNamePresent','MUST'),(0,4,'UPDATE','CheckNamePresent','MUST'),(0,4,'INSERT','SetImpToFix','MUST'),(0,4,'UPDATE','SetImpToFix','MUST'),(0,8,'UPDATE','CheckQueryTemplate','MUST'),(0,8,'INSERT','CheckQueryTemplate','MUST'),(0,11,'INSERT','CheckRefidPresent','SHOULD'),(0,11,'INSERT','CheckRefidValid','MUST'),(0,11,'INSERT','CheckRefidIsaParRefid','SHOULD'),(0,11,'UPDATE','CheckRefidPresent','SHOULD'),(0,11,'UPDATE','CheckRefidValid','MUST'),(0,11,'UPDATE','CheckRefidIsaParRefid','SHOULD'),(0,12,'INSERT','CheckUnitPresent','SHOULD'),(0,12,'INSERT','ParseUnit','SHOULD'),(0,12,'UPDATE','CheckUnitPresent','SHOULD'),(0,12,'UPDATE','ParseUnit','SHOULD'),(0,13,'INSERT','CheckUnitPresent','SHOULD'),(0,13,'INSERT','ParseUnit','SHOULD'),(0,13,'UPDATE','CheckUnitPresent','SHOULD'),(0,13,'UPDATE','ParseUnit','SHOULD'),(0,16,'INSERT','CheckUnitPresent','SHOULD'),(0,16,'UPDATE','CheckUnitPresent','SHOULD'),(0,17,'INSERT','CheckRefidValid','MUST'),(0,17,'INSERT','CheckRefidIsaParRefid','MUST'),(0,17,'UPDATE','CheckRefidValid','MUST'),(0,17,'UPDATE','CheckRefidIsaParRefid','MUST'),(0,50,'UPDATE','CheckRefidValid','MUST'),(0,50,'UPDATE','CheckRefidIsaParRefid','SHOULD'),(0,50,'UPDATE','SQLiteTransaction','MUST');
+/*!40000 ALTER TABLE `rules` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `stats`
+--
+
+DROP TABLE IF EXISTS `stats`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `stats` (
+ `name` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
+ `value` blob DEFAULT NULL,
+ PRIMARY KEY (`name`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `stats`
+--
+
+LOCK TABLES `stats` WRITE;
+/*!40000 ALTER TABLE `stats` DISABLE KEYS */;
+INSERT INTO `stats` VALUES ('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\0 w\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\0 w\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;
+
+--
+-- Table structure for table `text_data`
+--
+
+DROP TABLE IF EXISTS `text_data`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `text_data` (
+ `domain_id` int(10) unsigned NOT NULL COMMENT 'Domain.',
+ `entity_id` int(10) unsigned NOT NULL COMMENT 'Entity.',
+ `property_id` int(10) unsigned NOT NULL COMMENT 'Property.',
+ `value` text COLLATE utf8_unicode_ci NOT NULL,
+ `status` enum('OBLIGATORY','RECOMMENDED','SUGGESTED','FIX','REPLACEMENT') COLLATE utf8_unicode_ci NOT NULL COMMENT 'Status of this statement.',
+ `pidx` int(10) unsigned NOT NULL DEFAULT 0,
+ KEY `domain_id` (`domain_id`,`entity_id`),
+ KEY `str_entity_id_entity` (`entity_id`),
+ KEY `str_property_id_entity` (`property_id`),
+ CONSTRAINT `str_domain_id_entity` FOREIGN KEY (`domain_id`) REFERENCES `entities` (`id`),
+ CONSTRAINT `str_entity_id_entity` FOREIGN KEY (`entity_id`) REFERENCES `entities` (`id`),
+ CONSTRAINT `str_property_id_entity` FOREIGN KEY (`property_id`) REFERENCES `entities` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `text_data`
+--
+
+LOCK TABLES `text_data` WRITE;
+/*!40000 ALTER TABLE `text_data` DISABLE KEYS */;
+/*!40000 ALTER TABLE `text_data` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `transaction_log`
+--
+
+DROP TABLE IF EXISTS `transaction_log`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `transaction_log` (
+ `transaction` varchar(255) COLLATE utf8_unicode_ci NOT NULL COMMENT 'Transaction.',
+ `entity_id` int(10) unsigned NOT NULL COMMENT 'Entity ID.',
+ `username` varbinary(255) NOT NULL,
+ `seconds` bigint(20) unsigned NOT NULL DEFAULT 0,
+ `nanos` int(10) unsigned NOT NULL DEFAULT 0,
+ `realm` varbinary(255) NOT NULL,
+ KEY `entity_id` (`entity_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `transaction_log`
+--
+
+LOCK TABLES `transaction_log` WRITE;
+/*!40000 ALTER TABLE `transaction_log` DISABLE KEYS */;
+/*!40000 ALTER TABLE `transaction_log` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `units_lin_con`
+--
+
+DROP TABLE IF EXISTS `units_lin_con`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `units_lin_con` (
+ `signature_from` bigint(20) NOT NULL,
+ `signature_to` bigint(20) NOT NULL,
+ `a` decimal(65,30) NOT NULL,
+ `b_dividend` int(11) NOT NULL,
+ `b_divisor` int(11) NOT NULL,
+ `c` decimal(65,30) NOT NULL,
+ PRIMARY KEY (`signature_from`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `units_lin_con`
+--
+
+LOCK TABLES `units_lin_con` WRITE;
+/*!40000 ALTER TABLE `units_lin_con` DISABLE KEYS */;
+/*!40000 ALTER TABLE `units_lin_con` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `user_info`
+--
+
+DROP TABLE IF EXISTS `user_info`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `user_info` (
+ `realm` varbinary(255) NOT NULL,
+ `name` varbinary(255) NOT NULL,
+ `email` varbinary(255) DEFAULT NULL,
+ `status` enum('ACTIVE','INACTIVE') COLLATE utf8_unicode_ci NOT NULL DEFAULT 'INACTIVE',
+ `entity` int(10) unsigned DEFAULT NULL,
+ PRIMARY KEY (`realm`,`name`),
+ KEY `subject_entity` (`entity`),
+ CONSTRAINT `subjects_ibfk_1` FOREIGN KEY (`entity`) REFERENCES `entities` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `user_info`
+--
+
+LOCK TABLES `user_info` WRITE;
+/*!40000 ALTER TABLE `user_info` DISABLE KEYS */;
+/*!40000 ALTER TABLE `user_info` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `user_roles`
+--
+
+DROP TABLE IF EXISTS `user_roles`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `user_roles` (
+ `realm` varbinary(255) NOT NULL,
+ `user` varbinary(255) NOT NULL,
+ `role` varbinary(255) NOT NULL,
+ PRIMARY KEY (`realm`,`user`,`role`),
+ KEY `user_roles_ibfk_1` (`role`),
+ CONSTRAINT `user_roles_ibfk_1` FOREIGN KEY (`role`) REFERENCES `roles` (`name`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `user_roles`
+--
+
+LOCK TABLES `user_roles` WRITE;
+/*!40000 ALTER TABLE `user_roles` DISABLE KEYS */;
+/*!40000 ALTER TABLE `user_roles` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Dumping routines for database 'caosdb'
+--
+/*!50003 DROP FUNCTION IF EXISTS `CaosDBVersion` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`caosdb`@`%` FUNCTION `CaosDBVersion`() RETURNS varchar(255) CHARSET utf8 COLLATE utf8_unicode_ci
+ DETERMINISTIC
+RETURN 'v2.1.1' ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP FUNCTION IF EXISTS `constructDateTimeWhereClauseForColumn` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`caosdb`@`%` FUNCTION `constructDateTimeWhereClauseForColumn`(seconds_col VARCHAR(255), nanos_col VARCHAR(255), vDateTimeSecLow VARCHAR(255), vDateTimeNSLow VARCHAR(255), vDateTimeSecUpp VARCHAR(255), vDateTimeNSUpp VARCHAR(255), operator CHAR(4)) RETURNS varchar(20000) CHARSET utf8 COLLATE utf8_unicode_ci
+ DETERMINISTIC
+BEGIN
+
+ DECLARE isInterval BOOLEAN DEFAULT vDateTimeSecUpp IS NOT NULL or vDateTimeNSUpp IS NOT NULL;
+ DECLARE operator_prefix CHAR(1) DEFAULT LEFT(operator,1);
+
+ IF isInterval THEN
+ IF operator = '=' THEN
+ RETURN " 0=1";
+ ELSEIF operator = '!=' THEN
+ RETURN " 0=1";
+ ELSEIF operator = '>' or operator = '<=' THEN
+ RETURN CONCAT(" ", seconds_col, operator_prefix, vDateTimeSecUpp);
+ ELSEIF operator = '<' or operator = '>=' THEN
+ RETURN CONCAT(" ", seconds_col, operator_prefix, vDateTimeSecLow);
+ ELSEIF operator = "(" THEN
+ RETURN CONCAT(" ", seconds_col, ">=", vDateTimeSecLow, " AND ",seconds_col, "<", vDateTimeSecUpp);
+ ELSEIF operator = "!(" THEN
+ RETURN CONCAT(" ", seconds_col, "<", vDateTimeSecLow, " OR ", seconds_col, ">=", vDateTimeSecUpp);
+ END IF;
+ ELSE
+ IF operator = '=' THEN
+ RETURN CONCAT(" ",
+ seconds_col,
+ "=", vDateTimeSecLow, IF(vDateTimeNSLow IS NULL, CONCAT(' AND ', nanos_col, ' IS NULL'), CONCAT(' AND ',
+ nanos_col,
+ '=', vDateTimeNSLow)));
+ ELSEIF operator = '!=' THEN
+ RETURN CONCAT(" ",
+ seconds_col,
+ "!=", vDateTimeSecLow, IF(vDateTimeNSLow IS NULL, '', CONCAT(' OR ',
+ nanos_col,
+ '!=', vDateTimeNSLow)));
+ ELSEIF operator = '>' or operator = '<' THEN
+ RETURN CONCAT(" ",
+ seconds_col, operator, vDateTimeSecLow, IF(vDateTimeNSLow IS NULL, '', CONCAT(' OR (',seconds_col,'=', vDateTimeSecLow, ' AND ',nanos_col, operator, vDateTimeNSLow, ')')));
+ ELSEIF operator = '>=' or operator = '<=' THEN
+ RETURN CONCAT(" ",seconds_col, operator, vDateTimeSecLow, IF(vDateTimeNSLow IS NULL, '', CONCAT(' AND (',seconds_col, operator_prefix, vDateTimeSecLow, ' OR ',nanos_col, operator, vDateTimeNSLow, ')')));
+ ELSEIF operator = "(" THEN
+ RETURN IF(vDateTimeNSLow IS NULL,CONCAT(" ",seconds_col,"=", vDateTimeSecLow),CONCAT(" ",seconds_col,"=",vDateTimeSecLow," AND ",nanos_col,"=",vDateTimeNSLow));
+ ELSEIF operator = "!(" THEN
+ RETURN IF(vDateTimeNSLow IS NULL,CONCAT(" ",seconds_col,"!=",vDateTimeSecLow, ""),CONCAT(" ",seconds_col,"!=",vDateTimeSecLow," OR ",nanos_col, " IS NULL OR ", nanos_col, "!=",vDateTimeNSLow));
+ END IF;
+ END IF;
+ return ' 0=1';
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP FUNCTION IF EXISTS `convert_unit` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`caosdb`@`%` FUNCTION `convert_unit`(unit_sig BIGINT, value DECIMAL(65,30)) RETURNS decimal(65,30)
+ DETERMINISTIC
+BEGIN
+ DECLARE ret DECIMAL(65,30) DEFAULT value;
+
+ SELECT (((value+a)*b_dividend)/b_divisor+c) INTO ret FROM units_lin_con WHERE signature_from=unit_sig;
+ RETURN ret;
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP FUNCTION IF EXISTS `getAggValueWhereClause` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`caosdb`@`%` FUNCTION `getAggValueWhereClause`(entities VARCHAR(255), properties VARCHAR(255)) RETURNS varchar(20000) CHARSET utf8 COLLATE utf8_unicode_ci
+ DETERMINISTIC
+BEGIN
+ RETURN CONCAT(" EXISTS (SELECT 1 FROM `", entities, "` AS ent WHERE ent.id = subdata.entity_id LIMIT 1)", IF(properties IS NOT NULL AND properties != '', CONCAT(" AND EXISTS (SELECT 1 FROM `", properties, "` as props WHERE props.id = subdata.property_id LIMIT 1)"),''));
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP FUNCTION IF EXISTS `getDateTimeWhereClause` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`caosdb`@`%` FUNCTION `getDateTimeWhereClause`(vDateTime VARCHAR(255), operator CHAR(4)) RETURNS varchar(20000) CHARSET utf8 COLLATE utf8_unicode_ci
+ DETERMINISTIC
+BEGIN
+ DECLARE sep_loc INTEGER DEFAULT LOCATE('--',vDateTime);
+ DECLARE vDateTimeLow VARCHAR(255) DEFAULT IF(sep_loc != 0, SUBSTRING_INDEX(vDateTime, '--',1), vDateTime);
+ DECLARE vDateTimeUpp VARCHAR(255) DEFAULT IF(sep_loc != 0, SUBSTRING_INDEX(vDateTime, '--',-1), NULL);
+
+ DECLARE vDateTimeSecLow VARCHAR(255) DEFAULT SUBSTRING_INDEX(vDateTimeLow, 'UTC', 1);
+ DECLARE vDateTimeNSLow VARCHAR(255) DEFAULT IF(SUBSTRING_INDEX(vDateTimeLow, 'UTC', -1)='',NULL,SUBSTRING_INDEX(vDateTimeLow, 'UTC', -1));
+
+ DECLARE vDateTimeSecUpp VARCHAR(255) DEFAULT IF(sep_loc != 0, SUBSTRING_INDEX(vDateTimeUpp, 'UTC', 1), NULL);
+ DECLARE vDateTimeNSUpp VARCHAR(255) DEFAULT IF(sep_loc != 0 AND SUBSTRING_INDEX(vDateTimeUpp, 'UTC', -1)!='',SUBSTRING_INDEX(vDateTimeUpp, 'UTC', -1),NULL);
+
+
+ RETURN constructDateTimeWhereClauseForColumn("subdata.value", "subdata.value_ns", vDateTimeSecLow, vDateTimeNSLow, vDateTimeSecUpp, vDateTimeNSUpp, operator);
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP FUNCTION IF EXISTS `getDateWhereClause` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`caosdb`@`%` FUNCTION `getDateWhereClause`(vDateTimeDotNotation VARCHAR(255), operator CHAR(4)) RETURNS varchar(20000) CHARSET utf8 COLLATE utf8_unicode_ci
+ DETERMINISTIC
+BEGIN
+ DECLARE isInterval INTEGER DEFAULT LOCATE('--',vDateTimeDotNotation);
+ DECLARE vILB VARCHAR(255) DEFAULT IF(isInterval != 0, SUBSTRING_INDEX(vDateTimeDotNotation, '--', 1), vDateTimeDotNotation);
+ DECLARE vEUB VARCHAR(255) DEFAULT IF(isInterval != 0, SUBSTRING_INDEX(vDateTimeDotNotation, '--', -1), NULL);
+ DECLARE vILB_Date INTEGER DEFAULT SUBSTRING_INDEX(vILB, '.', 1);
+ DECLARE vEUB_Date INTEGER DEFAULT SUBSTRING_INDEX(vEUB, '.', 1);
+ DECLARE hasTime INTEGER DEFAULT LOCATE('.NULL.NULL',vILB);
+ DECLARE dom INTEGER DEFAULT vILB_Date % 100;
+ DECLARE mon INTEGER DEFAULT ((vILB_Date % 10000) - dom) / 100;
+ DECLARE yea INTEGER DEFAULT (vILB_Date - (vILB_Date%10000)) / 10000;
+ SELECT vILB_Date != vEUB_Date INTO isInterval;
+
+ IF operator = '=' and hasTime != 0 THEN
+ RETURN CONCAT(" subdata.value=", vILB_Date);
+ ELSEIF operator = "!=" and hasTime != 0 THEN
+ IF mon != 0 and dom != 0 THEN
+ RETURN CONCAT(" subdata.value!=", vILB_Date, " and subdata.value%100!=0");
+ ELSEIF mon != 0 THEN
+ RETURN CONCAT(" subdata.value!=", vILB_Date, " and subdata.value%100=0 and subdata.value%10000!=0");
+ ELSE
+ RETURN CONCAT(" subdata.value!=", vILB_Date, " and subdata.value%10000=0");
+ END IF;
+ ELSEIF operator = "(" and hasTime != 0 THEN
+ IF mon != 0 and dom != 0 THEN
+ RETURN CONCAT(" subdata.value=", vILB_Date);
+ ELSEIF mon != 0 THEN
+ RETURN CONCAT(" subdata.value=",vILB_Date," OR (subdata.value>", vILB_Date, " and subdata.value<", vEUB_Date, " and subdata.value%10000!=0)");
+ ELSE
+ RETURN CONCAT(" subdata.value=",vILB_Date," OR (subdata.value>", vILB_Date, " and subdata.value<", vEUB_Date,")");
+ END IF;
+ ELSEIF operator = "!(" THEN
+ IF hasTime = 0 THEN
+ RETURN " 0=0";
+ END IF;
+ IF mon != 0 and dom != 0 THEN
+ RETURN CONCAT(" subdata.value!=",vILB_Date);
+ ELSEIF mon != 0 THEN
+ RETURN CONCAT(" (subdata.value!=",vILB_Date, " AND subdata.value%100=0) OR ((subdata.value<", vILB_Date, " or subdata.value>", vEUB_Date, ") and subdata.value%100!=0)");
+ ELSE
+ RETURN CONCAT(" (subdata.value!=",vILB_Date, " AND subdata.value%10000=0) OR ((subdata.value<", vILB_Date, " or subdata.value>=", vEUB_Date, ") and subdata.value%10000!=0)");
+ END IF;
+ ELSEIF operator = "<" THEN
+ IF mon != 0 and dom != 0 THEN
+ RETURN CONCAT(" subdata.value<", vILB_Date, " and (subdata.value%100!=0 or (subdata.value<", yea*10000+mon*100, " and subdata.value%10000!=0) or (subdata.value<", yea*10000, " and subdata.value%10000=0))");
+ ELSEIF mon != 0 THEN
+ RETURN CONCAT(" subdata.value<", vILB_Date, " and (subdata.value%10000!=0 or (subdata.value<", yea*10000, "))");
+ ELSE
+ RETURN CONCAT(" subdata.value<", vILB_Date);
+ END IF;
+ ELSEIF operator = ">" THEN
+ IF mon != 0 and dom != 0 THEN
+ RETURN CONCAT(" subdata.value>", vILB_Date);
+ ELSEIF mon != 0 THEN
+ RETURN CONCAT(" subdata.value>=",vEUB_Date);
+ ELSE
+ RETURN CONCAT(" subdata.value>=",vEUB_Date);
+ END IF;
+ END IF;
+
+ return ' 0=1';
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP FUNCTION IF EXISTS `getDoubleWhereClause` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`caosdb`@`%` FUNCTION `getDoubleWhereClause`(value DOUBLE, unit_sig BIGINT, valueStdUnit DECIMAL(65,30), stdUnit_sig BIGINT, o CHAR(4)) RETURNS varchar(20000) CHARSET utf8 COLLATE utf8_unicode_ci
+ DETERMINISTIC
+BEGIN
+ RETURN IF(unit_sig IS NULL AND value IS NOT NULL,
+ CONCAT('subdata.value ', o, ' \'', value, '\''),
+ CONCAT(
+ IF(value IS NULL, '',
+ CONCAT('(subdata.unit_sig=', unit_sig, ' AND subdata.value ', o, ' \'', value, '\') OR ')),
+ IF(unit_sig = stdUnit_sig,'',CONCAT('(subdata.unit_sig=', stdUnit_sig,' AND subdata.value ', o, ' \'', valueStdUnit, '\') OR ')),'(standard_unit(subdata.unit_sig)=', stdUnit_sig,' AND convert_unit(subdata.unit_sig,subdata.value) ', o, ' ', valueStdUnit, ')'));
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP FUNCTION IF EXISTS `makeStmt` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`caosdb`@`%` FUNCTION `makeStmt`(sourceSet VARCHAR(255), targetSet VARCHAR(255), data VARCHAR(20000), properties VARCHAR(20000)) RETURNS varchar(20000) CHARSET utf8 COLLATE utf8_unicode_ci
+ NO SQL
+BEGIN
+
+ RETURN CONCAT(
+ IF(targetSet IS NULL,
+ CONCAT('DELETE FROM `',sourceSet,'` WHERE NOT EXISTS (SELECT 1 FROM '),
+ CONCAT('INSERT IGNORE INTO `',targetSet,'` (id) SELECT id FROM `',sourceSet,'` WHERE EXISTS (SELECT 1 FROM ')),
+ IF(properties IS NULL,
+ CONCAT(data,' as data WHERE '),
+ CONCAT('`',properties,'` as prop JOIN ',data,' as data ON (data.property_id=prop.id) WHERE (data.entity_id=prop.id2 OR prop.id2=0) AND ')),
+ 'data.entity_id=`', sourceSet, '`.`id` LIMIT 1)'
+ );
+
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP FUNCTION IF EXISTS `standard_unit` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`caosdb`@`%` FUNCTION `standard_unit`(unit_sig BIGINT) RETURNS bigint(20)
+ DETERMINISTIC
+BEGIN
+ DECLARE ret BIGINT DEFAULT unit_sig;
+
+ SELECT signature_to INTO ret FROM units_lin_con WHERE signature_from=unit_sig;
+ RETURN ret;
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `applyBackReference` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`caosdb`@`%` PROCEDURE `applyBackReference`(in sourceSet VARCHAR(255), targetSet VARCHAR(255), in propertiesTable VARCHAR(255), in entitiesTable VARCHAR(255), in subQuery BOOLEAN)
+BEGIN
+ DECLARE newTableName VARCHAR(255) DEFAULT NULL;
+
+
+ IF subQuery IS TRUE THEN
+ call registerTempTableName(newTableName);
+
+ SET @createBackRefSubQueryTableStr = CONCAT('CREATE TEMPORARY TABLE `',newTableName,'` ( entity_id INT UNSIGNED NOT NULL, id INT UNSIGNED NOT NULL, CONSTRAINT `',newTableName,'PK` PRIMARY KEY (id, entity_id))');
+
+ PREPARE createBackRefSubQueryTable FROM @createBackRefSubQueryTableStr;
+ EXECUTE createBackRefSubQueryTable;
+ DEALLOCATE PREPARE createBackRefSubQueryTable;
+
+ SET @backRefSubResultSetStmtStr = CONCAT('INSERT INTO `',newTableName,'` (id,entity_id) SELECT entity_id AS id, value AS entity_id FROM `reference_data` AS data WHERE EXISTS (SELECT 1 FROM `',sourceSet,'` AS source WHERE source.id=data.value LIMIT 1)', IF(propertiesTable IS NULL,'',CONCAT(' AND EXISTS (SELECT 1 FROM `',propertiesTable,'` AS p WHERE p.id=data.property_id LIMIT 1)')), IF(entitiesTable IS NULL,'',CONCAT(' AND EXISTS (SELECT 1 FROM `',entitiesTable,'` AS e WHERE e.id=data.entity_id LIMIT 1)')));
+
+ PREPARE backRefSubResultSetStmt FROM @backRefSubResultSetStmtStr;
+ EXECUTE backRefSubResultSetStmt;
+ DEALLOCATE PREPARE backRefSubResultSetStmt;
+
+ SELECT newTableName as list;
+ ELSE
+ IF targetSet IS NULL OR sourceSet = targetSet THEN
+ SET @stmtBackRefStr = CONCAT('DELETE FROM `', sourceSet, '` WHERE NOT EXISTS (SELECT 1 FROM `reference_data` AS data WHERE data.value=`', sourceSet, '`.`id`', IF(entitiesTable IS NULL, '', CONCAT(' AND EXISTS (SELECT 1 FROM `', entitiesTable, '` AS e WHERE e.id=data.entity_id LIMIT 1)')), IF(propertiesTable IS NULL, '', CONCAT(' AND EXISTS (SELECT 1 FROM `', propertiesTable, '` AS p WHERE p.id=data.property_id LIMIT 1)')), ')');
+ ELSE
+ SET @stmtBackRefStr = CONCAT('INSERT IGNORE INTO `', targetSet, '` (id) SELECT id FROM `',sourceSet,'` AS source WHERE EXISTS (SELECT 1 FROM `reference_data` AS data WHERE data.value=source.id', IF(entitiesTable IS NULL, '', CONCAT(' AND EXISTS (SELECT 1 FROM `', entitiesTable, '` AS e WHERE e.id=data.entity_id LIMIT 1)')), IF(propertiesTable IS NULL, '', CONCAT(' AND EXISTS (SELECT 1 FROM `', propertiesTable, '` AS p WHERE p.id=data.property_id LIMIT 1)')), ')');
+ END IF;
+
+ PREPARE stmtBackRef FROM @stmtBackRefStr;
+ EXECUTE stmtBackRef;
+ DEALLOCATE PREPARE stmtBackRef;
+ END IF;
+
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `applyIDFilter` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`caosdb`@`%` PROCEDURE `applyIDFilter`(in sourceSet VARCHAR(255), in targetSet VARCHAR(255), in o CHAR(2), in vInt BIGINT, in agg CHAR(3))
+IDFILTER_LABEL: BEGIN
+DECLARE data VARCHAR(20000) DEFAULT NULL;
+DECLARE aggVal VARCHAR(255) DEFAULT NULL;
+
+
+IF agg IS NOT NULL THEN
+ SET @stmtIDAggValStr = CONCAT("SELECT ", agg, "(id) INTO @sAggVal FROM `", sourceSet, "`");
+ PREPARE stmtIDAggVal FROM @stmtIDAggValStr;
+ EXECUTE stmtIDAggVal;
+ DEALLOCATE PREPARE stmtIDAggVal;
+ SET aggVal = @sAggVal;
+END IF;
+
+
+IF targetSet IS NULL OR targetSet = sourceSet THEN
+ SET data = CONCAT("DELETE FROM `",sourceSet,"` WHERE ",IF(o IS NULL OR vInt IS NULL,"1=1",CONCAT("NOT id",o,vInt)),IF(aggVal IS NULL, "", CONCAT(" AND id!=",aggVal)));
+ELSE
+ SET data = CONCAT("INSERT IGNORE INTO `",targetSet,"` SELECT data.id as id FROM `",sourceSet,"` AS data WHERE ",IF(o IS NULL OR vInt IS NULL,"1=1",CONCAT("data.id",o,vInt)),IF(aggVal IS NULL, "", CONCAT(" AND data.id=", aggVal)));
+END IF;
+
+Set @stmtIDFilterStr = data;
+PREPARE stmtIDFilter FROM @stmtIDFilterStr;
+EXECUTE stmtIDFilter;
+DEALLOCATE PREPARE stmtIDFilter;
+
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `applyPOV` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`caosdb`@`%` PROCEDURE `applyPOV`(in sourceSet VARCHAR(255), in targetSet VARCHAR(255), in propertiesTable VARCHAR(255), in refIdsTable VARCHAR(255), in o CHAR(4), in vText VARCHAR(255), in vInt INT, in vDouble DOUBLE, in unit_sig BIGINT, in vDoubleStdUnit DOUBLE, in stdUnit_sig BIGINT, in vDateTime VARCHAR(255), in vDateTimeDotNotation VARCHAR(255), in agg CHAR(3), in pname VARCHAR(255))
+POV_LABEL: BEGIN
+ DECLARE data TEXT DEFAULT NULL;
+ DECLARE sTextData VARCHAR(20000) DEFAULT NULL;
+ DECLARE sEnumData VARCHAR(20000) DEFAULT NULL;
+ DECLARE sIntData VARCHAR(20000) DEFAULT NULL;
+ DECLARE sDoubleData VARCHAR(20000) DEFAULT NULL;
+ DECLARE sDatetimeData VARCHAR(20000) DEFAULT NULL;
+ DECLARE sNullData VARCHAR(20000) DEFAULT NULL;
+ DECLARE sDateData VARCHAR(20000) DEFAULT NULL;
+ DECLARE sRefData VARCHAR(20000) DEFAULT NULL;
+ DECLARE aggValue VARCHAR(255) DEFAULT NULL;
+ DECLARE aggValueWhereClause VARCHAR(20000) DEFAULT NULL;
+ DECLARE distinctUnits INT DEFAULT 0;
+ DECLARE usedStdUnit BIGINT DEFAULT NULL;
+ DECLARE keepTabl VARCHAR(255) DEFAULT NULL;
+
+ IF o = '->' THEN
+
+ call applyRefPOV(sourceSet,targetSet, propertiesTable, refIdsTable);
+ LEAVE POV_LABEL;
+ ELSEIF o = '0' THEN
+
+
+ SET vText = NULL;
+ SET sTextData = 'SELECT domain_id, entity_id, property_id FROM `null_data` AS subdata';
+
+ ELSEIF o = '!0' THEN
+
+
+ SET vText = NULL;
+ SET sTextData = 'SELECT DISTINCT domain_id, entity_id, property_id FROM `text_data` AS subdata WHERE subdata.value IS NOT NULL UNION ALL SELECT DISTINCT domain_id, entity_id, property_id FROM `enum_data` AS subdata WHERE subdata.value IS NOT NULL UNION ALL SELECT DISTINCT domain_id, entity_id, property_id FROM `integer_data` AS subdata WHERE subdata.value IS NOT NULL UNION ALL SELECT DISTINCT domain_id, entity_id, property_id FROM `double_data` AS subdata WHERE subdata.value IS NOT NULL UNION ALL SELECT DISTINCT domain_id, entity_id, property_id FROM `date_data` AS subdata WHERE subdata.value IS NOT NULL UNION ALL SELECT DISTINCT domain_id, entity_id, property_id FROM `datetime_data` AS subdata WHERE subdata.value IS NOT NULL UNION ALL SELECT DISTINCT domain_id, entity_id, property_id FROM `reference_data` AS subdata WHERE subdata.value IS NOT NULL';
+
+ ELSEIF o = "(" or o = "!(" THEN
+ SET sTextData = IF(vText IS NULL,' SELECT DISTINCT domain_id, entity_id, property_id FROM `date_data`', IF(vDateTimeDotNotation IS NULL, NULL, CONCAT(' SELECT DISTINCT domain_id, entity_id, property_id FROM `date_data` AS subdata WHERE ',getDateWhereClause(vDateTimeDotNotation,o))));
+ SET sDatetimeData = IF(vText IS NULL,' UNION ALL SELECT DISTINCT domain_id, entity_id, property_id FROM `datetime_data`', IF(vDateTime IS NULL, NULL, CONCAT(' UNION ALL SELECT DISTINCT domain_id, entity_id, property_id FROM `datetime_data` AS subdata WHERE ',getDateTimeWhereClause(vDateTime,o))));
+ SET vText = NULL;
+ ELSEIF agg IS NOT NULL THEN
+
+
+
+ SET aggValueWhereClause = CONCAT(getDoubleWhereClause(vDouble, unit_sig, vDoubleStdUnit, stdUnit_sig, o), ' AND ');
+ SET aggValueWhereClause = CONCAT(IF(aggValueWhereClause IS NULL, '', aggValueWhereClause), getAggValueWhereClause(sourceSet, propertiesTable));
+
+
+ SET @aggValueStmtStr = CONCAT('SELECT ',agg,'(subdata.value), ', agg, '(convert_unit(subdata.unit_sig,subdata.value)), COUNT(DISTINCT standard_unit(subdata.unit_sig)), max(standard_unit(subdata.unit_sig)) INTO @sAggValue, @sAggValueConvert, @distinctUnits, @StdUnitSig FROM (SELECT entity_id, property_id, value, unit_sig FROM `integer_data` UNION SELECT entity_id, property_id, value, unit_sig FROM `double_data`) AS subdata WHERE ', aggValueWhereClause);
+
+
+ PREPARE stmtAggValueStmt FROM @aggValueStmtStr;
+ EXECUTE stmtAggValueStmt;
+ DEALLOCATE PREPARE stmtAggValueStmt;
+
+ SET distinctUnits = @distinctUnits;
+ SET aggValue = @sAggValue;
+
+
+ IF distinctUnits = 1 THEN
+ SET aggValue = @sAggValueConvert;
+ SET usedStdUnit = @StdUnitSig;
+ ELSE
+ call raiseWarning(CONCAT("The filter POV(",IF(pname IS NULL, 'NULL', pname),",",IF(o IS NULL, 'NULL', o),",",IF(vText IS NULL, 'NULL', vText),") with the aggregate function '", agg, "' could not match the values against each other with their units. The values had different base units. Only their numric value had been taken into account." ));
+ END IF;
+
+ IF aggValue IS NULL THEN
+ SET sTextData = 'SELECT NULL as domain_id, NULL as entity_id, NULL as property_id';
+ ELSE
+ SET sTextData = '';
+ SET sIntData = CONCAT(' UNION ALL SELECT DISTINCT domain_id, entity_id, property_id FROM `integer_data` as subdata WHERE ', getDoubleWhereClause(aggValue, usedStdUnit, aggValue, usedStdUnit, '='));
+ SET sDoubleData = CONCAT(' SELECT DISTINCT domain_id, entity_id, property_id FROM `double_data` as subdata WHERE ', getDoubleWhereClause(aggValue, usedStdUnit, aggValue, usedStdUnit, '='));
+ END IF;
+
+ SET vText = NULL;
+ ELSE
+
+ SET sTextData = IF(vText IS NULL, 'SELECT DISTINCT domain_id, entity_id, property_id FROM `text_data`', CONCAT('SELECT DISTINCT domain_id, entity_id, property_id FROM `text_data` AS subdata WHERE subdata.value ',o,' ?'));
+ SET sEnumData = IF(vText IS NULL, ' UNION ALL SELECT DISTINCT domain_id, entity_id, property_id FROM `enum_data`', CONCAT(' UNION SELECT DISTINCT domain_id, entity_id, property_id FROM `enum_data` AS subdata WHERE subdata.value ', o, ' ?'));
+ SET sIntData = IF(vText IS NULL, ' UNION ALL SELECT DISTINCT subdata.domain_id, subdata.entity_id, subdata.property_id FROM `integer_data` AS subdata', IF(vInt IS NULL AND vDoubleStdUnit IS NULL, NULL, CONCAT(' UNION ALL SELECT DISTINCT domain_id, entity_id, property_id FROM `integer_data` AS subdata WHERE ', getDoubleWhereClause(vInt, unit_sig, vDoubleStdUnit, stdUnit_sig, o))));
+ SET sDoubleData = IF(vText IS NULL, ' UNION ALL SELECT DISTINCT subdata.domain_id, subdata.entity_id, subdata.property_id FROM `double_data` AS subdata', IF(vDouble IS NULL, NULL, CONCAT(' UNION ALL SELECT DISTINCT domain_id, entity_id, property_id FROM `double_data` AS subdata WHERE ', getDoubleWhereClause(vDouble,unit_sig,vDoubleStdUnit,stdUnit_sig,o))));
+ SET sDatetimeData = IF(vText IS NULL,' UNION ALL SELECT DISTINCT domain_id, entity_id, property_id FROM `datetime_data`', IF(vDateTime IS NULL, NULL, CONCAT(' UNION ALL SELECT DISTINCT domain_id, entity_id, property_id FROM `datetime_data` AS subdata WHERE ',getDateTimeWhereClause(vDateTime,o))));
+ SET sDateData = IF(vText IS NULL,' UNION ALL SELECT DISTINCT domain_id, entity_id, property_id FROM `date_data`', IF(vDateTimeDotNotation IS NULL, NULL, CONCAT(' UNION ALL SELECT DISTINCT domain_id, entity_id, property_id FROM `date_data` AS subdata WHERE ',getDateWhereClause(vDateTimeDotNotation,o))));
+ SET sRefData = IF(vText IS NULL, ' UNION ALL SELECT DISTINCT domain_id, entity_id, property_id FROM `reference_data`', IF(refIdsTable IS NULL, NULL, CONCAT(' UNION ALL SELECT DISTINCT domain_id, entity_id, property_id FROM `reference_data` AS subdata WHERE EXISTS (SELECT 1 FROM `', refIdsTable, '` AS refIdsTable WHERE subdata.value=refIdsTable.id LIMIT 1)')));
+ SET sNullData = IF(vText IS NULL, ' UNION ALL SELECT DISTINCT domain_id, entity_id, property_id FROM `null_data`', NULL);
+
+ END IF;
+
+ SET data = CONCAT('(',sTextData,
+ IF(sEnumData IS NULL, '', sEnumData),
+ IF(sDoubleData IS NULL, '', sDoubleData),
+ IF(sIntData IS NULL, '', sIntData),
+ IF(sDatetimeData IS NULL, '', sDatetimeData),
+ IF(sDateData IS NULL, '', sDateData),
+ IF(sRefData IS NULL, '', sRefData),
+ IF(sNullData IS NULL, '', sNullData),
+ ')'
+ );
+
+
+ call createTmpTable(keepTabl);
+
+
+ SET @stmtPOVkeepTblStr = CONCAT("INSERT IGNORE INTO `", keepTabl, "` (id) SELECT DISTINCT entity_id AS id FROM ", data, " as data", IF(propertiesTable IS NULL, '', CONCAT(' WHERE EXISTS (Select 1 from `', propertiesTable, '` AS prop WHERE prop.id = data.property_id AND (prop.id2=data.entity_id OR prop.id2=0))')));
+
+ SET @stmtPOVStr = CONCAT(
+ IF(targetSet IS NULL,
+ CONCAT('DELETE FROM `',sourceSet,'` WHERE NOT EXISTS (SELECT 1 FROM `'),
+ CONCAT('INSERT IGNORE INTO `',targetSet,'` (id) SELECT id FROM `',sourceSet,'` WHERE EXISTS (SELECT 1 FROM `')),
+ keepTabl,
+ '` AS data WHERE data.id=`', sourceSet, '`.`id` LIMIT 1)'
+ );
+
+
+
+ PREPARE stmt3 FROM @stmtPOVStr;
+ PREPARE stmtPOVkeepTbl FROM @stmtPOVkeepTblStr;
+ IF vText IS NULL THEN
+ EXECUTE stmtPOVkeepTbl;
+ ELSE
+ SET @vText = vText;
+ EXECUTE stmtPOVkeepTbl USING @vText, @vText;
+ END IF;
+ EXECUTE stmt3;
+ DEALLOCATE PREPARE stmt3;
+ DEALLOCATE PREPARE stmtPOVkeepTbl;
+
+ SELECT @stmtPOVkeepTblStr as applyPOVStmt1, @stmtPOVStr as applyPOVStmt2, keepTabl as applyPOVIntermediateResultSet;
+
+
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `applyRefPOV` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`caosdb`@`%` PROCEDURE `applyRefPOV`(in sourceSet VARCHAR(255), in targetSet VARCHAR(255), in properties VARCHAR(255), in refs VARCHAR(255))
+BEGIN
+ DECLARE data VARCHAR(20000) DEFAULT CONCAT('(SELECT domain_id, entity_id, property_id FROM `reference_data` AS subdata WHERE EXISTS (SELECT 1 FROM `', refs, '` AS refs WHERE subdata.value=refs.id LIMIT 1))');
+ SET @stmtRefPOVStr = makeStmt(sourceSet,targetSet,data,properties);
+
+ PREPARE stmt4 FROM @stmtRefPOVStr;
+ EXECUTE stmt4;
+
+ SELECT @stmtRefPOVstr as applyRefPOVStmt;
+
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `applySAT` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`caosdb`@`%` PROCEDURE `applySAT`(in sourceSet VARCHAR(255), in targetSet VARCHAR(255), in loc MEDIUMTEXT, in op CHAR(5))
+BEGIN
+
+ IF targetSet IS NULL OR sourceSet = targetSet THEN
+ SET @stmtSATString = CONCAT('DELETE FROM `', sourceSet, '` WHERE id NOT IN (SELECT file_id FROM files WHERE path ', op, ' ?)');
+ ELSE
+ SET @stmtSATString = CONCAT('INSERT INTO `', targetSet, '` (id) SELECT data.id FROM `',sourceSet,'` as data WHERE EXISTS (SELECT 1 FROM `files` as f WHERE f.file_id=data.id AND f.path ', op, ' ?)');
+ END IF;
+ PREPARE stmtSAT FROM @stmtSATString;
+ SET @loc = loc;
+ EXECUTE stmtSAT USING @loc;
+ DEALLOCATE PREPARE stmtSAT;
+
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `applyTransactionFilter` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`caosdb`@`%` PROCEDURE `applyTransactionFilter`(in sourceSet VARCHAR(255), targetSet VARCHAR(255), in transaction VARCHAR(255), in operator_u CHAR(2), in realm VARCHAR(255), in userName VARCHAR(255), in ilb BIGINT, in ilb_nanos INT UNSIGNED, in eub BIGINT, in eub_nanos INT UNSIGNED, in operator_t CHAR(2))
+BEGIN
+ DECLARE data TEXT default CONCAT('(SELECT entity_id FROM transaction_log AS t WHERE t.transaction=\'',
+ transaction,
+ '\'',
+ IF(userName IS NOT NULL,
+ CONCAT(' AND t.realm', operator_u, '? AND t.username', operator_u, '?'),
+ ''
+ ),
+ IF(ilb IS NOT NULL,
+ CONCAT(" AND", constructDateTimeWhereClauseForColumn("t.seconds", "t.nanos", ilb, ilb_nanos, eub, eub_nanos, operator_t)),
+ ""
+ ),
+ ')'
+ );
+
+ SET @stmtTransactionStr = makeStmt(sourceSet,targetSet,data,NULL);
+ PREPARE stmtTransactionFilter from @stmtTransactionStr;
+ IF userName IS NOT NULL THEN
+ SET @userName = userName;
+ SET @realm = realm;
+ EXECUTE stmtTransactionFilter USING @realm, @userName;
+ ELSE
+ EXECUTE stmtTransactionFilter;
+ END IF;
+
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `calcComplementUnion` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`caosdb`@`%` PROCEDURE `calcComplementUnion`(in targetSet VARCHAR(255), in subResultSet VARCHAR(255), in universe VARCHAR(255))
+BEGIN
+ SET @stmtComplementUnionStr = CONCAT('INSERT IGNORE INTO `', targetSet, '` SELECT id FROM `',universe, '` AS universe WHERE NOT EXISTS ( SELECT 1 FROM `', subResultSet,'` AS diff WHERE diff.id=universe.id)');
+ PREPARE stmtComplementUnion FROM @stmtComplementUnionStr;
+ EXECUTE stmtComplementUnion;
+ DEALLOCATE PREPARE stmtComplementUnion;
+
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `calcDifference` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`caosdb`@`%` PROCEDURE `calcDifference`(in resultSetTable VARCHAR(255), in diff VARCHAR(255))
+BEGIN
+ SET @diffStmtStr = CONCAT('DELETE FROM `', resultSetTable, '` WHERE EXISTS ( SELECT 1 FROM `', diff,'` AS diff WHERE diff.id=`',resultSetTable,'`.`id`)');
+ PREPARE diffStmt FROM @diffStmtStr;
+ EXECUTE diffStmt;
+ DEALLOCATE PREPARE diffStmt;
+
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `calcIntersection` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`caosdb`@`%` PROCEDURE `calcIntersection`(in resultSetTable VARCHAR(255), in intersectWith VARCHAR(255))
+BEGIN
+ SET @diffStmtStr = CONCAT('DELETE FROM `', resultSetTable, '` WHERE NOT EXISTS ( SELECT 1 FROM `', intersectWith,'` AS diff WHERE diff.id=`',resultSetTable,'`.`id`)');
+ PREPARE diffStmt FROM @diffStmtStr;
+ EXECUTE diffStmt;
+
+
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `calcUnion` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`caosdb`@`%` PROCEDURE `calcUnion`(in targetSet VARCHAR(255), in sourceSet VARCHAR(255))
+BEGIN
+ SET @diffStmtStr = CONCAT('INSERT IGNORE INTO `', targetSet, '` (id) SELECT id FROM `',sourceSet,'`');
+ PREPARE diffStmt FROM @diffStmtStr;
+ EXECUTE diffStmt;
+ DEALLOCATE PREPARE diffStmt;
+
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `cleanUpLinCon` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`caosdb`@`%` PROCEDURE `cleanUpLinCon`()
+BEGIN
+
+ DELETE FROM units_lin_con WHERE NOT EXISTS (SELECT '1' FROM double_data WHERE unit_sig=signature_from) AND NOT EXISTS (SELECT '1' FROM integer_data WHERE unit_sig=signature_from);
+
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `cleanUpQuery` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`caosdb`@`%` PROCEDURE `cleanUpQuery`()
+BEGIN
+ SELECT * from warnings;
+
+ SET @pstmtstr = CONCAT('DROP TEMPORARY TABLE IF EXISTS `warnings`', IF(@tempTableList IS NULL, '', CONCAT(',',@tempTableList)));
+ PREPARE pstmt FROM @pstmtstr;
+ EXECUTE pstmt;
+
+ SET @tempTableList = NULL;
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `copyTable` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`caosdb`@`%` PROCEDURE `copyTable`(in fromTable VARCHAR(255), in toTable VARCHAR(255))
+BEGIN
+ SET @copyTableStmtStr = CONCAT('INSERT IGNORE INTO `', toTable, '` (id) SELECT id FROM `', fromTable, '`');
+ PREPARE copyTableStmt FROM @copyTableStmtStr;
+ EXECUTE copyTableStmt;
+ DEALLOCATE PREPARE copyTableStmt;
+
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `createTmpTable` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`caosdb`@`%` PROCEDURE `createTmpTable`(out newTableName VARCHAR(255))
+BEGIN
+ call registerTempTableName(newTableName);
+
+ SET @createTableStmtStr = CONCAT('CREATE TEMPORARY TABLE `', newTableName,'` ( id INT UNSIGNED PRIMARY KEY)' );
+
+ PREPARE createTableStmt FROM @createTableStmtStr;
+ EXECUTE createTableStmt;
+ DEALLOCATE PREPARE createTableStmt;
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `createTmpTable2` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`caosdb`@`%` PROCEDURE `createTmpTable2`(out newTableName VARCHAR(255))
+BEGIN
+ call registerTempTableName(newTableName);
+ SET @createTableStmtStr = CONCAT('CREATE TEMPORARY TABLE `', newTableName,'` ( id INT UNSIGNED, id2 INT UNSIGNED, domain INT UNSIGNED, CONSTRAINT `', newTableName,'PK` PRIMARY KEY (id,id2,domain) )' );
+
+ PREPARE createTableStmt FROM @createTableStmtStr;
+ EXECUTE createTableStmt;
+ DEALLOCATE PREPARE createTableStmt;
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `deleteEntity` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`caosdb`@`%` PROCEDURE `deleteEntity`(in EntityID INT UNSIGNED)
+BEGIN
+
+
+ DELETE FROM files where file_id=EntityID;
+ DELETE FROM data_type WHERE domain_id=0 and (entity_id=0 and property_id=EntityID) or entity_id=EntityID;
+ DELETE FROM collection_type WHERE domain_id=0 and (entity_id=0 and property_id=EntityID) or entity_id=EntityID;
+ DELETE FROM entities where id=EntityID;
+ DELETE FROM entity_acl WHERE NOT EXISTS (SELECT 1 FROM entities WHERE entities.acl = entity_acl.id LIMIT 1);
+
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `deleteEntityProperties` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`caosdb`@`%` PROCEDURE `deleteEntityProperties`(in EntityID INT UNSIGNED)
+BEGIN
+
+CALL deleteIsa(EntityID);
+
+DELETE FROM reference_data
+where (domain_id=0 AND entity_id=EntityID) OR domain_id=EntityID;
+DELETE FROM null_data
+where (domain_id=0 AND entity_id=EntityID) OR domain_id=EntityID;
+DELETE FROM text_data
+where (domain_id=0 AND entity_id=EntityID) OR domain_id=EntityID;
+DELETE FROM name_data
+where (domain_id=0 AND entity_id=EntityID) OR domain_id=EntityID;
+DELETE FROM enum_data
+where (domain_id=0 AND entity_id=EntityID) OR domain_id=EntityID;
+DELETE FROM integer_data
+where (domain_id=0 AND entity_id=EntityID) OR domain_id=EntityID;
+DELETE FROM double_data
+where (domain_id=0 AND entity_id=EntityID) OR domain_id=EntityID;
+DELETE FROM datetime_data
+where (domain_id=0 AND entity_id=EntityID) OR domain_id=EntityID;
+DELETE FROM date_data
+where (domain_id=0 AND entity_id=EntityID) OR domain_id=EntityID;
+DELETE FROM name_overrides
+WHERE (domain_id=0 AND entity_id=EntityID) OR domain_id=EntityID;
+DELETE FROM desc_overrides
+WHERE (domain_id=0 AND entity_id=EntityID) OR domain_id=EntityID;
+DELETE FROM data_type
+WHERE (domain_id=0 AND entity_id=EntityID) OR domain_id=EntityID OR (domain_id=0 AND entity_id=0 AND property_id=EntityID);
+
+DELETE FROM query_template_def WHERE id=EntityID;
+
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `deleteIsa` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`caosdb`@`%` PROCEDURE `deleteIsa`(IN EntityID INT UNSIGNED)
+BEGIN
+
+ DELETE FROM isa_cache WHERE child=EntityID or rpath=EntityID or rpath LIKE concat('%>',EntityID) or rpath LIKE concat('%>', EntityID, '>%');
+
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `deleteLinCon` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`caosdb`@`%` PROCEDURE `deleteLinCon`(in sig BIGINT)
+BEGIN
+
+ DELETE FROM units_lin_con WHERE signature_from=sig;
+
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `entityACL` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`caosdb`@`%` PROCEDURE `entityACL`(out ACLID INT UNSIGNED, in ACLSTR VARBINARY(65525))
+BEGIN
+ SELECT id INTO ACLID FROM entity_acl as t WHERE t.acl=ACLSTR LIMIT 1;
+ IF ACLID IS NULL THEN
+ INSERT INTO entity_acl (acl) VALUES (ACLSTR);
+ SET ACLID = LAST_INSERT_ID();
+ END IF;
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `finishNegationFilter` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`caosdb`@`%` PROCEDURE `finishNegationFilter`(in sourceSet VARCHAR(255), in targetSet VARCHAR(255), in subResultSet VARCHAR(255))
+BEGIN
+ IF targetSet IS NULL OR sourceSet = targetSet THEN
+ call calcDifference(sourceSet, subResultSet);
+ ELSE
+ call calcComplementUnion(targetSet,subResultSet,sourceSet);
+ END IF;
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `finishSubProperty` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`caosdb`@`%` PROCEDURE `finishSubProperty`(in sourceSet VARCHAR(255),in targetSet VARCHAR(255), in list VARCHAR(255))
+BEGIN
+ DECLARE data VARCHAR(20000) DEFAULT CONCAT('`',list,'`');
+ SET @finishSubPropertyStmtStr = makeStmt(sourceSet, targetSet, data, NULL);
+
+ PREPARE finishSubPropertyStmt FROM @finishSubPropertyStmtStr;
+ EXECUTE finishSubPropertyStmt;
+ DEALLOCATE PREPARE finishSubPropertyStmt;
+
+ SELECT @finishSubPropertyStmtStr AS finishSubPropertyStmt;
+
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `getChildren` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`caosdb`@`%` PROCEDURE `getChildren`(in tableName varchar(255))
+BEGIN
+
+ CREATE TEMPORARY TABLE dependTemp (id INT UNSIGNED PRIMARY KEY);
+
+
+
+ SET @initDepend = CONCAT('INSERT IGNORE INTO dependTemp (id) SELECT i.child FROM isa_cache AS i INNER JOIN `', tableName, '` AS t ON (i.parent=t.id);');
+ PREPARE initDependStmt FROM @initDepend;
+
+ EXECUTE initDependStmt;
+ IF ROW_COUNT() != 0 THEN
+ SET @transfer = CONCAT('INSERT IGNORE INTO `', tableName, '` (id) SELECT id FROM dependTemp');
+ PREPARE transferstmt FROM @transfer;
+ EXECUTE transferstmt;
+ DEALLOCATE PREPARE transferstmt;
+ END IF;
+
+
+ DEALLOCATE PREPARE initDependStmt;
+ DROP TEMPORARY TABLE dependTemp;
+
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `getDependentEntities` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`caosdb`@`%` PROCEDURE `getDependentEntities`(in EntityID INT UNSIGNED)
+BEGIN
+
+DROP TEMPORARY TABLE IF EXISTS refering;
+CREATE TEMPORARY TABLE refering (
+id INT UNSIGNED UNIQUE
+);
+
+INSERT IGNORE INTO refering (id) SELECT entity_id FROM reference_data WHERE (value=EntityID OR property_id=EntityID) AND domain_id=0 AND entity_id!=EntityID;
+INSERT IGNORE INTO refering (id) SELECT domain_id FROM reference_data WHERE (value=EntityID OR property_id=EntityID) AND domain_id!=EntityID AND entity_id!=EntityID AND domain_id!=0;
+
+INSERT IGNORE INTO refering (id) SELECT entity_id FROM text_data WHERE property_id=EntityID AND domain_id=0 AND entity_id!=EntityID;
+INSERT IGNORE INTO refering (id) SELECT domain_id FROM text_data WHERE property_id=EntityID AND domain_id!=EntityID AND entity_id!=EntityID AND domain_id!=0;
+
+INSERT IGNORE INTO refering (id) SELECT entity_id FROM enum_data WHERE property_id=EntityID AND domain_id=0 AND entity_id!=EntityID;
+INSERT IGNORE INTO refering (id) SELECT domain_id FROM enum_data WHERE property_id=EntityID AND domain_id!=EntityID AND entity_id!=EntityID AND domain_id!=0;
+
+INSERT IGNORE INTO refering (id) SELECT entity_id FROM name_data WHERE property_id=EntityID AND domain_id=0 AND entity_id!=EntityID;
+INSERT IGNORE INTO refering (id) SELECT domain_id FROM name_data WHERE property_id=EntityID AND domain_id!=EntityID AND entity_id!=EntityID AND domain_id!=0;
+
+INSERT IGNORE INTO refering (id) SELECT entity_id FROM integer_data WHERE property_id=EntityID AND domain_id=0 AND entity_id!=EntityID;
+INSERT IGNORE INTO refering (id) SELECT domain_id FROM integer_data WHERE property_id=EntityID AND domain_id!=EntityID AND entity_id!=EntityID AND domain_id!=0;
+
+INSERT IGNORE INTO refering (id) SELECT entity_id FROM double_data WHERE property_id=EntityID AND domain_id=0 AND entity_id!=EntityID;
+INSERT IGNORE INTO refering (id) SELECT domain_id FROM double_data WHERE property_id=EntityID AND domain_id!=EntityID AND entity_id!=EntityID AND domain_id!=0;
+
+INSERT IGNORE INTO refering (id) SELECT entity_id FROM datetime_data WHERE property_id=EntityID AND domain_id=0 AND entity_id!=EntityID;
+INSERT IGNORE INTO refering (id) SELECT domain_id FROM datetime_data WHERE property_id=EntityID AND domain_id!=EntityID AND entity_id!=EntityID AND domain_id!=0;
+
+INSERT IGNORE INTO refering (id) SELECT entity_id FROM date_data WHERE property_id=EntityID AND domain_id=0 AND entity_id!=EntityID;
+INSERT IGNORE INTO refering (id) SELECT domain_id FROM date_data WHERE property_id=EntityID AND domain_id!=EntityID AND entity_id!=EntityID AND domain_id!=0;
+
+INSERT IGNORE INTO refering (id) SELECT entity_id FROM null_data WHERE property_id=EntityID AND domain_id=0 AND entity_id!=EntityID;
+INSERT IGNORE INTO refering (id) SELECT domain_id FROM null_data WHERE property_id=EntityID AND domain_id!=EntityID AND entity_id!=EntityID AND domain_id!=0;
+
+INSERT IGNORE INTO refering (id) SELECT entity_id from data_type WHERE datatype=EntityID AND domain_id=0 AND entity_id!=EntityID;
+INSERT IGNORE INTO refering (id) SELECT domain_id from data_type WHERE datatype=EntityID;
+
+
+Select id from refering WHERE id!=0 and id!=EntityID;
+
+DROP TEMPORARY TABLE refering;
+
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `getFile` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`caosdb`@`%` PROCEDURE `getFile`(in FileID INT)
+BEGIN
+
+Select name, description, role into @name, @description, @role from entities where id=FileID LIMIT 1;
+
+IF @role = 'file' Then
+ Select path, hash, size into @FilePath, @FileHash, @FileSize from files where file_id=FileID LIMIT 1;
+ Select timestamp, user_id, user_agent into @FileCreated, @FileCreator, @FileGenerator from history where entity_id=FileID AND event='insertion' LIMIT 1;
+
+Select
+FileID as FileID,
+@FilePath as FilePath,
+@FileSize as FileSize,
+@FileHash as FileHash,
+@FileDescription as FileDescription,
+@FileCreated as FileCreated,
+@FileCreator as FileCreator,
+@FileGenerator as FileGenerator,
+NULL as FileOwner,
+NULL as FilePermission,
+NULL as FileChecksum;
+
+END IF;
+
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `getFileIdByPath` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`caosdb`@`%` PROCEDURE `getFileIdByPath`(in FilePath VARCHAR(255))
+BEGIN
+
+Select file_id as FileID from files where path=FilePath LIMIT 1;
+
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `getRole` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`caosdb`@`%` PROCEDURE `getRole`(in RoleName VARCHAR(255))
+BEGIN
+
+Select e.id INTO @RoleID from entities e where e.name=RoleName AND e.role=RoleName LIMIT 1;
+
+call retrieveEntity(@RoleID);
+
+
+
+
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `getRules` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`caosdb`@`%` PROCEDURE `getRules`(in DomainID INT UNSIGNED, in EntityID INT UNSIGNED, in TransType VARCHAR(255))
+BEGIN
+
+
+
+
+SELECT rules.transaction, rules.criterion, rules.modus from rules where if(DomainID is null, rules.domain_id=0,rules.domain_id=DomainID) AND if(EntityID is null, rules.entity_id=0,rules.entity_id=EntityID) AND if(TransType is null,true=true,rules.transaction=TransType);
+
+
+
+
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `initAutoIncrement` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`caosdb`@`%` PROCEDURE `initAutoIncrement`()
+BEGIN
+
+ SELECT @max := MAX(entity_id)+ 1 FROM transaction_log;
+ IF @max IS NOT NULL THEN
+ SET @stmtStr = CONCAT('ALTER TABLE entities AUTO_INCREMENT=',@max);
+ PREPARE stmt FROM @stmtStr;
+ EXECUTE stmt;
+ DEALLOCATE PREPARE stmt;
+ END IF;
+
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `initBackReference` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`caosdb`@`%` PROCEDURE `initBackReference`(in pid INT UNSIGNED, in pname VARCHAR(255), in entity_id INT UNSIGNED, in ename VARCHAR(255))
+BEGIN
+ DECLARE propertiesTable VARCHAR(255) DEFAULT NULL;
+ DECLARE entitiesTable VARCHAR(255) DEFAULT NULL;
+
+ IF pname IS NOT NULL THEN
+ call createTmpTable(propertiesTable);
+ call initSubEntity(pid, pname, propertiesTable);
+ END IF;
+
+ IF ename IS NOT NULL THEN
+ call createTmpTable(entitiesTable);
+ call initSubEntity(entity_id, ename, entitiesTable);
+ END IF;
+
+ SELECT propertiesTable, entitiesTable;
+
+
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `initConjunctionFilter` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`caosdb`@`%` PROCEDURE `initConjunctionFilter`(in sourceSet VARCHAR(255))
+BEGIN
+ DECLARE newTableName VARCHAR(255) DEFAULT NULL;
+ call createTmpTable(newTableName);
+ call copyTable(sourceSet, newTableName);
+ SELECT newTableName AS newTableName;
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `initDisjunctionFilter` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`caosdb`@`%` PROCEDURE `initDisjunctionFilter`()
+BEGIN
+ call initEmptyTargetSet(NULL);
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `initEmptyTargetSet` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`caosdb`@`%` PROCEDURE `initEmptyTargetSet`(in targetSet VARCHAR(255))
+BEGIN
+ DECLARE newTableName VARCHAR(255) DEFAULT targetSet;
+ IF targetSet IS NOT NULL THEN
+ SET @isNotEmptyVar = NULL;
+ SET @isEmptyStmtStr = CONCAT("SELECT 1 INTO @isNotEmptyVar FROM `",targetSet,"` LIMIT 1");
+ PREPARE stmtIsNotEmpty FROM @isEmptyStmtStr;
+ EXECUTE stmtIsNotEmpty;
+ DEALLOCATE PREPARE stmtIsNotEmpty;
+ IF @isNotEmptyVar IS NOT NULL THEN
+ call createTmpTable(newTableName);
+ END IF;
+ ELSE
+ call createTmpTable(newTableName);
+ END IF;
+ SELECT newTableName AS newTableName;
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `initEntity` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`caosdb`@`%` PROCEDURE `initEntity`(in eid INT UNSIGNED, in ename VARCHAR(255), in enameLike VARCHAR(255), in enameRegexp VARCHAR(255), in resultset VARCHAR(255))
+initEntityLabel: BEGIN
+ SET @initEntityStmtStr = NULL;
+
+ IF ename IS NOT NULL THEN
+ SET @initEntityStmtStr = CONCAT('INSERT IGNORE INTO `',resultset,'` (id) SELECT id FROM entities WHERE name=? and id>=100 UNION ALL SELECT entity_id FROM name_data WHERE value=?;');
+ SET @query_param = ename;
+ ELSEIF enameLike IS NOT NULL THEN
+ SET @initEntityStmtStr = CONCAT('INSERT IGNORE INTO `',resultset,'` (id) SELECT id FROM entities WHERE name LIKE ? and id>=100 UNION ALL SELECT entity_id FROM name_data WHERE value LIKE ?;');
+ SET @query_param = enameLike;
+ ELSEIF enameRegexp IS NOT NULL THEN
+ SET @initEntityStmtStr = CONCAT('INSERT IGNORE INTO `',resultset,'` (id) SELECT id FROM entities WHERE name REGEXP ? and id>=100 UNION ALL SELECT entity_id FROM name_data WHERE value REGEXP ?;');
+ SET @query_param = enameRegexp;
+ END IF;
+
+ IF @initEntityStmtStr IS NOT NULL THEN
+ PREPARE initEntityStmt FROM @initEntityStmtStr;
+ EXECUTE initEntityStmt USING @query_param, @query_param;
+ DEALLOCATE PREPARE initEntityStmt;
+ END IF;
+
+ IF eid IS NOT NULL THEN
+ SET @initEntityStmtStr = CONCAT('INSERT IGNORE INTO `',resultset,'` (id) SELECT id FROM entities WHERE id=',eid,';');
+ PREPARE initEntityStmt FROM @initEntityStmtStr;
+ EXECUTE initEntityStmt;
+ DEALLOCATE PREPARE initEntityStmt;
+ END IF;
+
+
+ IF @initEntityStmtStr IS NOT NULL THEN
+ call getChildren(resultset);
+ END IF;
+
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `initNegationFilter` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`caosdb`@`%` PROCEDURE `initNegationFilter`(in sourceSet VARCHAR(255))
+BEGIN
+ DECLARE newTableName VARCHAR(255) DEFAULT NULL;
+ call createTmpTable(newTableName);
+ call copyTable(sourceSet, newTableName);
+ SELECT newTableName AS newTableName;
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `initPOVPropertiesTable` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`caosdb`@`%` PROCEDURE `initPOVPropertiesTable`(in pid INT UNSIGNED, in pname VARCHAR(255), in sourceSet VARCHAR(255))
+BEGIN
+ DECLARE propertiesTable VARCHAR(255) DEFAULT NULL;
+ DECLARE replTbl VARCHAR(255) DEFAULT NULL;
+ DECLARE ecount INT DEFAULT 0;
+ DECLARE t1 BIGINT DEFAULT 0;
+ DECLARE t2 BIGINT DEFAULT 0;
+ DECLARE t3 BIGINT DEFAULT 0;
+ DECLARE t4 BIGINT DEFAULT 0;
+ DECLARE t5 BIGINT DEFAULT 0;
+ DECLARE t6 BIGINT DEFAULT 0;
+
+
+ IF pname is NOT NULL THEN
+ SELECT conv( concat( substring(uid,16,3), substring(uid,10,4), substring(uid,1,8)),16,10) div 10000 - (141427 * 24 * 60 * 60 * 1000) as current_mills INTO t1 from (select uuid() uid) as alias;
+ call createTmpTable2(propertiesTable);
+
+
+ SET @initPOVPropertiesTableStmt1 = CONCAT('INSERT IGNORE INTO `', propertiesTable, '` (id, id2, domain) SELECT id, 0, 0 FROM entities WHERE name = ? UNION ALL SELECT property_id, entity_id, domain_id from name_overrides WHERE name = ? UNION ALL SELECT entity_id, domain_id, 0 FROM name_data WHERE value = ?;');
+ PREPARE stmt FROM @initPOVPropertiesTableStmt1;
+ SET @pname = pname;
+ EXECUTE stmt USING @pname, @pname, @pname;
+ SET ecount = ROW_COUNT();
+
+
+ SELECT conv( concat( substring(uid,16,3), substring(uid,10,4), substring(uid,1,8)),16,10) div 10000 - (141427 * 24 * 60 * 60 * 1000) as current_mills INTO t2 from (select uuid() uid) as alias;
+ IF pid IS NOT NULL THEN
+ SET @initPOVPropertiesTableStmt2 = CONCAT('INSERT IGNORE INTO `', propertiesTable, '` (id, id2, domain) VALUES (?, 0, 0)');
+ PREPARE stmt FROM @initPOVPropertiesTableStmt2;
+ SET @pid = pid;
+ EXECUTE stmt USING @pid;
+ SET ecount = ecount + ROW_COUNT();
+ END IF;
+
+
+ SELECT conv( concat( substring(uid,16,3), substring(uid,10,4), substring(uid,1,8)),16,10) div 10000 - (141427 * 24 * 60 * 60 * 1000) as current_mills INTO t3 from (select uuid() uid) as alias;
+ IF ecount > 0 THEN
+ call getChildren(propertiesTable);
+ END IF;
+
+
+ SELECT conv( concat( substring(uid,16,3), substring(uid,10,4), substring(uid,1,8)),16,10) div 10000 - (141427 * 24 * 60 * 60 * 1000) as current_mills INTO t4 from (select uuid() uid) as alias;
+ IF ecount > 0 THEN
+ call createTmpTable2(replTbl);
+ SET @replTblStmt1 := CONCAT('INSERT IGNORE INTO `',replTbl, '` (id, id2, domain) SELECT r.value as id, r.entity_id as id2, 0 as domain_id FROM reference_data AS r WHERE status="REPLACEMENT" AND domain_id=0 AND EXISTS (SELECT * FROM `', sourceSet, '` AS s WHERE s.id=r.entity_id) AND EXISTS (SELECT * FROM `', propertiesTable, '` AS p WHERE p.domain = 0 AND p.id2=0 AND p.id=r.property_id);');
+ PREPARE replStmt1 FROM @replTblStmt1;
+ EXECUTE replStmt1;
+ DEALLOCATE PREPARE replStmt1;
+ SELECT conv( concat( substring(uid,16,3), substring(uid,10,4), substring(uid,1,8)),16,10) div 10000 - (141427 * 24 * 60 * 60 * 1000) as current_mills INTO t5 from (select uuid() uid) as alias;
+
+ SET @replTblStmt2 := CONCAT('INSERT IGNORE INTO `', propertiesTable, '` SELECT id, id2, domain FROM `', replTbl, '`;');
+ PREPARE replStmt2 FROM @replTblStmt2;
+ EXECUTE replStmt2;
+ DEALLOCATE PREPARE replStmt2;
+ SELECT conv( concat( substring(uid,16,3), substring(uid,10,4), substring(uid,1,8)),16,10) div 10000 - (141427 * 24 * 60 * 60 * 1000) as current_mills INTO t6 from (select uuid() uid) as alias;
+ END IF;
+ END IF;
+ SELECT propertiesTable, t1, t2, t3, t4, t5, t6, @initPOVPropertiesTableStmt1 as initPOVPropertiesTableStmt1, @initPOVPropertiesTableStmt2 as initPOVPropertiesTableStmt2, @replTblStmt1 as replTblStmt1, @replTblStmt2 as replTblStmt2;
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `initPOVRefidsTable` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`caosdb`@`%` PROCEDURE `initPOVRefidsTable`(in vInt INT UNSIGNED, in vText VARCHAR(255))
+BEGIN
+ DECLARE refIdsTable VARCHAR(255) DEFAULT NULL;
+
+
+ IF vText IS NOT NULL THEN
+ call createTmpTable(refIdsTable);
+ call initSubEntity(vInt, vText, refIdsTable);
+
+ END IF;
+ SELECT refIdsTable;
+
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `initQuery` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`caosdb`@`%` PROCEDURE `initQuery`()
+BEGIN
+ CREATE TEMPORARY TABLE IF NOT EXISTS warnings (warning TEXT NOT NULL);
+
+ call createTmpTable(@resultSet);
+ SELECT @resultSet as tablename;
+
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `initSubEntity` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`caosdb`@`%` PROCEDURE `initSubEntity`(in e_id INT UNSIGNED, in ename VARCHAR(255), in tableName VARCHAR(255))
+BEGIN
+ DECLARE ecount INT DEFAULT 0;
+
+ SET @stmtStr = CONCAT('INSERT IGNORE INTO `', tableName, '` (id) SELECT id FROM entities WHERE name = ? UNION ALL SELECT entity_id FROM name_data WHERE value=? AND domain_id=0;');
+ PREPARE stmt FROM @stmtStr;
+ SET @ename = ename;
+ EXECUTE stmt USING @ename, @ename;
+ SET ecount = ROW_COUNT();
+ DEALLOCATE PREPARE stmt;
+
+ IF e_id IS NOT NULL THEN
+ SET @stmtStr = CONCAT('INSERT IGNORE INTO `', tableName, '` (id) VALUES (', e_id, ')');
+ PREPARE stmt FROM @stmtStr;
+ EXECUTE stmt;
+ SET ecount = ecount + ROW_COUNT();
+ DEALLOCATE PREPARE stmt;
+ END IF;
+
+ IF ecount > 0 THEN
+ call getChildren(tableName);
+ END IF;
+
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `initSubProperty` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`caosdb`@`%` PROCEDURE `initSubProperty`(in sourceSet VARCHAR(255), in propertiesTable VARCHAR(255), in refIdsTable VARCHAR(255))
+BEGIN
+DECLARE newTableName VARCHAR(255) DEFAULT NULL;
+ call registerTempTableName(newTableName);
+
+ SET @createSubPropertyListTableStr = CONCAT('CREATE TEMPORARY TABLE `', newTableName,'` ( entity_id INT UNSIGNED NOT NULL, id INT UNSIGNED NOT NULL, domain INT UNSIGNED NOT NULL, CONSTRAINT `',newTableName,'PK` PRIMARY KEY (entity_id, id, domain)) ' );
+
+ PREPARE createSubPropertyListTable FROM @createSubPropertyListTableStr;
+ EXECUTE createSubPropertyListTable;
+ DEALLOCATE PREPARE createSubPropertyListTable;
+
+ SET @subResultSetStmtStr = CONCAT('INSERT IGNORE INTO `', newTableName, '` (domain, entity_id, id)
+ SELECT data1.domain_id as domain, data1.entity_id as entity_id, data1.value as id
+ FROM reference_data as data1 JOIN reference_data as data2
+ ON (data1.domain_id=0
+ AND data1.domain_id=data2.domain_id
+ AND data2.entity_id=data1.entity_id
+ AND (
+ (data1.property_id=data2.value AND data2.status="REPLACEMENT")
+ OR
+ (data1.property_id!=data2.value AND data2.status!="REPLACEMENT" AND data1.status!="REPLACEMENT" AND data1.property_id=data2.property_id)
+ )
+ AND EXISTS (SELECT 1 FROM `', sourceSet, '` as source WHERE source.id=data1.entity_id LIMIT 1)',
+ IF(propertiesTable IS NULL, '', CONCAT(' AND EXISTS (SELECT 1 FROM `', propertiesTable, '` as props WHERE props.id=data2.property_id LIMIT 1)')),
+ IF(refIdsTable IS NULL, '', CONCAT(' AND EXISTS (SELECT 1 FROM `', refIdsTable, '` as refs WHERE refs.id=data1.value LIMIT 1)')),
+ ')'
+ );
+
+
+ PREPARE subResultSetStmt FROM @subResultSetStmtStr;
+ EXECUTE subResultSetStmt;
+ DEALLOCATE PREPARE subResultSetStmt;
+
+ SELECT newTableName as list;
+
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `insertEntity` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`caosdb`@`%` PROCEDURE `insertEntity`(in EntityName VARCHAR(255), in EntityDesc TEXT, in EntityRole VARCHAR(255), in ACL VARBINARY(65525))
+BEGIN
+ DECLARE NewEntityID INT UNSIGNED DEFAULT NULL;
+ DECLARE NewACLID INT UNSIGNED DEFAULT NULL;
+
+ call entityACL(NewACLID, ACL);
+
+ INSERT INTO entities (name, description, role, acl) VALUES (EntityName, EntityDesc, EntityRole, NewACLID);
+ SET NewEntityID = LAST_INSERT_ID();
+
+ Select NewEntityID as EntityID;
+
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `insertEntityProperty` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`caosdb`@`%` PROCEDURE `insertEntityProperty`(in DomainID INT UNSIGNED, in EntityID INT UNSIGNED, in PropertyID INT UNSIGNED, in Datatable VARCHAR(255), in PropertyValue TEXT, in PropertyUnitSig BIGINT, in PropertyStatus VARCHAR(255), in NameOverride VARCHAR(255), in DescOverride TEXT, in datatypeOverride INT UNSIGNED, in Collection VARCHAR(255), in PropertyIndex INT UNSIGNED)
+BEGIN
+
+ CASE Datatable
+ WHEN 'double_data' THEN
+ INSERT INTO double_data
+ (domain_id, entity_id, property_id, value, unit_sig, status, pidx)
+ VALUES
+ (DomainID, EntityID, PropertyID, PropertyValue, PropertyUnitSig, PropertyStatus, PropertyIndex);
+ WHEN 'integer_data' THEN
+ INSERT INTO integer_data
+ (domain_id, entity_id, property_id, value, unit_sig, status, pidx)
+ VALUES
+ (DomainID, EntityID, PropertyID, PropertyValue, PropertyUnitSig, PropertyStatus, PropertyIndex);
+ WHEN 'datetime_data' THEN
+ INSERT INTO datetime_data
+ (domain_id, entity_id, property_id, value, value_ns, status, pidx)
+ VALUES
+ (DomainID, EntityID, PropertyID, SUBSTRING_INDEX(PropertyValue, 'UTC', 1), IF(SUBSTRING_INDEX(PropertyValue, 'UTC', -1)='',NULL,SUBSTRING_INDEX(PropertyValue, 'UTC', -1)), PropertyStatus, PropertyIndex);
+ WHEN 'reference_data' THEN
+ INSERT INTO reference_data
+ (domain_id, entity_id, property_id, value, status, pidx)
+ VALUES
+ (DomainID, EntityID, PropertyID, PropertyValue, PropertyStatus, PropertyIndex);
+ WHEN 'enum_data' THEN
+ INSERT INTO enum_data
+ (domain_id, entity_id, property_id, value, status, pidx)
+ VALUES
+ (DomainID, EntityID, PropertyID, PropertyValue, PropertyStatus, PropertyIndex);
+ WHEN 'date_data' THEN
+ INSERT INTO date_data
+ (domain_id, entity_id, property_id, value, status, pidx)
+ VALUES
+ (DomainID, EntityID, PropertyID, SUBSTRING_INDEX(PropertyValue, '.', 1), PropertyStatus, PropertyIndex);
+ WHEN 'text_data' THEN
+ INSERT INTO text_data
+ (domain_id, entity_id, property_id, value, status, pidx)
+ VALUES
+ (DomainID, EntityID, PropertyID, PropertyValue, PropertyStatus, PropertyIndex);
+ WHEN 'null_data' THEN
+ INSERT INTO null_data
+ (domain_id, entity_id, property_id, status, pidx)
+ VALUES
+ (DomainID, EntityID, PropertyID, PropertyStatus, PropertyIndex);
+ WHEN 'name_data' THEN
+ INSERT INTO name_data
+ (domain_id, entity_id, property_id, value, status, pidx)
+ VALUES
+ (DomainID, EntityID, PropertyID, PropertyValue, PropertyStatus, PropertyIndex);
+
+ ELSE
+ SELECT * FROM table_does_not_exist;
+ END CASE;
+
+ IF DatatypeOverride IS NOT NULL THEN
+ call overrideType(DomainID, EntityID, PropertyID, DatatypeOverride);
+ IF Collection IS NOT NULL THEN
+ INSERT INTO collection_type (domain_id, entity_id, property_id, collection) VALUES (DomainID, EntityID, PropertyID, Collection);
+ END IF;
+ END IF;
+
+ IF NameOverride IS NOT NULL THEN
+ call overrideName(DomainID, EntityID, PropertyID, NameOverride);
+ END IF;
+
+ IF DescOverride IS NOT NULL THEN
+ call overrideDesc(DomainID, EntityID, PropertyID, DescOverride);
+ END IF;
+
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `insertIsa` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`caosdb`@`%` PROCEDURE `insertIsa`(IN c INT UNSIGNED, IN p INT UNSIGNED)
+BEGIN
+
+ INSERT INTO isa_cache (child, parent, rpath) VALUES (c,p,c);
+
+
+
+ INSERT IGNORE INTO isa_cache SELECT c AS child, i.parent AS parent, IF(p=i.rpath or i.rpath=parent, p, concat(p, ">", i.rpath)) AS rpath FROM isa_cache AS i WHERE i.child = p;
+
+
+
+ INSERT IGNORE INTO isa_cache SELECT l.child, r.parent, if(l.rpath=l.child and r.rpath=c, c, concat(if(l.rpath=l.child,c,concat(l.rpath, '>', c)), if(r.rpath=c,'',concat('>', r.rpath)))) AS rpath FROM isa_cache as l INNER JOIN isa_cache as r ON (l.parent = r.child AND l.parent=c);
+
+
+
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `insertLinCon` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`caosdb`@`%` PROCEDURE `insertLinCon`(in signature_from BIGINT, in signature_to BIGINT, in a DECIMAL(65,30), in b_dividend BIGINT, in b_divisor BIGINT, in c DECIMAL(65,30))
+BEGIN
+
+ INSERT IGNORE INTO units_lin_con (signature_from, signature_to, a, b_dividend, b_divisor, c) VALUES (signature_from, signature_to, a, b_dividend, b_divisor, c);
+
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `insertUser` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`caosdb`@`%` PROCEDURE `insertUser`(in Name VARCHAR(255), in Password VARCHAR(255))
+BEGIN
+
+
+INSERT INTO entities (name, role, acl) VALUES (Name, 'USER', 0);
+
+SET @LAST_UserID = LAST_INSERT_ID();
+
+INSERT INTO passwords VALUES (@LAST_UserID, Password);
+
+Select @LAST_UserID as UserID;
+
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `intersectTable` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`caosdb`@`%` PROCEDURE `intersectTable`(in resultSetTable VARCHAR(255), in diff VARCHAR(255))
+BEGIN
+ SET @diffStmtStr = CONCAT('DELETE FROM `', resultSetTable, '` WHERE id NOT IN ( SELECT id FROM `', diff,'`)');
+ PREPARE diffStmt FROM @diffStmtStr;
+ EXECUTE diffStmt;
+
+
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `isSubtype` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`caosdb`@`%` PROCEDURE `isSubtype`(in c INT UNSIGNED, in p INT UNSIGNED)
+BEGIN
+ DECLARE ret BOOLEAN DEFAULT FALSE;
+ SELECT TRUE INTO ret FROM isa_cache AS i WHERE i.child=c AND i.parent=p LIMIT 1;
+ SELECT ret as ISA;
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `overrideDesc` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`caosdb`@`%` PROCEDURE `overrideDesc`(in DomainID INT UNSIGNED, in EntityID INT UNSIGNED, in PropertyID INT UNSIGNED, in Description TEXT)
+BEGIN
+ INSERT INTO desc_overrides (domain_id, entity_id, property_id, description) VALUES (DomainID, EntityID, PropertyID, Description);
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `overrideName` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`caosdb`@`%` PROCEDURE `overrideName`(in DomainID INT UNSIGNED, in EntityID INT UNSIGNED, in PropertyID INT UNSIGNED, in Name VARCHAR(255))
+BEGIN
+ INSERT INTO name_overrides (domain_id, entity_id, property_id, name) VALUES (DomainID, EntityID, PropertyID, Name);
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `overrideType` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`caosdb`@`%` PROCEDURE `overrideType`(in DomainID INT UNSIGNED, in EntityID INT UNSIGNED, in PropertyID INT UNSIGNED, in Datatype INT UNSIGNED)
+BEGIN
+ INSERT INTO data_type (domain_id, entity_id, property_id, datatype) VALUES (DomainID, EntityID, PropertyID, Datatype);
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `raiseWarning` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`caosdb`@`%` PROCEDURE `raiseWarning`(in str VARCHAR(20000))
+BEGIN
+ INSERT INTO warnings VALUES (str);
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `registerSubdomain` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`caosdb`@`%` PROCEDURE `registerSubdomain`(in Count INT UNSIGNED)
+BEGIN
+ DECLARE ED INTEGER DEFAULT NULL;
+
+Select COUNT(id) INTO ED FROM entities WHERE Role='DOMAIN' AND id!=0;
+WHILE ED < Count DO
+ INSERT INTO entities (name, description, role, acl) VALUES (NULL, "Multipurpose subdomain", 'DOMAIN', 0);
+ SET ED = ED + 1;
+END WHILE;
+
+SELECT id as DomainID FROM entities WHERE Role='DOMAIN' and id!=0;
+
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `registerTempTableName` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`caosdb`@`%` PROCEDURE `registerTempTableName`(out newTableName VARCHAR(255))
+BEGIN
+ SET newTableName = md5(CONCAT(RAND(),CURRENT_TIMESTAMP()));
+ SET @tempTableList = IF(@tempTableList IS NULL, CONCAT('`',newTableName,'`'), CONCAT(@tempTableList, ',`', newTableName, '`'));
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `retrieveDatatype` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`caosdb`@`%` PROCEDURE `retrieveDatatype`(in DatatypeName VARCHAR(255))
+BEGIN
+
+Select e.id INTO @DatatypeID from entities e where e.name=DatatypeName AND e.role='DATATYPE' LIMIT 1;
+
+call retrieveEntity(@DatatypeID);
+
+
+
+
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `retrieveEntity` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`caosdb`@`%` PROCEDURE `retrieveEntity`(in EntityID INT UNSIGNED)
+BEGIN
+ DECLARE FilePath VARCHAR(255) DEFAULT NULL;
+ DECLARE FileSize VARCHAR(255) DEFAULT NULL;
+ DECLARE FileHash VARCHAR(255) DEFAULT NULL;
+ DECLARE DatatypeID INT UNSIGNED DEFAULT NULL;
+ DECLARE CollectionName VARCHAR(255) DEFAULT NULL;
+
+ Select path, size, hex(hash) into FilePath, FileSize, FileHash from files where file_id = EntityID LIMIT 1;
+ Select datatype into DatatypeID from data_type where domain_id=0 and entity_id=0 and property_id=EntityID LIMIT 1;
+
+ SELECT collection into CollectionName from collection_type where domain_id=0 and entity_id=0 and property_id=EntityID LIMIT 1;
+
+ Select
+ (Select name from entities where id=DatatypeID) as Datatype,
+ CollectionName as Collection,
+ EntityID as EntityID,
+ e.name as EntityName,
+ e.description as EntityDesc,
+ e.role as EntityRole,
+ FileSize as FileSize,
+ FilePath as FilePath,
+ FileHash as FileHash,
+ (SELECT acl FROM entity_acl as a WHERE a.id = e.acl) as ACL
+ from entities e where id = EntityID LIMIT 1;
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `retrieveEntityParents` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`caosdb`@`%` PROCEDURE `retrieveEntityParents`(in EntityID INT UNSIGNED)
+BEGIN
+
+SELECT parent AS ParentID, name AS ParentName, description AS ParentDescription, role AS ParentRole, (SELECT acl from entity_acl as a WHERE a.id=e.acl) AS ACL FROM isa_cache AS i JOIN entities AS e ON (i.parent=e.id AND i.child=EntityID and i.rpath=EntityID);
+
+
+
+
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `retrieveEntityProperties` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`caosdb`@`%` PROCEDURE `retrieveEntityProperties`(in DomainID INT UNSIGNED, in EntityID INT UNSIGNED)
+BEGIN
+
+
+ Select
+ property_id as PropertyID, value as PropertyValue, status as PropertyStatus, pidx as PropertyIndex from double_data where domain_id = DomainID and entity_id = EntityID
+
+ UNION ALL
+
+
+ Select
+ property_id as PropertyID, value as PropertyValue, status as PropertyStatus, pidx as PropertyIndex from integer_data where domain_id = DomainID and entity_id = EntityID
+
+ UNION ALL
+
+
+ Select
+ property_id as PropertyID, CONCAT(value, '.NULL.NULL') as PropertyValue, status as PropertyStatus, pidx as PropertyIndex from date_data where domain_id = DomainID and entity_id = EntityID
+
+ UNION ALL
+
+
+ Select
+ property_id as PropertyID, CONCAT(value, 'UTC', IF(value_ns IS NULL, '', value_ns)) as PropertyValue, status as PropertyStatus, pidx as PropertyIndex from datetime_data where domain_id = DomainID and entity_id = EntityID
+
+ UNION ALL
+
+
+ Select
+ property_id as PropertyID, value as PropertyValue, status as PropertyStatus, pidx as PropertyIndex from text_data where domain_id = DomainID and entity_id = EntityID
+
+ UNION ALL
+
+
+ Select
+ property_id as PropertyID, value as PropertyValue, status as PropertyStatus, pidx as PropertyIndex from enum_data where domain_id = DomainID and entity_id = EntityID
+
+ UNION ALL
+
+
+ Select
+ property_id as PropertyID, value as PropertyValue, status as PropertyStatus, pidx as PropertyIndex from reference_data where domain_id = DomainID and entity_id = EntityID
+
+ UNION ALL
+
+
+ Select
+ property_id as PropertyID, NULL AS PropertyValue, status as PropertyStatus, pidx as PropertyIndex from null_data WHERE domain_id = DomainID and entity_id = EntityID
+
+ UNION ALL
+
+
+ Select
+ property_id as PropertyID, value as PropertyValue, status as PropertyStatus, pidx as PropertyIndex from name_data where domain_id = DomainID and entity_id = EntityID;
+
+
+
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `retrieveGroup` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`caosdb`@`%` PROCEDURE `retrieveGroup`(in USERID INT UNSIGNED, in GROUPID INT UNSIGNED)
+BEGIN
+IF USERID IS NOT NULL THEN
+ Select user_id, group_id from groups where user_id = USERID;
+ELSEIF GROUPID IS NOT NULL THEN
+ Select user_id, group_id from groups where group_id = GROUPID;
+END IF;
+
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `retrieveOverrides` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`caosdb`@`%` PROCEDURE `retrieveOverrides`(in DomainID INT UNSIGNED, in EntityID INT UNSIGNED)
+BEGIN
+
+ SELECT NULL as collection_override, name as name_override, NULL as desc_override, NULL as type_override, entity_id, property_id from name_overrides where domain_id=DomainID and entity_id=EntityID UNION ALL
+ SELECT NULL as collection_override, NULL as name_override, description as desc_override, NULL as type_override, entity_id, property_id from desc_overrides where domain_id=DomainID and entity_id=EntityID UNION ALL
+ SELECT NULL as collection_override, NULL as name_override, NULL as desc_override, (Select name from entities where id=datatype LIMIT 1) as type_override, entity_id, property_id from data_type where domain_id=DomainID and entity_id=EntityID UNION ALL
+ SELECT collection as collection_override, NULL as name_override, NULL as desc_override, NULL as type_override, entity_id, property_id from collection_type where domain_id=DomainID and entity_id=EntityID;
+
+
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `setPassword` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`caosdb`@`%` PROCEDURE `setPassword`(in EntityID INT UNSIGNED, in NewPassword VARCHAR(255))
+BEGIN
+
+
+ DELETE FROM passwords where entity_id=EntityID;
+ INSERT INTO passwords (entity_id, password) VALUES (EntityID, NewPassword);
+
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `showEntityAutoIncr` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`caosdb`@`%` PROCEDURE `showEntityAutoIncr`()
+BEGIN
+SELECT `AUTO_INCREMENT`
+FROM INFORMATION_SCHEMA.TABLES
+WHERE TABLE_SCHEMA = 'caosdb'
+AND TABLE_NAME = 'entities';
+
+
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `updateEntity` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`caosdb`@`%` PROCEDURE `updateEntity`(in EntityID INT UNSIGNED, in EntityName VARCHAR(255), in EntityDescription TEXT, in EntityRole VARCHAR(255), in Datatype VARCHAR(255), in Collection VARCHAR(255), in ACL VARBINARY(65525))
+BEGIN
+ DECLARE ACLID INT UNSIGNED DEFAULT NULL;
+ call entityACL(ACLID, ACL);
+
+ UPDATE entities e SET e.name = EntityName, e.description = EntityDescription, e.role=EntityRole, e.acl = ACLID where e.id = EntityID;
+
+ DELETE from data_type where domain_id=0 AND entity_id=0 AND property_id=EntityID;
+ DELETE from collection_type where domain_id=0 AND entity_id=0 AND property_id=EntityID;
+
+ IF Datatype IS NOT NULL THEN
+ INSERT INTO data_type (domain_id, entity_id, property_id, datatype) SELECT 0, 0, EntityID, ( SELECT id from entities where name = Datatype LIMIT 1);
+ IF Collection IS NOT NULL THEN
+ INSERT INTO collection_type (domain_id, entity_id, property_id, collection) SELECT 0, 0, EntityID, Collection;
+ END IF;
+ END IF;
+
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `updateLinCon` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`caosdb`@`%` PROCEDURE `updateLinCon`(in sig_from BIGINT, in sig_to BIGINT, in new_a DECIMAL(65,30), in new_b_dividend BIGINT, in new_b_divisor BIGINT, in new_c DECIMAL(65,30))
+BEGIN
+ UPDATE units_ling_con SET signature_to=sig_to, a=new_a, b_dividend=new_b_dividend, b_divisor=new_b_divisor, c=new_c where signature_from=sig_from;
+
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
+
+/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
+/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
+/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
+/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
+/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
+/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
+/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
+
+-- Dump completed on 2019-08-17 9:30:12
diff --git a/integrationtests/test-profile/profile.yml b/integrationtests/test-profile/profile.yml
index f830a2fbe6c6a4ae35362676db310f3eadf6f4cc..a0a18a2f30bb1c91e6d9d0a0677c38c4ae55857e 100644
--- a/integrationtests/test-profile/profile.yml
+++ b/integrationtests/test-profile/profile.yml
@@ -136,7 +136,7 @@ default:
# grpc_server_port_https: 8443
# HTTP port of the grpc end-point
# grpc_server_port_http: 8080
-
+ _CAOSDB_INTEGRATION_TEST_SUITE_KEY: 10b128cf8a1372f30aa3697466bb55e76974e0c16a599bb44ace88f19c8f61e2
# Development configuration options
# devel:
# Copy the caosdb-server jar from this location into the Docker container.
diff --git a/integrationtests/test_data/extroot/realworld_example/data/35/03_raw_data/001_dataset1/metadata.json b/integrationtests/test_data/extroot/realworld_example/data/35/03_raw_data/001_dataset1/metadata.json
index 9b81cc094bf7d1c35154d8f092a96d5f5fae35c9..e8b6fd4425872be128ae55d038d77bd1ff7bf4af 100644
--- a/integrationtests/test_data/extroot/realworld_example/data/35/03_raw_data/001_dataset1/metadata.json
+++ b/integrationtests/test_data/extroot/realworld_example/data/35/03_raw_data/001_dataset1/metadata.json
@@ -5,7 +5,7 @@
{
"longitude": 18.445078548041533,
"start_datetime": "2022-02-10T16:36:48+01:00",
- "latitude": 53.10833068997861,
+ "latitude": 53,
"elevation": 2,
"location": "Bremen, Germany"
}
diff --git a/integrationtests/test_data/extroot/realworld_example/dataset_cfoods.yml b/integrationtests/test_data/extroot/realworld_example/dataset_cfoods.yml
index eaf2690ae130cb61c8a74452e3e4e1d4fd06846a..69cb53d4ffb86a3353fbccc2cae3dc3fbea25009 100644
--- a/integrationtests/test_data/extroot/realworld_example/dataset_cfoods.yml
+++ b/integrationtests/test_data/extroot/realworld_example/dataset_cfoods.yml
@@ -33,28 +33,28 @@ Data:
validate: schema/dataspace.schema.json
subtree:
dataspace_id_element:
- type: DictIntegerElement
+ type: IntegerElement
match_name: "dataspace_id"
match_value: "(?P<id>[0-9]+)"
records:
Dataspace:
dataspace_id: $id
archived_element:
- type: DictBooleanElement
+ type: BooleanElement
match_name: "archived"
match_value: "(?P<archived>.*)"
records:
Dataspace:
archived: $archived
url_element:
- type: DictTextElement
+ type: TextElement
match_name: "url"
match_value: "(?P<url>.*)"
records:
Dataspace:
url: $url
coordinator_element:
- type: DictDictElement
+ type: DictElement
match_name: "coordinator"
records:
Person:
@@ -64,70 +64,70 @@ Data:
Person: $Person
subtree: &person_subtree
full_name_element:
- type: DictTextElement
+ type: TextElement
match_name: "full_name"
match_value: "(?P<full_name>.*)"
records:
Person:
full_name: $full_name
full_name_nonlatin_element:
- type: DictTextElement
+ type: TextElement
match_name: "full_name_nonlatin"
match_value: "(?P<full_name_nonlatin>.*)"
records:
Person:
full_name_nonlatin: $full_name_nonlatin
family_name_element:
- type: DictTextElement
+ type: TextElement
match_name: "family_name"
match_value: "(?P<family_name>.*)"
records:
Person:
family_name: $family_name
given_name_element:
- type: DictTextElement
+ type: TextElement
match_name: "given_name"
match_value: "(?P<given_name>.*)"
records:
Person:
given_name: $given_name
email_element:
- type: DictTextElement
+ type: TextElement
match_name: "email"
match_value: "(?P<email>.*)"
records:
Person:
email: $email
affiliation_element:
- type: DictTextElement
+ type: TextElement
match_name: "affiliation"
match_value: "(?P<affiliation>.*)"
records:
Person:
affiliation: $affiliation
ORCID_element:
- type: DictTextElement
+ type: TextElement
match_name: "ORCID"
match_value: "(?P<ORCID>.*)"
records:
Person:
ORCID: $ORCID
start_date_element:
- type: DictTextElement
+ type: TextElement
match_name: "start_date"
match_value: "(?P<start_date>.*)"
records:
Dataspace:
start_date: $start_date
end_date_element:
- type: DictTextElement
+ type: TextElement
match_name: "end_date"
match_value: "(?P<end_date>.*)"
records:
Dataspace:
end_date: $end_date
comment:
- type: DictTextElement
+ type: TextElement
match_name: "comment"
match_value: "(?P<comment>.*)"
records:
@@ -152,18 +152,18 @@ Data:
validate: schema/dataset.schema.json
subtree:
title_element:
- type: DictTextElement
+ type: TextElement
match_name: "title"
match_value: "(?P<title>.*)"
records:
Dataset:
title: $title
authors_element:
- type: DictListElement
+ type: ListElement
match_name: "authors"
subtree:
author_element:
- type: Dict
+ type: DictElement
records:
Person:
parents:
@@ -172,21 +172,21 @@ Data:
authors: +$Person
subtree: *person_subtree
abstract_element:
- type: DictTextElement
+ type: TextElement
match_name: "abstract"
match_value: "(?P<abstract>.*)"
records:
Dataset:
abstract: $abstract
comment_element:
- type: DictTextElement
+ type: TextElement
match_name: "comment"
match_value: "(?P<comment>.*)"
records:
Dataset:
comment: $comment
license_element:
- type: DictTextElement
+ type: TextElement
match_name: "license"
match_value: "(?P<license_name>.*)"
records:
@@ -199,31 +199,31 @@ Data:
Dataset:
license: $license
dataset_doi_element:
- type: DictTextElement
+ type: TextElement
match_name: "dataset_doi"
match_value: "(?P<dataset_doi>.*)"
records:
Dataset:
dataset_doi: $dataset_doi
related_to_dois_element:
- type: DictListElement
+ type: ListElement
match_name: "related_to_dois"
subtree:
related_to_doi_element:
type: TextElement
- match: "(?P<related_to_doi>).*"
+ match_value: "(?P<related_to_doi>).*"
records:
Dataset:
related_to_dois: +$related_to_doi
Keywords_element:
- type: DictListElement
+ type: ListElement
match_name: "Keyword"
Events_element:
- type: DictListElement
+ type: ListElement
match_name: "Event"
subtree:
Event_element:
- type: Dict
+ type: DictElement
records:
Event:
parents:
@@ -232,84 +232,84 @@ Data:
Event: +$Event
subtree:
label_element:
- type: DictTextElement
+ type: TextElement
match_name: "label"
match_value: "(?P<label>.*)"
records:
Event:
label: $label
comment_element:
- type: DictTextElement
+ type: TextElement
match_name: "comment"
match_value: "(?P<comment>.*)"
records:
Event:
comment: $comment
start_datetime_element:
- type: DictTextElement
+ type: TextElement
match_name: start_datetime
match_value: "(?P<start_datetime>.*)"
records:
Event:
start_datetime: $start_datetime
end_datetime_element:
- type: DictTextElement
+ type: TextElement
match_name: end_datetime
match_value: "(?P<end_datetime>.*)"
records:
Event:
end_datetime: $end_datetime
longitude_element:
- type: DictFloatElement
+ type: FloatElement
match_name: "longitude"
match_value: "(?P<longitude>.*)"
records:
Event:
longitude: $longitude
latitude_element:
- type: DictFloatElement
+ type: FloatElement
match_name: "latitude"
match_value: "(?P<latitude>.*)"
records:
Event:
latitude: $latitude
elevation_element:
- type: DictFloatElement
+ type: FloatElement
match_name: "elevation"
match_value: "(?P<elevation>.*)"
records:
Event:
elevation: $elevation
location_element:
- type: DictTextElement
+ type: TextElement
match_name: location
match_value: "(?P<location>.*)"
records:
Event:
location: $location
igsn_element:
- type: DictTextElement
+ type: TextElement
match_name: igsn
match_value: "(?P<igsn>.*)"
records:
Event:
igsn: $igsn
events_in_data_element:
- type: DictBooleanElement
+ type: BooleanElement
match_name: "events_in_data"
match_value: "(?P<events_in_data>.*)"
records:
Dataset:
events_in_data: $events_in_data
geojson_element:
- type: DictTextElement
+ type: TextElement
match_name: "geojson"
match_value: "(?P<geojson>.*)"
records:
Dataset:
geojson: $geojson
project_element:
- type: DictDictElement
+ type: DictElement
match_name: "project"
records:
Project:
@@ -319,28 +319,28 @@ Data:
Project: $Project
subtree:
name_element:
- type: DictTextElement
+ type: TextElement
match_name: "name"
match_value: "(?P<name>.*)"
records:
Project:
name: $name
full_name_element:
- type: DictTextElement
+ type: TextElement
match_name: "full_name"
match_value: "(?P<full_name>.*)"
records:
Project:
full_name: $full_name
project_id_element:
- type: DictTextElement
+ type: TextElement
match_name: "project_id"
match_value: "(?P<project_id>.*)"
records:
Project:
project_id: $project_id
project_type_element:
- type: DictTextElement
+ type: TextElement
match_name: "project_type"
match_value: "(?P<project_type_name>.*)"
records:
@@ -349,39 +349,39 @@ Data:
Project:
project_type: $project_type
institute_element:
- type: DictTextElement
+ type: TextElement
match_name: "institute"
match_value: "(?P<institute>.*)"
records:
Project:
institute: $institute
start_date_element:
- type: DictTextElement
+ type: TextElement
match_name: "start_date"
match_value: "(?P<start_date>.*)"
records:
Project:
start_date: $start_date
end_date_element:
- type: DictTextElement
+ type: TextElement
match_name: "end_date"
match_value: "(?P<end_date>.*)"
records:
Project:
end_date: $end_date
url_element:
- type: DictTextElement
+ type: TextElement
match_name: "url"
match_value: "(?P<url>.*)"
records:
Project:
url: $url
coordinators_element:
- type: DictListElement
+ type: ListElement
match_name: "coordinators"
subtree:
coordinator_element:
- type: Dict
+ type: DictElement
records:
Person:
parents:
@@ -390,7 +390,7 @@ Data:
coordinators: +$Person
subtree: *person_subtree
campaign_element:
- type: DictDictElement
+ type: DictElement
match_name: "campaign"
records:
Campaign:
@@ -400,39 +400,39 @@ Data:
Campaign: $Campaign
subtree:
label_element:
- type: DictTextElement
+ type: TextElement
match_name: "label"
match_value: "(?P<label>.*)"
records:
Campaign:
label: $label
optional_label_element:
- type: DictTextElement
+ type: TextElement
match_name: "optional_label"
match_value: "(?P<optional_label>.*)"
records:
Campaign:
optional_label: $optional_label
start_date_element:
- type: DictTextElement
+ type: TextElement
match_name: "start_date"
match_value: "(?P<start_date>.*)"
records:
Campaign:
start_date: $start_date
end_date_element:
- type: DictTextElement
+ type: TextElement
match_name: "end_date"
match_value: "(?P<end_date>.*)"
records:
Campaign:
end_date: $end_date
responsible_scientists_element:
- type: DictListElement
+ type: ListElement
match_name: "responsible_scientists"
subtree:
responsible_scientist_element:
- type: Dict
+ type: DictElement
records:
Person:
parents:
@@ -441,11 +441,11 @@ Data:
responsible_scientists: +$Person
subtree: *person_subtree
Methods_element:
- type: DictListElement
+ type: ListElement
match_name: "Method"
subtree:
Method_element:
- type: Dict
+ type: DictElement
records:
Method:
parents:
@@ -454,32 +454,32 @@ Data:
Method: +$Method
subtree:
method_name_element:
- type: DictTextElement
+ type: TextElement
match_name: "method_name"
match_value: "(?P<method_name>.*)"
records:
Method:
name: $method_name
abbreviation_element:
- type: DictTextElement
+ type: TextElement
match_name: "abbreviation"
match_value: "(?P<abbreviation>.*)"
records:
Method:
abbreviation: $abbreviation
url_element:
- type: DictTextElement
+ type: TextElement
match_name: "url"
match_value: "(?P<url>.*)"
records:
Method:
url: $url
Taxa_element:
- type: DictListElement
+ type: ListElement
match_name: "Taxon"
subtree:
Taxon_element:
- type: Dict
+ type: DictElement
records:
Taxon:
parents:
@@ -488,28 +488,28 @@ Data:
Taxon: +$Taxon
subtree:
taxon_name_element:
- type: DictTextElement
+ type: TextElement
match_name: "taxon_name"
match_value: "(?P<taxon_name>.*)"
records:
Taxon:
name: $taxon_name
archived_element:
- type: DictBooleanElement
+ type: BooleanElement
match_name: "archived"
match_value: "(P<archived>.*)"
records:
Dataset:
archived: $archived
publication_date_element:
- type: DictTextElement
+ type: TextElement
match_name: "publication_date"
match_value: "(P<publication_date>.*)"
records:
Dataset:
publication_date: $publication_date
max_files_element:
- type: DictIntegerElement
+ type: IntegerElement
match_name: "max_files"
match_value: "(P<max_files>.*)"
records:
diff --git a/integrationtests/test_issues.py b/integrationtests/test_issues.py
index 78beb63c55bbce9cb1082345bdb4ccb1f9a3129f..527b4c0cf67f483d5b61972a0104ff4fb673402d 100644
--- a/integrationtests/test_issues.py
+++ b/integrationtests/test_issues.py
@@ -22,12 +22,10 @@ import caosdb as db
from caoscrawler.crawl import Crawler
from caoscrawler.identifiable_adapters import CaosDBIdentifiableAdapter
-from caoscrawler.structure_elements import Dict
+from caoscrawler.structure_elements import DictElement
-
-@fixture
-def clear_database():
- db.execute_query("FIND ENTITY").delete(raise_exception_on_error=False)
+from caosdb.utils.register_tests import clear_database, set_test_key
+set_test_key("10b128cf8a1372f30aa3697466bb55e76974e0c16a599bb44ace88f19c8f61e2")
def test_issue_23(clear_database):
@@ -53,14 +51,14 @@ def test_issue_23(clear_database):
# identifying_prop and prop_b, but not prop_a ...
crawler_definition = {
"DictTest": {
- "type": "Dict",
+ "type": "DictElement",
"match": "(.*)",
"records": {
"TestType": {}
},
"subtree": {
"identifying_element": {
- "type": "DictTextElement",
+ "type": "TextElement",
"match_name": "ident",
"match_value": "(?P<ident_value>.*)",
"records": {
@@ -70,7 +68,7 @@ def test_issue_23(clear_database):
}
},
"other_element": {
- "type": "DictTextElement",
+ "type": "TextElement",
"match_name": "prop_b",
"match_value": "(?P<other_value>.*)",
"records": {
@@ -98,7 +96,7 @@ def test_issue_23(clear_database):
}
records = crawler.start_crawling(
- Dict("TestDict", test_dict), crawler_definition, converter_registry)
+ DictElement("TestDict", test_dict), crawler_definition, converter_registry)
assert len(records) == 1
rec_crawled = records[0]
diff --git a/integrationtests/test_realworld_example.py b/integrationtests/test_realworld_example.py
index 7360d9670554a039b879ec337b0ed78763d1d589..4158ed22278ef5c871a22d45885e58fbfa84ea3b 100644
--- a/integrationtests/test_realworld_example.py
+++ b/integrationtests/test_realworld_example.py
@@ -22,25 +22,23 @@
#
"""
-module description
+an integration test module that runs a test against a (close to) real world example
"""
+from caosdb.utils.register_tests import clear_database, set_test_key
import json
import os
import caosdb as db
from caoscrawler.crawl import Crawler, crawler_main
-from caoscrawler.converters import JSONFileConverter, DictConverter
from caoscrawler.identifiable_adapters import CaosDBIdentifiableAdapter
-from caoscrawler.structure_elements import File, JSONFile, Directory
+from caoscrawler.structure_elements import Directory
import pytest
from caosadvancedtools.models.parser import parse_model_from_json_schema, parse_model_from_yaml
-#from caosadvancedtools.testutils import clear_database, set_test_key
import sys
-# TODO is not yet merged in caosadvancedtools
-# set_test_key("10b128cf8a1372f30aa3697466bb55e76974e0c16a599bb44ace88f19c8f61e2")
+set_test_key("10b128cf8a1372f30aa3697466bb55e76974e0c16a599bb44ace88f19c8f61e2")
def rfp(*pathcomponents):
@@ -119,6 +117,7 @@ def test_dataset(clear_database, usemodel):
"") == 1
assert db.execute_query(f"COUNT RECORD with id={dataset.id} AND WHICH REFERENCES Event WITH "
"start_datetime='2022-02-10T16:36:48+01:00'") == 1
+ assert db.execute_query(f"FIND Event WITH latitude=53", unique=True)
def test_event_update(clear_database, usemodel):
diff --git a/integrationtests/test_use_case_simple_presentation.py b/integrationtests/test_use_case_simple_presentation.py
index 1d611ba4b002aa4c5b31f6f6a2862985c9d4298f..91c523be90a4d0117a7cc54217cae0b911511957 100644
--- a/integrationtests/test_use_case_simple_presentation.py
+++ b/integrationtests/test_use_case_simple_presentation.py
@@ -22,9 +22,6 @@
# ** end header
#
-"""
-module description
-"""
import os
import pytest
from subprocess import run
@@ -33,25 +30,13 @@ import caosdb as db
from caosadvancedtools.loadFiles import loadpath
from caosadvancedtools.models import parser as parser
from caoscrawler.crawl import crawler_main
+from caosdb.utils.register_tests import clear_database, set_test_key
-# TODO: wait for release of this feature in pylib
-# from caosdb.utils.register_tests import clear_database, set_test_key
-# set_test_key("10b128cf8a1372f30aa3697466bb55e76974e0c16a599bb44ace88f19c8f61e2")
+set_test_key("10b128cf8a1372f30aa3697466bb55e76974e0c16a599bb44ace88f19c8f61e2")
DATADIR = os.path.join(os.path.dirname(__file__), "test_data",
"extroot", "use_case_simple_presentation")
-# TODO: remove this
-
-
-@pytest.fixture
-def clear_database():
- # TODO(fspreck): Remove once the corresponding advancedtools function can be
- # used.
- ents = db.execute_query("FIND ENTITY WITH ID>99")
- if ents:
- ents.delete()
-
def test_complete_crawler(
clear_database
diff --git a/setup.cfg b/setup.cfg
index 994ba7cacf2fc3cf5ff93a17a23eb5bcec34067f..b4b61af263e2d3b0e5ebd2dd6fa999a3000ddfc7 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,6 +1,6 @@
[metadata]
name = caoscrawler
-version = 0.1.1
+version = 0.2.1
author = Alexander Schlemmer
author_email = alexander.schlemmer@ds.mpg.de
description = A new crawler for caosdb
diff --git a/src/caoscrawler/cfood-schema.yml b/src/caoscrawler/cfood-schema.yml
index d7b5abfd1ac6c381b50bd4ce61015f1b8602b408..5e724c83695e098ce980e1aa8e81c65ae8525e19 100644
--- a/src/caoscrawler/cfood-schema.yml
+++ b/src/caoscrawler/cfood-schema.yml
@@ -16,10 +16,15 @@ cfood:
- YamlFileCaosDBRecord
- MarkdownFile
- DictListElement
+ - ListElement
- DictDictElement
+ - DictElement
- DictFloatElement
+ - FloatElement
- DictIntegerElement
+ - IntegerElement
- DictBooleanElement
+ - BooleanElement
- Definitions
- Dict
- JSONFile
diff --git a/src/caoscrawler/converters.py b/src/caoscrawler/converters.py
index f5c923f21d5eb762bbad5a5524bf4cc9c88cfb5c..e79fbcabdb4fe48bc791287fa5551c0ade69e842 100644
--- a/src/caoscrawler/converters.py
+++ b/src/caoscrawler/converters.py
@@ -31,11 +31,10 @@ import json
import warnings
from .utils import has_parent
from .stores import GeneralStore, RecordStore
-from .structure_elements import (StructureElement, Directory, File, Dict, JSONFile,
- DictIntegerElement, DictBooleanElement,
- DictFloatElement, DictDictElement,
- TextElement, DictTextElement, DictElement, DictListElement)
-from typing import Dict as Dict_t, List, Optional, Tuple, Union
+from .structure_elements import (StructureElement, Directory, File, DictElement, JSONFile,
+ IntegerElement, BooleanElement, FloatElement,
+ TextElement, TextElement, ListElement)
+from typing import List, Optional, Tuple, Union
from abc import ABCMeta, abstractmethod
from string import Template
import yaml_header_tools
@@ -205,6 +204,10 @@ def create_records(values: GeneralStore,
# additionally add the new record to the general store:
values[name] = c_record
+ # add the "fallback" parent only for Records, not for Files:
+ if (role == "Record" and "parents" not in record):
+ c_record.add_parent(name)
+
c_record = records[name]
for key, value in record.items():
@@ -252,12 +255,6 @@ def create_records(values: GeneralStore,
var_replaced_parent = replace_variables(parent, values)
if not has_parent(c_record, var_replaced_parent):
c_record.add_parent(var_replaced_parent)
- else:
- # add the "fallback" parent only for Records, not for Files:
- if role == "Record":
- # if not has_parent(c_record, name):
- if len(c_record.parents) == 0:
- c_record.add_parent(name)
return keys_modified
@@ -266,14 +263,12 @@ class Converter(object, metaclass=ABCMeta):
Converters treat StructureElements contained in the hierarchical sturcture.
"""
- def __init__(self, definition: dict,
- name: str,
- converter_registry: dict):
+ def __init__(self, definition: dict, name: str, converter_registry: dict):
self.definition = definition
self.name = name
# Used to store usage information for debugging:
- self.metadata: Dict_t[str, set[str]] = {
+ self.metadata: dict[str, set[str]] = {
"usage": set()
}
@@ -286,9 +281,7 @@ class Converter(object, metaclass=ABCMeta):
converter_definition, converter_name, converter_registry))
@staticmethod
- def converter_factory(definition: dict,
- name: str,
- converter_registry: dict):
+ def converter_factory(definition: dict, name: str, converter_registry: dict):
"""creates a Converter instance of the appropriate class.
The `type` key in the `definition` defines the Converter class which is being used.
@@ -365,7 +358,7 @@ class Converter(object, metaclass=ABCMeta):
filtered_children = FILTER_FUNCTIONS[rule](to_be_filtered)
- return filtered_children+unmatched_children
+ return filtered_children + unmatched_children
@abstractmethod
def typecheck(self, element: StructureElement):
@@ -388,14 +381,6 @@ class Converter(object, metaclass=ABCMeta):
class DirectoryConverter(Converter):
-
- def __init__(self, definition: dict, name: str,
- converter_registry: dict):
- """
- Initialize a new directory converter.
- """
- super().__init__(definition, name, converter_registry)
-
def create_children(self, generalStore: GeneralStore,
element: StructureElement):
if not isinstance(element, Directory):
@@ -415,6 +400,8 @@ class DirectoryConverter(Converter):
def typecheck(self, element: StructureElement):
return isinstance(element, Directory)
+ # TODO basically all converters implement such a match function. Shouldn't this be the one
+ # of the parent class and subclasses can overwrite if needed?
def match(self, element: StructureElement):
if not isinstance(element, Directory):
raise RuntimeError("Element must be a directory.")
@@ -465,16 +452,21 @@ class SimpleFileConverter(Converter):
return m.groupdict()
+class FileConverter(SimpleFileConverter):
+ def __init__(self, *args, **kwargs):
+ warnings.warn(DeprecationWarning(
+ "This class is depricated. Please use SimpleFileConverter."))
+ super().__init__(*args, **kwargs)
+
+
class MarkdownFileConverter(Converter):
- def __init__(self, definition: dict, name: str,
- converter_registry: dict):
- """
- Initialize a new directory converter.
- """
- super().__init__(definition, name, converter_registry)
+ """
+ reads the yaml header of markdown files (if a such a header exists).
+ """
def create_children(self, generalStore: GeneralStore,
element: StructureElement):
+ # TODO: isn't the type check sufficient?
if not isinstance(element, File):
raise RuntimeError("A markdown file is needed to create children.")
@@ -484,9 +476,9 @@ class MarkdownFileConverter(Converter):
for name, entry in header.items():
if type(entry) == list:
- children.append(DictListElement(name, entry))
+ children.append(ListElement(name, entry))
elif type(entry) == str:
- children.append(DictTextElement(name, entry))
+ children.append(TextElement(name, entry))
else:
raise RuntimeError(
"Header entry {} has incompatible type.".format(name))
@@ -496,6 +488,7 @@ class MarkdownFileConverter(Converter):
return isinstance(element, File)
def match(self, element: StructureElement):
+ # TODO: isn't the type check sufficient?
if not isinstance(element, File):
raise RuntimeError("Element must be a file.")
m = re.match(self.definition["match"], element.name)
@@ -510,7 +503,7 @@ class MarkdownFileConverter(Converter):
return m.groupdict()
-class DictConverter(Converter):
+class DictElementConverter(Converter):
# TODO use Dict as typecheck?
def create_children(self, generalStore: GeneralStore, element: StructureElement):
if not self.typecheck(element):
@@ -523,17 +516,17 @@ class DictConverter(Converter):
for name, value in data.items():
if type(value) == list:
- children.append(DictListElement(name, value))
+ children.append(ListElement(name, value))
elif type(value) == str:
- children.append(DictTextElement(name, value))
+ children.append(TextElement(name, value))
elif type(value) == dict:
- children.append(DictDictElement(name, value))
+ children.append(DictElement(name, value))
elif type(value) == int:
- children.append(DictIntegerElement(name, value))
+ children.append(IntegerElement(name, value))
elif type(value) == bool:
- children.append(DictBooleanElement(name, value))
+ children.append(BooleanElement(name, value))
elif type(value) == float:
- children.append(DictFloatElement(name, value))
+ children.append(FloatElement(name, value))
elif type(value) == type(None):
continue
else:
@@ -545,35 +538,32 @@ class DictConverter(Converter):
# TODO use Dict as typecheck?
def typecheck(self, element: StructureElement):
- return isinstance(element, Dict)
+ return isinstance(element, DictElement)
def match(self, element: StructureElement):
"""
Allways matches if the element has the right type.
"""
- if not isinstance(element, Dict):
+ if not isinstance(element, DictElement):
raise RuntimeError("Element must be a DictElement.")
- return {}
+ return match_name_and_value(self.definition, element.name, element.value)
-# TODO: difference to SimpleFileConverter? Do we need both?
-class FileConverter(Converter):
- def typecheck(self, element: StructureElement):
- return isinstance(element, File)
+class DictConverter(DictElementConverter):
+ def __init__(self, *args, **kwargs):
+ warnings.warn(DeprecationWarning(
+ "This class is depricated. Please use DictConverter."))
+ super().__init__(*args, **kwargs)
- def match(self, element: StructureElement):
- if not self.typecheck(element):
- raise RuntimeError("Element must be a file")
- m = re.match(self.definition["match"], element.name)
- if m is None:
- return None
- return m.groupdict()
- def create_children(self, generalStore: GeneralStore, element: StructureElement):
- return []
+class DictDictElementConverter(DictElementConverter):
+ def __init__(self, *args, **kwargs):
+ warnings.warn(DeprecationWarning(
+ "This class is depricated. Please use DictElementConverter."))
+ super().__init__(*args, **kwargs)
-class JSONFileConverter(DictConverter):
+class JSONFileConverter(DictElementConverter):
def typecheck(self, element: StructureElement):
return isinstance(element, File)
@@ -588,7 +578,7 @@ class JSONFileConverter(DictConverter):
def create_children(self, generalStore: GeneralStore, element: StructureElement):
if not self.typecheck(element):
raise RuntimeError("A JSON file is needed to create children")
- # TODO: either add explicit time check for File structure element here,
+ # TODO: either add explicit type check for File structure element here,
# or add a comment to suppress mypy type warning.
with open(element.path, 'r') as json_file:
json_data = json.load(json_file)
@@ -615,13 +605,75 @@ class JSONFileConverter(DictConverter):
return self._create_children_from_dict(json_data)
-class _AbstractDictElementConverter(Converter):
+def match_name_and_value(definition, name, value):
+ """
+ takes match definitions from the definition argument and applies regular expressiion to name
+ and possibly value
+
+ one of the keys 'match_name' and "match' needs to be available in definition
+ 'match_value' is optional
+
+ Returns None, if match_name or match lead to no match. Otherwise, returns a dictionary with the
+ matched groups, possibly including matches from using match_value
+ """
+ if "match_name" in definition:
+ if "match" in definition:
+ raise RuntimeError(f"Do not supply both, 'match_name' and 'match'.")
+
+ m1 = re.match(definition["match_name"], name)
+ if m1 is None:
+ return None
+ else:
+ m1 = m1.groupdict()
+ elif "match" in definition:
+ m1 = re.match(definition["match"], name)
+ if m1 is None:
+ return None
+ else:
+ m1 = m1.groupdict()
+ else:
+ m1 = {}
+
+ if "match_value" in definition:
+ m2 = re.match(definition["match_value"], str(value), re.DOTALL)
+ if m2 is None:
+ return None
+ else:
+ m2 = m2.groupdict()
+ else:
+ m2 = {}
+
+ values = dict()
+ values.update(m1)
+ values.update(m2)
+ return values
+
+
+class _AbstractScalarValueElementConverter(Converter):
+ """
+ A base class for all converters that have a scalar value that can be matched using a regular
+ expression.
+
+ values must have one of the following type: str, bool, int, float
+ """
+
+ default_matches = {
+ "accept_text": False,
+ "accept_bool": False,
+ "accept_int": False,
+ "accept_float": False,
+ }
def create_children(self, generalStore: GeneralStore, element: StructureElement):
return []
def typecheck(self, element: StructureElement):
- return True
+ """
+ returns whether the type of StructureElement is accepted by this converter instance.
+ """
+ allowed_matches = self._merge_match_definition_with_default(self.default_matches,
+ self.definition)
+ return self._typecheck(element, allowed_matches)
def match(self, element: StructureElement):
"""
@@ -635,42 +687,122 @@ class _AbstractDictElementConverter(Converter):
if not self.typecheck(element):
raise RuntimeError(
f"Element has an invalid type: {type(element)}.")
- m1 = re.match(self.definition["match_name"], element.name)
- if m1 is None:
- return None
- m2 = re.match(self.definition["match_value"], str(element.value), re.DOTALL)
- if m2 is None:
- return None
- values = dict()
- values.update(m1.groupdict())
- values.update(m2.groupdict())
- return values
+ return match_name_and_value(self.definition, element.name, element.value)
+ def _typecheck(self, element: StructureElement, allowed_matches: dict):
+ """
+ returns whether the type of StructureElement is accepted.
-class DictBooleanElementConverter(_AbstractDictElementConverter):
- def typecheck(self, element: StructureElement):
- return isinstance(element, DictBooleanElement)
+ Parameters:
+ element: StructureElement, the element that is checked
+ allowed_matches: Dict, a dictionary that defines what types are allowed. It must have the
+ keys 'accept_text', 'accept_bool', 'accept_int', and 'accept_float'.
+ returns: whether or not the converter allows the type of element
+ """
+ if (bool(allowed_matches["accept_text"]) and isinstance(element, TextElement)):
+ return True
+ elif (bool(allowed_matches["accept_bool"]) and isinstance(element, BooleanElement)):
+ return True
+ elif (bool(allowed_matches["accept_int"]) and isinstance(element, IntegerElement)):
+ return True
+ elif (bool(allowed_matches["accept_float"]) and isinstance(element, FloatElement)):
+ return True
+ else:
+ return False
-class DictFloatElementConverter(_AbstractDictElementConverter):
- def typecheck(self, element: StructureElement):
- return isinstance(element, DictFloatElement)
+ def _merge_match_definition_with_default(self, default: dict, definition: dict):
+ """
+ returns a dict with the same keys as default dict but with updated values from definition
+ where it has the same keys
+ """
+ result = {}
+ for key in default:
+ if key in definition:
+ result[key] = definition[key]
+ else:
+ result[key] = default[key]
+ return result
-class DictTextElementConverter(_AbstractDictElementConverter):
- def typecheck(self, element: StructureElement):
- return isinstance(element, DictTextElement)
+class BooleanElementConverter(_AbstractScalarValueElementConverter):
+ default_matches = {
+ "accept_text": False,
+ "accept_bool": True,
+ "accept_int": True,
+ "accept_float": False,
+ }
+
+
+class DictBooleanElementConverter(BooleanElementConverter):
+ def __init__(self, *args, **kwargs):
+ warnings.warn(DeprecationWarning(
+ "This class is depricated. Please use BooleanElementConverter."))
+ super().__init__(*args, **kwargs)
-class DictIntegerElementConverter(_AbstractDictElementConverter):
- def typecheck(self, element: StructureElement):
- return isinstance(element, DictIntegerElement)
+class FloatElementConverter(_AbstractScalarValueElementConverter):
+ default_matches = {
+ "accept_text": False,
+ "accept_bool": False,
+ "accept_int": True,
+ "accept_float": True,
+ }
-class DictListElementConverter(Converter):
+
+class DictFloatElementConverter(FloatElementConverter):
+ def __init__(self, *args, **kwargs):
+ warnings.warn(DeprecationWarning(
+ "This class is depricated. Please use FloatElementConverter."))
+ super().__init__(*args, **kwargs)
+
+
+class TextElementConverter(_AbstractScalarValueElementConverter):
+ default_matches = {
+ "accept_text": True,
+ "accept_bool": True,
+ "accept_int": True,
+ "accept_float": True,
+ }
+
+ def __init__(self, definition, *args, **kwargs):
+ if "match" in definition:
+ raise ValueError("""
+The 'match' key will in future be used to match a potential name of a TextElement. Please use
+the 'match_value' key to match the value of the TextElement and 'match_name' for matching the name.
+""")
+
+ super().__init__(definition, *args, **kwargs)
+
+
+class DictTextElementConverter(TextElementConverter):
+ def __init__(self, *args, **kwargs):
+ warnings.warn(DeprecationWarning(
+ "This class is depricated. Please use TextElementConverter."))
+ super().__init__(*args, **kwargs)
+
+
+class IntegerElementConverter(_AbstractScalarValueElementConverter):
+ default_matches = {
+ "accept_text": False,
+ "accept_bool": False,
+ "accept_int": True,
+ "accept_float": False,
+ }
+
+
+class DictIntegerElementConverter(IntegerElementConverter):
+ def __init__(self, *args, **kwargs):
+ warnings.warn(DeprecationWarning(
+ "This class is depricated. Please use IntegerElementConverter."))
+ super().__init__(*args, **kwargs)
+
+
+class ListElementConverter(Converter):
def create_children(self, generalStore: GeneralStore,
element: StructureElement):
- if not isinstance(element, DictListElement):
+ if not isinstance(element, ListElement):
raise RuntimeError(
"This converter can only process DictListElements.")
children = []
@@ -679,64 +811,34 @@ class DictListElementConverter(Converter):
if isinstance(list_element, str):
children.append(TextElement(str(index), list_element))
elif isinstance(list_element, dict):
- children.append(Dict(str(index), list_element))
+ children.append(DictElement(str(index), list_element))
+ elif isinstance(list_element, StructureElement):
+ children.append(list_element)
else:
raise NotImplementedError(
f"Unkown type {type(list_element)} in list element {list_element}.")
return children
def typecheck(self, element: StructureElement):
- return isinstance(element, DictListElement)
+ return isinstance(element, ListElement)
def match(self, element: StructureElement):
- if not isinstance(element, DictListElement):
- raise RuntimeError("Element must be a DictListElement.")
+ if not isinstance(element, ListElement):
+ raise RuntimeError("Element must be a ListElement.")
m = re.match(self.definition["match_name"], element.name)
if m is None:
return None
if "match" in self.definition:
raise NotImplementedError(
- "Match is not implemented for DictListElement.")
+ "Match is not implemented for ListElement.")
return m.groupdict()
-class DictDictElementConverter(DictConverter):
- def create_children(self, generalStore: GeneralStore, element: StructureElement):
- if not self.typecheck(element):
- raise RuntimeError("A dict is needed to create children")
-
- return self._create_children_from_dict(element.value)
-
- def typecheck(self, element: StructureElement):
- return isinstance(element, DictDictElement)
-
- def match(self, element: StructureElement):
- if not self.typecheck(element):
- raise RuntimeError("Element must be a DictDictElement.")
- m = re.match(self.definition["match_name"], element.name)
- if m is None:
- return None
- if "match" in self.definition:
- raise NotImplementedError(
- "Match is not implemented for DictDictElement.")
- return m.groupdict()
-
-
-class TextElementConverter(Converter):
- def create_children(self, generalStore: GeneralStore,
- element: StructureElement):
- return []
-
- def typecheck(self, element: StructureElement):
- return isinstance(element, TextElement)
-
- def match(self, element: StructureElement):
- if not isinstance(element, TextElement):
- raise RuntimeError("Element must be a TextElement.")
- m = re.match(self.definition["match"], element.value)
- if m is None:
- return None
- return m.groupdict()
+class DictListElementConverter(ListElementConverter):
+ def __init__(self, *args, **kwargs):
+ warnings.warn(DeprecationWarning(
+ "This class is depricated. Please use ListElementConverter."))
+ super().__init__(*args, **kwargs)
class TableConverter(Converter):
@@ -744,10 +846,10 @@ class TableConverter(Converter):
This converter reads tables in different formats line by line and
allows matching the corresponding rows.
- The subtree generated by the table converter consists of DictDictElements, each being
+ The subtree generated by the table converter consists of DictElements, each being
a row. The corresponding header elements will become the dictionary keys.
- The rows can be matched using a DictDictElementConverter.
+ The rows can be matched using a DictElementConverter.
"""
@abstractmethod
def get_options(self):
@@ -763,7 +865,8 @@ class TableConverter(Converter):
if opt_name in self.definition:
el = self.definition[opt_name]
# The option can often either be a single value or a list of values.
- # In the latter case each element of the list will be converted to the defined type.
+ # In the latter case each element of the list will be converted to the defined
+ # type.
if isinstance(el, list):
option_dict[opt_name] = [
opt_conversion(el_el) for el_el in el]
@@ -807,7 +910,7 @@ class XLSXTableConverter(TableConverter):
child_elements = list()
for index, row in table.iterrows():
child_elements.append(
- DictDictElement(str(index), row.to_dict()))
+ DictElement(str(index), row.to_dict()))
return child_elements
@@ -835,5 +938,5 @@ class CSVTableConverter(TableConverter):
child_elements = list()
for index, row in table.iterrows():
child_elements.append(
- DictDictElement(str(index), row.to_dict()))
+ DictElement(str(index), row.to_dict()))
return child_elements
diff --git a/src/caoscrawler/crawl.py b/src/caoscrawler/crawl.py
index 0aecb58dfc2088cacdfc685dcd37c7736d40d7e7..be6e00cebce35e091bf8741e93da9cdb0a14c55b 100644
--- a/src/caoscrawler/crawl.py
+++ b/src/caoscrawler/crawl.py
@@ -28,6 +28,7 @@ Crawl a file structure using a yaml cfood definition and synchronize
the acuired data with CaosDB.
"""
+from __future__ import annotations
import importlib
from caosadvancedtools.cache import UpdateCache, Cache
import uuid
@@ -41,6 +42,7 @@ import argparse
from argparse import RawTextHelpFormatter
import caosdb as db
from caosadvancedtools.crawler import Crawler as OldCrawler
+import warnings
from caosdb.common.datatype import is_reference
from .stores import GeneralStore, RecordStore
from .identified_cache import IdentifiedCache
@@ -50,7 +52,7 @@ from .identifiable_adapters import (IdentifiableAdapter,
LocalStorageIdentifiableAdapter,
CaosDBIdentifiableAdapter)
from collections import defaultdict
-from typing import Any, Dict, List, Optional, Type, Union
+from typing import Any, Optional, Type, Union
from caosdb.apiutils import compare_entities, merge_entities
from copy import deepcopy
from jsonschema import validate
@@ -168,7 +170,7 @@ class Crawler(object):
generalStore: Optional[GeneralStore] = None,
debug: bool = False,
identifiableAdapter: IdentifiableAdapter = None,
- securityMode: int = SecurityMode.UPDATE
+ securityMode: SecurityMode = SecurityMode.UPDATE
):
"""
Create a new crawler and initialize an empty RecordStore and GeneralStore.
@@ -209,14 +211,14 @@ class Crawler(object):
if identifiableAdapter is None:
self.identifiableAdapter = LocalStorageIdentifiableAdapter()
# If a directory is crawled this may hold the path to that directory
- self.crawled_directory = None
+ self.crawled_directory: Optional[str] = None
self.debug = debug
if self.debug:
# order in the tuple:
# 0: generalStore
# 1: recordStore
- self.debug_tree: Dict[str, tuple] = dict()
- self.debug_metadata: Dict[str, dict] = dict()
+ self.debug_tree: dict[str, tuple] = dict()
+ self.debug_metadata: dict[str, dict] = dict()
self.debug_metadata["copied"] = dict()
self.debug_metadata["provenance"] = defaultdict(lambda: dict())
self.debug_metadata["usage"] = defaultdict(lambda: set())
@@ -236,7 +238,7 @@ class Crawler(object):
return self._resolve_validator_paths(crawler_definition, crawler_definition_path)
- def _load_definition_from_yaml_dict(self, crawler_definitions: List[Dict]):
+ def _load_definition_from_yaml_dict(self, crawler_definitions: list[dict]):
"""Load crawler definitions from a list of (yaml) dicts `crawler_definitions` which
contains either one or two documents.
@@ -258,7 +260,7 @@ class Crawler(object):
# tested in the next lines of code:
# Load the cfood schema:
- with open(files('caoscrawler').joinpath('cfood-schema.yml'), "r") as f:
+ with open(str(files('caoscrawler').joinpath('cfood-schema.yml')), "r") as f:
schema = yaml.safe_load(f)
# Add custom converters to converter enum in schema:
@@ -315,7 +317,7 @@ class Crawler(object):
"""
# Defaults for the converter registry:
- converter_registry: Dict[str, Dict[str, str]] = {
+ converter_registry: dict[str, dict[str, str]] = {
"Directory": {
"converter": "DirectoryConverter",
"package": "caoscrawler.converters"},
@@ -326,7 +328,7 @@ class Crawler(object):
"converter": "MarkdownFileConverter",
"package": "caoscrawler.converters"},
"File": {
- "converter": "FileConverter",
+ "converter": "SimpleFileConverter",
"package": "caoscrawler.converters"},
"JSONFile": {
"converter": "JSONFileConverter",
@@ -337,35 +339,56 @@ class Crawler(object):
"XLSXTableConverter": {
"converter": "XLSXTableConverter",
"package": "caoscrawler.converters"},
- "Dict": {
- "converter": "DictConverter",
- "package": "caoscrawler.converters"},
"DictBooleanElement": {
- "converter": "DictBooleanElementConverter",
+ "converter": "BooleanElementConverter",
+ "package": "caoscrawler.converters"},
+ "BooleanElement": {
+ "converter": "BooleanElementConverter",
"package": "caoscrawler.converters"},
"DictFloatElement": {
- "converter": "DictFloatElementConverter",
+ "converter": "FloatElementConverter",
+ "package": "caoscrawler.converters"},
+ "FloatElement": {
+ "converter": "FloatElementConverter",
"package": "caoscrawler.converters"},
"DictTextElement": {
- "converter": "DictTextElementConverter",
+ "converter": "TextElementConverter",
+ "package": "caoscrawler.converters"},
+ "TextElement": {
+ "converter": "TextElementConverter",
"package": "caoscrawler.converters"},
"DictIntegerElement": {
- "converter": "DictIntegerElementConverter",
+ "converter": "IntegerElementConverter",
+ "package": "caoscrawler.converters"},
+ "IntegerElement": {
+ "converter": "IntegerElementConverter",
"package": "caoscrawler.converters"},
"DictListElement": {
- "converter": "DictListElementConverter",
+ "converter": "ListElementConverter",
+ "package": "caoscrawler.converters"},
+ "ListElement": {
+ "converter": "ListElementConverter",
"package": "caoscrawler.converters"},
"DictDictElement": {
- "converter": "DictDictElementConverter",
+ "converter": "DictElementConverter",
+ "package": "caoscrawler.converters"},
+ "DictElement": {
+ "converter": "DictElementConverter",
+ "package": "caoscrawler.converters"},
+ "Dict": {
+ "converter": "DictElementConverter",
"package": "caoscrawler.converters"},
- "TextElement": {
- "converter": "TextElementConverter",
- "package": "caoscrawler.converters"}
}
# More converters from definition file:
if "Converters" in definition:
for key, entry in definition["Converters"].items():
+ if key in ["Dict", "DictTextElement", "DictIntegerElement", "DictBooleanElement",
+ "DictDictElement", "DictListElement", "DictFloatElement"]:
+ warnings.warn(DeprecationWarning(f"{key} is deprecated. Please use the new"
+ " variant; without 'Dict' prefix or "
+ "'DictElement' in case of 'Dict'"))
+
converter_registry[key] = {
"converter": entry["converter"],
"package": entry["package"]
@@ -430,7 +453,7 @@ class Crawler(object):
return converters
- def start_crawling(self, items: Union[List[StructureElement], StructureElement],
+ def start_crawling(self, items: Union[list[StructureElement], StructureElement],
crawler_definition: dict,
converter_registry: dict):
"""
@@ -462,8 +485,9 @@ class Crawler(object):
self.run_id = uuid.uuid1()
local_converters = Crawler.initialize_converters(
crawler_definition, converter_registry)
+
# This recursive crawling procedure generates the update list:
- self.crawled_data: List[db.Record] = []
+ self.crawled_data: list[db.Record] = []
self._crawl(items, local_converters, self.generalStore,
self.recordStore, [], [])
@@ -501,7 +525,7 @@ class Crawler(object):
return False
@staticmethod
- def create_flat_list(ent_list: List[db.Entity], flat: List[db.Entity]):
+ def create_flat_list(ent_list: list[db.Entity], flat: list[db.Entity]):
"""
Recursively adds all properties contained in entities from ent_list to
the output list flat. Each element will only be added once to the list.
@@ -688,11 +712,11 @@ class Crawler(object):
if p.value is old:
p.value = new
- def split_into_inserts_and_updates(self, ent_list: List[db.Entity]):
+ def split_into_inserts_and_updates(self, ent_list: list[db.Entity]):
if self.identifiableAdapter is None:
raise RuntimeError("Should not happen.")
- to_be_inserted: List[db.Entity] = []
- to_be_updated: List[db.Entity] = []
+ to_be_inserted: list[db.Entity] = []
+ to_be_updated: list[db.Entity] = []
flat = list(ent_list)
# assure all entities are direct members TODO Can this be removed at some point?Check only?
Crawler.create_flat_list(ent_list, flat)
@@ -726,7 +750,7 @@ class Crawler(object):
else:
raise re
Crawler.bend_references_to_new_object(
- old=record, new=newrecord, entities=flat+to_be_updated+to_be_inserted)
+ old=record, new=newrecord, entities=flat + to_be_updated + to_be_inserted)
del flat[i]
resolved_references = True
@@ -787,8 +811,8 @@ class Crawler(object):
@staticmethod
def _merge_properties_from_remote(
- crawled_data: List[db.Record],
- identified_records: List[db.Record]
+ crawled_data: list[db.Record],
+ identified_records: list[db.Record]
):
"""Merge entity representation that was created by crawling the data with remotely found
identified records s.th. new properties and property values are updated correctly but
@@ -829,8 +853,8 @@ class Crawler(object):
@staticmethod
def remove_unnecessary_updates(
- crawled_data: List[db.Record],
- identified_records: List[db.Record]
+ crawled_data: list[db.Record],
+ identified_records: list[db.Record]
):
"""Compare the Records to be updated with their remote
correspondant. Only update if there are actual differences.
@@ -902,7 +926,7 @@ class Crawler(object):
return db.Entity(id=id).retrieve()
@staticmethod
- def execute_inserts_in_list(to_be_inserted, securityMode, run_id: int = None,
+ def execute_inserts_in_list(to_be_inserted, securityMode, run_id: uuid.UUID = None,
unique_names=True):
for record in to_be_inserted:
for prop in record.properties:
@@ -930,7 +954,7 @@ class Crawler(object):
_resolve_datatype(prop, entity)
@staticmethod
- def execute_updates_in_list(to_be_updated, securityMode, run_id: int = None,
+ def execute_updates_in_list(to_be_updated, securityMode, run_id: uuid.UUID = None,
unique_names=True):
Crawler.set_ids_and_datatype_of_parents_and_properties(to_be_updated)
logger.debug("UPDATE")
@@ -942,7 +966,7 @@ class Crawler(object):
update_cache = UpdateCache()
update_cache.insert(to_be_updated, run_id)
- def _synchronize(self, crawled_data: List[db.Record], commit_changes: bool = True,
+ def _synchronize(self, crawled_data: list[db.Record], commit_changes: bool = True,
unique_names=True):
"""
This function applies several stages:
@@ -1027,7 +1051,7 @@ ____________________\n""".format(i + 1, len(pending_changes)) + str(el[3]))
@staticmethod
def debug_build_usage_tree(converter: Converter):
- res: Dict[str, Dict[str, Any]] = {
+ res: dict[str, dict[str, Any]] = {
converter.name: {
"usage": ", ".join(converter.metadata["usage"]),
"subtree": {}
@@ -1044,7 +1068,7 @@ ____________________\n""".format(i + 1, len(pending_changes)) + str(el[3]))
return res
def save_debug_data(self, filename: str):
- paths: Dict[str, Union[dict, list]] = dict()
+ paths: dict[str, Union[dict, list]] = dict()
def flatten_debug_info(key):
mod_info = self.debug_metadata[key]
@@ -1069,11 +1093,11 @@ ____________________\n""".format(i + 1, len(pending_changes)) + str(el[3]))
with open(filename, "w") as f:
f.write(yaml.dump(paths, sort_keys=False))
- def _crawl(self, items: List[StructureElement],
- local_converters: List[Converter],
+ def _crawl(self, items: list[StructureElement],
+ local_converters: list[Converter],
generalStore: GeneralStore,
recordStore: RecordStore,
- structure_elements_path: List[str], converters_path: List[str]):
+ structure_elements_path: list[str], converters_path: list[str]):
"""
Crawl a list of StructureElements and apply any matching converters.
@@ -1161,7 +1185,7 @@ def crawler_main(crawled_directory_path: str,
provenance_file: str = None,
dry_run: bool = False,
prefix: str = "",
- securityMode: int = SecurityMode.UPDATE,
+ securityMode: SecurityMode = SecurityMode.UPDATE,
unique_names=True,
):
"""
@@ -1263,6 +1287,9 @@ def parse_args():
parser.add_argument("crawled_directory_path",
help="The subtree of files below the given path will "
"be considered. Use '/' for everything.")
+ parser.add_argument("-c", "--add-cwd-to-path", action="store_true",
+ help="If given, the current working directory(cwd) is added to the Python "
+ "path.")
parser.add_argument("-s", "--security-mode", choices=["retrieve", "insert", "update"],
default="retrieve",
help="Determines whether entities may only be read from the server, or "
@@ -1296,6 +1323,8 @@ def main():
else:
logger.setLevel(logging.INFO)
+ if args.add_cwd_to_path:
+ sys.path.append(os.path.abspath("."))
sys.exit(crawler_main(
crawled_directory_path=args.crawled_directory_path,
cfood_file_name=args.cfood_file_name,
diff --git a/src/caoscrawler/identifiable_adapters.py b/src/caoscrawler/identifiable_adapters.py
index 73ce38fb593f321f9f80cc6c06034c7df0f14c76..1c6da34759a76c7a2272ff115239af9f989a2c24 100644
--- a/src/caoscrawler/identifiable_adapters.py
+++ b/src/caoscrawler/identifiable_adapters.py
@@ -463,7 +463,9 @@ class CaosDBIdentifiableAdapter(IdentifiableAdapter):
candidates = db.execute_query(query_string)
if len(candidates) > 1:
raise RuntimeError(
- f"Identifiable was not defined unambigiously.\n{query_string}\nReturned the following {candidates}.")
+ f"Identifiable was not defined unambigiously.\n{query_string}\nReturned the "
+ f"following {candidates}."
+ f"Identifiable:\n{identifiable.record_type}{identifiable.properties}")
if len(candidates) == 0:
return None
return candidates[0]
diff --git a/src/caoscrawler/structure_elements.py b/src/caoscrawler/structure_elements.py
index 01996b4ff3e14a9739857e6e03ceca161300b37e..cb5fad211b5e3b1b766ee95fd6f0a31c965d032b 100644
--- a/src/caoscrawler/structure_elements.py
+++ b/src/caoscrawler/structure_elements.py
@@ -23,7 +23,8 @@
# ** end header
#
-from typing import Dict
+from typing import Dict as tDict
+import warnings
class StructureElement(object):
@@ -31,7 +32,7 @@ class StructureElement(object):
def __init__(self, name):
# Used to store usage information for debugging:
- self.metadata: Dict[str, set[str]] = {
+ self.metadata: tDict[str, set[str]] = {
"usage": set()
}
@@ -68,48 +69,78 @@ class JSONFile(File):
class DictElement(StructureElement):
- def __init__(self, name: str, value):
+ def __init__(self, name: str, value: dict):
super().__init__(name)
self.value = value
-class Dict(StructureElement):
- def __init__(self, name: str, value: dict):
+class TextElement(StructureElement):
+ def __init__(self, name: str, value: str):
super().__init__(name)
self.value = value
-class DictTextElement(DictElement):
- def __init__(self, name: str, value: str):
- super().__init__(name, value)
+class DictTextElement(TextElement):
+ def __init__(self, *args, **kwargs):
+ warnings.warn(DeprecationWarning("This class is depricated. Please use TextElement."))
+ super().__init__(*args, **kwargs)
-class DictIntegerElement(DictElement):
+class IntegerElement(StructureElement):
def __init__(self, name: str, value: int):
- super().__init__(name, value)
+ super().__init__(name)
+ self.value = value
-class DictBooleanElement(DictElement):
+class DictIntegerElement(IntegerElement):
+ def __init__(self, *args, **kwargs):
+ warnings.warn(DeprecationWarning("This class is depricated. Please use IntegerElement."))
+ super().__init__(*args, **kwargs)
+
+
+class BooleanElement(StructureElement):
def __init__(self, name: str, value: bool):
- super().__init__(name, value)
+ super().__init__(name)
+ self.value = value
-class DictDictElement(Dict, DictElement):
- def __init__(self, name: str, value: dict):
- DictElement.__init__(self, name, value)
+class DictBooleanElement(BooleanElement):
+ def __init__(self, *args, **kwargs):
+ warnings.warn(DeprecationWarning("This class is depricated. Please use BooleanElement."))
+ super().__init__(*args, **kwargs)
-class DictListElement(DictElement):
- def __init__(self, name: str, value: dict):
- super().__init__(name, value)
+class ListElement(StructureElement):
+ def __init__(self, name: str, value: list):
+ super().__init__(name)
+ self.value = value
-class DictFloatElement(DictElement):
- def __init__(self, name: str, value: float):
- super().__init__(name, value)
+class DictListElement(ListElement):
+ def __init__(self, *args, **kwargs):
+ warnings.warn(DeprecationWarning("This class is depricated. Please use ListElement."))
+ super().__init__(*args, **kwargs)
-class TextElement(StructureElement):
- def __init__(self, name: str, value: str):
+class FloatElement(StructureElement):
+ def __init__(self, name: str, value: float):
super().__init__(name)
self.value = value
+
+
+class DictFloatElement(FloatElement):
+ def __init__(self, *args, **kwargs):
+ warnings.warn(DeprecationWarning("This class is depricated. Please use FloatElement."))
+ super().__init__(*args, **kwargs)
+
+
+class Dict(DictElement):
+ def __init__(self, *args, **kwargs):
+ warnings.warn(DeprecationWarning("This class is depricated. Please use DictElement."))
+ super().__init__(*args, **kwargs)
+
+
+class DictDictElement(DictElement):
+ def __init__(self, *args, **kwargs):
+ warnings.warn(DeprecationWarning("This class is depricated. Please use DictElement."))
+ super().__init__(*args, **kwargs)
diff --git a/src/doc/conf.py b/src/doc/conf.py
index 30ce670eb8685e9701eeeb59bf22451a21fb16b9..b2873c846e7275b2a5bfbc8bc5cd18dabaa843ef 100644
--- a/src/doc/conf.py
+++ b/src/doc/conf.py
@@ -33,10 +33,10 @@ copyright = '2021, MPIDS'
author = 'Alexander Schlemmer'
# The short X.Y version
-version = '0.1'
+version = '0.2.1'
# The full version, including alpha/beta/rc tags
# release = '0.5.2-rc2'
-release = '0.1'
+release = '0.2.1-dev'
# -- General configuration ---------------------------------------------------
diff --git a/src/doc/converters.rst b/src/doc/converters.rst
index 640a1ddec04986960bcf41110c593bb73431ed75..ae84644072ebbd53f1325d1f9d1d0ef8e5dc6de6 100644
--- a/src/doc/converters.rst
+++ b/src/doc/converters.rst
@@ -15,8 +15,6 @@ Converters may define additional functions that create further values. For
example, a regular expresion could be used to get a date from a file name.
-
-
A converter is defined via a yml file or part of it. The definition states
what kind of StructureElement it treats (typically one).
Also, it defines how children of the current StructureElement are
@@ -64,25 +62,57 @@ Standard Converters
Directory Converter
===================
+The Directory Converter creates StructureElements for each File and Directory
+inside the current Directory. You can match a regular expression against the
+directory name using the 'match' key.
Simple File Converter
=====================
+The Simple File Converter does not create any children and is usually used if
+a file shall be used as it is and be inserted and referenced by other entities.
Markdown File Converter
=======================
+Reads a YAML header from Markdown files (if such a header exists) and creates
+children elements according to the structure of the header.
-Dict Converter
+DictElement Converter
==============
+Creates a child StructureElement for each key in the dictionary.
Typical Subtree converters
--------------------------
+The following StructureElement are typically created:
+
+- BooleanElement
+- FloatElement
+- TextElement
+- IntegerElement
+- ListElement
+- DictElement
+
+Scalar Value Converters
+=======================
+`BooleanElementConverter`, `FloatElementConverter`, `TextElementConverter`, and
+`IntegerElementConverter` behave very similarly.
-DictBooleanElementConverter
-DictFloatElementConverter
-DictTextElementConverter
-DictIntegerElementConverter
-DictListElementConverter
-DictDictElementConverter
+These converters expect `match_name` and `match_value` in their definition
+which allow to match the key and the value, respectively.
+
+Note that there are defaults for accepting other types. For example,
+FloatElementConverter also accepts IntegerElements. The default
+behavior can be adjusted with the fields `accept_text`, `accept_int`,
+`accept_float`, and `accept_bool`.
+
+The following denotes what kind of StructureElements are accepted by default
+(they are defined in `src/caoscrawler/converters.py`):
+
+- DictBooleanElementConverter: bool, int
+- DictFloatElementConverter: int, float
+- DictTextElementConverter: text, bool, int, float
+- DictIntegerElementConverter: int
+- DictListElementConverter: list
+- DictDictElementConverter: dict
YAMLFileConverter
=================
@@ -98,8 +128,6 @@ JSONFileConverter
-TextElementConverter
-====================
TableConverter
==============
diff --git a/unittests/broken_cfoods/broken1.yml b/unittests/broken_cfoods/broken1.yml
index 9fd4c52934c56512ada8ea564ccd540e07e25661..86202acd7a3be90b6a8b8e85aee5109d79799239 100644
--- a/unittests/broken_cfoods/broken1.yml
+++ b/unittests/broken_cfoods/broken1.yml
@@ -39,14 +39,14 @@ DataAnalysis: # name of the converter
# how to make match case insensitive?
subtree:
description:
- type: DictTextElement
+ type: TextElement
match_value: (?P<description>.*)
match_name: description
records:
Measurement:
description: $description
responsible_single:
- type: DictTextElement
+ type: TextElement
match_name: responsible
match_value: &person_regexp ((?P<first_name>.+) )?(?P<last_name>.+)
records: &responsible_records
@@ -65,7 +65,7 @@ DataAnalysis: # name of the converter
subtree:
Person:
type: TextElement
- match: *person_regexp
+ match_name: *person_regexp
records: *responsible_records
ExperimentalData: # name of the converter
diff --git a/unittests/scifolder_cfood.yml b/unittests/scifolder_cfood.yml
index 90f193444bfda7296c46260236274da2378635cc..74fd027563907c5ae416ca389faba0ecd64d5848 100644
--- a/unittests/scifolder_cfood.yml
+++ b/unittests/scifolder_cfood.yml
@@ -42,14 +42,14 @@ Data: # name of the converter
# how to make match case insensitive?
subtree:
description:
- type: DictTextElement
+ type: TextElement
match_value: (?P<description>.*)
match_name: description
records:
Measurement:
description: $description
responsible_single:
- type: DictTextElement
+ type: TextElement
match_name: responsible
match_value: &person_regexp ((?P<first_name>.+) )?(?P<last_name>.+)
records: &responsible_records
@@ -68,7 +68,7 @@ Data: # name of the converter
subtree:
Person:
type: TextElement
- match: *person_regexp
+ match_value: *person_regexp
records: *responsible_records
ExperimentalData: # name of the converter
diff --git a/unittests/scifolder_extended.yml b/unittests/scifolder_extended.yml
index 9bab612b9b37e8e295ee8fd02575de506a98d8fc..26f510679ff723ce5d9c0e705609e39bce60cbde 100644
--- a/unittests/scifolder_extended.yml
+++ b/unittests/scifolder_extended.yml
@@ -55,14 +55,14 @@ Data: # name of the converter
subtree:
description:
- type: DictTextElement
+ type: TextElement
match_value: (?P<description>.*)
match_name: description
records:
Measurement:
description: $description
responsible_single:
- type: DictTextElement
+ type: TextElement
match_name: responsible
match_value: &person_regexp ((?P<first_name>.+) )?(?P<last_name>.+)
records: &responsible_records
@@ -76,12 +76,12 @@ Data: # name of the converter
# "responsible" belonging to Measurement.
responsible_list:
- type: DictListElement
+ type: ListElement
match_name: responsible
subtree:
Person:
type: TextElement
- match: *person_regexp
+ match_value: *person_regexp
records: *responsible_records
# sources_list:
diff --git a/unittests/scifolder_extended2.yml b/unittests/scifolder_extended2.yml
index 969325e91da488011819c338708a33dcfc32c93e..a189e79c12c2e1393188c8b9f532162518244508 100644
--- a/unittests/scifolder_extended2.yml
+++ b/unittests/scifolder_extended2.yml
@@ -56,14 +56,14 @@ Data: # name of the converter
subtree:
description:
- type: DictTextElement
+ type: TextElement
match_value: (?P<description>.*)
match_name: description
records:
Measurement:
description: $description
responsible_single:
- type: DictTextElement
+ type: TextElement
match_name: responsible
match_value: &person_regexp ((?P<first_name>.+) )?(?P<last_name>.+)
records: &responsible_records
@@ -77,12 +77,12 @@ Data: # name of the converter
# "responsible" belonging to Measurement.
responsible_list:
- type: DictListElement
+ type: ListElement
match_name: responsible
subtree:
Person:
type: TextElement
- match: *person_regexp
+ match_value: *person_regexp
records: *responsible_records
# sources_list:
diff --git a/unittests/test_converters.py b/unittests/test_converters.py
index 802483c1d1eaf7f63096591ac7df7362f25f599a..7ddf0c9e07049f5f12cafeae4f3ef25ddab28c56 100644
--- a/unittests/test_converters.py
+++ b/unittests/test_converters.py
@@ -28,18 +28,17 @@ import os
import pytest
import yaml
-from caoscrawler.converters import (Converter, ConverterValidationError,
- DictConverter, DirectoryConverter,
+from caoscrawler.converters import (Converter, ConverterValidationError, DictElementConverter,
+ DirectoryConverter, DictIntegerElementConverter,
handle_value, MarkdownFileConverter,
+ FloatElementConverter, IntegerElementConverter,
JSONFileConverter)
-from caoscrawler.converters import _AbstractDictElementConverter
+from caoscrawler.converters import _AbstractScalarValueElementConverter
from caoscrawler.crawl import Crawler
from caoscrawler.stores import GeneralStore
-from caoscrawler.structure_elements import (File, DictTextElement,
- DictListElement, DictElement,
- DictBooleanElement, DictDictElement,
- DictIntegerElement,
- DictFloatElement, Directory)
+from caoscrawler.structure_elements import (File, TextElement, ListElement, DictElement,
+ BooleanElement, IntegerElement,
+ FloatElement, Directory)
from test_tool import rfp
@@ -53,14 +52,14 @@ def converter_registry():
"MarkdownFile": {
"converter": "MarkdownFileConverter",
"package": "caoscrawler.converters"},
- "Dict": {
- "converter": "DictConverter",
+ "DictElement": {
+ "converter": "DictElementConverter",
"package": "caoscrawler.converters"},
- "DictTextElement": {
- "converter": "DictTextElementConverter",
+ "TextElement": {
+ "converter": "TextElementConverter",
"package": "caoscrawler.converters"},
- "DictListElement": {
- "converter": "DictListElementConverter",
+ "ListElement": {
+ "converter": "ListElementConverter",
"package": "caoscrawler.converters"},
"TextElement": {
"converter": "TextElementConverter",
@@ -81,8 +80,8 @@ def testConverterTrivial(converter_registry):
types = [
"Directory",
"MarkdownFile",
- "DictTextElement",
- "DictListElement",
+ "TextElement",
+ "ListElement",
"TextElement"
]
@@ -150,11 +149,11 @@ def test_markdown_converter(converter_registry):
children = converter.create_children(None, test_readme)
assert len(children) == 5
- assert children[1].__class__ == DictTextElement
+ assert children[1].__class__ == TextElement
assert children[1].name == "description"
assert children[1].value.__class__ == str
- assert children[0].__class__ == DictTextElement
+ assert children[0].__class__ == TextElement
assert children[0].name == "responsible"
assert children[0].value.__class__ == str
@@ -170,11 +169,11 @@ def test_markdown_converter(converter_registry):
children = converter.create_children(None, test_readme2)
assert len(children) == 2
- assert children[1].__class__ == DictTextElement
+ assert children[1].__class__ == TextElement
assert children[1].name == "description"
assert children[1].value.__class__ == str
- assert children[0].__class__ == DictListElement
+ assert children[0].__class__ == ListElement
assert children[0].name == "responsible"
assert children[0].value.__class__ == list
@@ -196,39 +195,39 @@ def test_json_converter(converter_registry):
children = jsonconverter.create_children(None, test_json)
assert len(children) == 8
- assert children[0].__class__ == DictTextElement
+ assert children[0].__class__ == TextElement
assert children[0].name == "name"
assert children[0].value.__class__ == str
assert children[0].value == "DEMO"
- assert children[1].__class__ == DictIntegerElement
+ assert children[1].__class__ == IntegerElement
assert children[1].name == "projectId"
assert children[1].value.__class__ == int
assert children[1].value == 10002
- assert children[2].__class__ == DictBooleanElement
+ assert children[2].__class__ == BooleanElement
assert children[2].name == "archived"
assert children[2].value.__class__ == bool
- assert children[3].__class__ == DictListElement
+ assert children[3].__class__ == ListElement
assert children[3].name == "Person"
assert children[3].value.__class__ == list
assert len(children[3].value) == 2
- assert children[4].__class__ == DictTextElement
+ assert children[4].__class__ == TextElement
assert children[4].name == "start_date"
assert children[4].value.__class__ == str
- assert children[5].__class__ == DictListElement
+ assert children[5].__class__ == ListElement
assert children[5].name == "candidates"
assert children[5].value.__class__ == list
assert children[5].value == ["Mouse", "Penguine"]
- assert children[6].__class__ == DictFloatElement
+ assert children[6].__class__ == FloatElement
assert children[6].name == "rvalue"
assert children[6].value.__class__ == float
- assert children[7].__class__ == DictTextElement
+ assert children[7].__class__ == TextElement
assert children[7].name == "url"
assert children[7].value.__class__ == str
@@ -392,15 +391,56 @@ def test_abstract_dict_element_converter():
definition = yaml.safe_load("""
match_name: text
match_value: .*begin(?P<text>.*)end
+accept_text: True
""")
- converter = _AbstractDictElementConverter(
+ converter = _AbstractScalarValueElementConverter(
definition, "test_converter",
None # This is possible when "subtree" is not used
)
- element = DictTextElement("text", """
+ element = TextElement("text", """
begin
bla
end""")
val = converter.match(element)
assert val is not None
assert val["text"] == "\nbla\n"
+
+
+def test_converter_value_match(converter_registry):
+ # test with defaults
+ dc = FloatElementConverter(
+ definition={
+ "match_name": "(.*)",
+ "match_value": "(.*)",
+ },
+ name="Test",
+ converter_registry=converter_registry
+ )
+ m = dc.match(IntegerElement(name="a", value=4))
+ assert m is not None
+
+ # overwrite default with no match for int
+ dc = FloatElementConverter(
+ definition={
+ "match_name": "(.*)",
+ "match_value": "(.*)",
+ "accept_int": False,
+ },
+ name="Test",
+ converter_registry=converter_registry
+ )
+ with pytest.raises(RuntimeError) as err:
+ m = dc.match(IntegerElement(name="a", value=4))
+
+ # overwrite default with match for float
+ dc = IntegerElementConverter(
+ definition={
+ "match_name": "(.*)",
+ "match_value": "(.*)",
+ "accept_float": True,
+ },
+ name="Test",
+ converter_registry=converter_registry
+ )
+ m = dc.match(FloatElement(name="a", value=4.0))
+ assert m is not None
diff --git a/unittests/test_directories/example_substitutions/ExperimentalData/file.data b/unittests/test_directories/example_substitutions/ExperimentalData/file.data
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/unittests/test_directories/example_substitutions/substitutions_parents.yml b/unittests/test_directories/example_substitutions/substitutions_parents.yml
index 107e766ccd833fab618cecfc04f13bc29abc80a6..2e208b522cc79569a7679a9df4ba7782ad1fe1c3 100644
--- a/unittests/test_directories/example_substitutions/substitutions_parents.yml
+++ b/unittests/test_directories/example_substitutions/substitutions_parents.yml
@@ -5,6 +5,10 @@ ExperimentalData: # name of the converter
records:
Project:
name: project
+ RecordWithoutParents:
+ parents: []
+ RecordThatGetsParentsLater:
+ parents: []
subtree:
File: # name of the converter
type: SimpleFile
@@ -22,4 +26,13 @@ ExperimentalData: # name of the converter
Project:
Experiments: +$Experiment
dates: +20$year-$month-$day
-
+
+ RecordThatGetsParentsLater:
+ parents:
+ - Month_$month # This adds a special parent as record type
+ OtherFile:
+ type: SimpleFile
+ match: ".*\\.data"
+ records:
+ RecordThatGetsParentsLater:
+ someId: "23"
diff --git a/unittests/test_directories/examples_json/jsontest_cfood.yml b/unittests/test_directories/examples_json/jsontest_cfood.yml
index f1eb6a9fa186c07f551bd12a84050f544abfdabc..875773e6bf523500dba46abffda25c0edcb3abc4 100644
--- a/unittests/test_directories/examples_json/jsontest_cfood.yml
+++ b/unittests/test_directories/examples_json/jsontest_cfood.yml
@@ -9,25 +9,25 @@ JSONTest: # name of the converter
- Project # not needed as the name is equivalent
subtree:
name_element:
- type: DictTextElement
+ type: TextElement
match_name: "name"
match_value: "(?P<name>.*)"
records:
Project:
name: $name
url_element: # name of the first subtree element which is a converter
- type: DictTextElement
+ type: TextElement
match_value: "(?P<url>.*)"
match_name: "url"
records:
Project:
url: $url
persons_element:
- type: DictListElement
+ type: ListElement
match_name: "Person"
subtree:
person_element:
- type: Dict
+ type: DictElement
records:
Person:
parents:
@@ -36,21 +36,21 @@ JSONTest: # name of the converter
Person: +$Person
subtree:
firstname_element:
- type: DictTextElement
+ type: TextElement
match_name: "firstname"
match_value: "(?P<firstname>.*)"
records:
Person:
firstname: $firstname
lastname_element:
- type: DictTextElement
+ type: TextElement
match_name: "lastname"
match_value: "(?P<lastname>.*)"
records:
Person:
lastname: $lastname
email_element:
- type: DictTextElement
+ type: TextElement
match_name: "email"
match_value: "(?P<email>.*)"
records:
diff --git a/unittests/test_issues.py b/unittests/test_issues.py
index 6e77b0c7f26f4b2970203cfc4b8cc786fe24121b..ad66aa1413303a16b96ed877f3279a061a0a4bc5 100644
--- a/unittests/test_issues.py
+++ b/unittests/test_issues.py
@@ -23,7 +23,7 @@
from pytest import mark
from caoscrawler.crawl import Crawler
-from caoscrawler.structure_elements import Dict
+from caoscrawler.structure_elements import DictElement
from test_tool import rfp
@@ -35,7 +35,7 @@ def test_issue_10():
"""Test integer-to-float conversion in dictionaries"""
crawler_definition = {
"DictTest": {
- "type": "Dict",
+ "type": "DictElement",
"match": "(.*)",
"records": {
"TestRec": {}
@@ -63,7 +63,7 @@ def test_issue_10():
}
records = crawler.start_crawling(
- Dict("TestDict", test_dict), crawler_definition, converter_registry)
+ DictElement("TestDict", test_dict), crawler_definition, converter_registry)
assert len(records) == 1
assert records[0].parents[0].name == "TestRec"
assert records[0].get_property("float_prop") is not None
diff --git a/unittests/test_json.py b/unittests/test_json.py
index 97d9831de20a2b9f712294d1a0f6322789580f30..41fd31a43389148ad6fbc4167fd3fbd4f7f2ee9f 100644
--- a/unittests/test_json.py
+++ b/unittests/test_json.py
@@ -24,7 +24,7 @@
#
"""
-module description
+test the JSON converter
"""
import json
import os
@@ -33,7 +33,7 @@ from pytest import raises
import caosdb as db
-from caoscrawler.converters import JSONFileConverter, DictConverter
+from caoscrawler.converters import JSONFileConverter
from caoscrawler.crawl import Crawler
from caoscrawler.structure_elements import File, JSONFile
from test_tool import rfp, dircheckstr
diff --git a/unittests/test_macros.py b/unittests/test_macros.py
index 2934d7902a2f7be6925491f73412b0350265145d..4e27e42f8d1e633cf97fa142e2c0ec8aa013af05 100644
--- a/unittests/test_macros.py
+++ b/unittests/test_macros.py
@@ -327,7 +327,6 @@ extroot: !macro
assert cfood["extroot"]["once"]["something"]["a"] == "4"
assert cfood["extroot"]["twice"]["something"]["a"] == "5"
assert cfood["extroot"]["default_name"]["something"]["a"] == "4"
-
# Code sample to generate the expanded macro:
# with open("expanded_test_macro.yaml", "w") as f:
# f.write(yaml.dump(cfood))
@@ -409,3 +408,51 @@ SimulationData:
# Code sample to generate the expanded macro:
# with open("expanded_test_macro.yaml", "w") as f:
# f.write(yaml.dump(cfood))
+
+
+@pytest.mark.xfail(
+ reason="Wait until this feature is implemented"
+ "https://gitlab.com/caosdb/caosdb-crawler/-/issues/21."
+)
+def test_def_replacements():
+ """Test that parameters in macro definitions can be used
+ for defining subsequent parameters.
+ """
+
+ cfood = _temp_file_load("""
+---
+metadata:
+ macros:
+ - !defmacro
+ name: test_def_replacements
+ params:
+ macro_name: default_name
+ z: $macro_name
+ a: $macro_name
+ v: $z
+ definition:
+ $macro_name:
+ macro_name: $macro_name
+ z: $z
+ a: $a
+ v: $v
+---
+extroot: !macro
+ test_def_replacements:
+ - macro_name: once
+ - macro_name: twice
+ z: 5
+ - {}
+ """)
+ assert cfood["extroot"]["once"]["z"] == "once"
+ assert cfood["extroot"]["once"]["a"] == "once"
+ assert cfood["extroot"]["once"]["v"] == "once"
+ assert cfood["extroot"]["once"]["macro_name"] == "once"
+ assert cfood["extroot"]["twice"]["z"] == "5"
+ assert cfood["extroot"]["twice"]["a"] == "5"
+ assert cfood["extroot"]["twice"]["v"] == "5"
+ assert cfood["extroot"]["twice"]["macro_name"] == "twice"
+ assert cfood["extroot"]["default_name"]["z"] == "default_name"
+ assert cfood["extroot"]["default_name"]["a"] == "default_name"
+ assert cfood["extroot"]["default_name"]["v"] == "default_name"
+ assert cfood["extroot"]["default_name"]["macro_name"] == "default_name"
diff --git a/unittests/test_table_converter.py b/unittests/test_table_converter.py
index 85255d3efd34dc666d5d2e97423f33177dea6732..abe4ac85ec4fc0a78e71c177222817e1b84e9e56 100644
--- a/unittests/test_table_converter.py
+++ b/unittests/test_table_converter.py
@@ -31,10 +31,8 @@ from caoscrawler.stores import GeneralStore
from caoscrawler.converters import (ConverterValidationError,
DictConverter, XLSXTableConverter, CSVTableConverter)
from caoscrawler.structure_elements import Directory
-from caoscrawler.structure_elements import (File, DictTextElement,
- DictListElement, DictElement,
- DictBooleanElement, DictDictElement,
- DictIntegerElement, DictFloatElement)
+from caoscrawler.structure_elements import (File, TextElement, ListElement, DictElement,
+ BooleanElement, IntegerElement, FloatElement)
from os.path import join, dirname, basename
@@ -63,18 +61,17 @@ def converter_registry():
"XLSXTableConverter": {
"converter": "XLSXTableConverter",
"package": "caoscrawler.converters"},
-
- "DictDictElement": {
- "converter": "DictDictElementConverter",
+ "DictElement": {
+ "converter": "DictElementConverter",
"package": "caoscrawler.converters"},
- "DictTextElement": {
- "converter": "DictTextElementConverter",
+ "TextElement": {
+ "converter": "TextElementConverter",
"package": "caoscrawler.converters"},
- "DictIntegerElement": {
- "converter": "DictIntegerElementConverter",
+ "IntegerElement": {
+ "converter": "IntegerElementConverter",
"package": "caoscrawler.converters"},
- "DictFloatElement": {
- "converter": "DictFloatElementConverter",
+ "FloatElement": {
+ "converter": "FloatElementConverter",
"package": "caoscrawler.converters"},
}
diff --git a/unittests/test_tool.py b/unittests/test_tool.py
index 0eef86b3a9f5ef6f64d9ccb9ce0102cd87208fa4..e1a155f29c5f3537ca9a33fa775e5497f4b15cc8 100755
--- a/unittests/test_tool.py
+++ b/unittests/test_tool.py
@@ -604,24 +604,30 @@ def reset_mocks(mocks):
def change_identifiable_prop(ident):
- # the checks in here are only to make sure we change the record as we intend to
- meas = ident._records[-2]
- assert meas.parents[0].name == "Measurement"
- resps = meas.properties[0]
- assert resps.name == "date"
- # change one element; This changes the date which is part of the identifiable
- resps.value = "2022-01-04"
+ for ent in ident._records:
+ if len(ent.parents) == 0 or ent.parents[0].name != "Measurement":
+ continue
+ for prop in ent.properties:
+ if prop.name != "date":
+ continue
+ # change one element; This removes a responsible which is not part of the identifiable
+ prop.value = "2022-01-04"
+ return
+ raise RuntimeError("Did not find the property that should be changed.")
def change_non_identifiable_prop(ident):
- # the checks in here are only to make sure we change the record as we intend to
- meas = ident._records[-1]
- assert meas.parents[0].name == "Measurement"
- resps = meas.properties[-1]
- assert resps.name == "responsible"
- assert len(resps.value) == 2
- # change one element; This removes a responsible which is not part of the identifiable
- del resps.value[-1]
+ for ent in ident._records:
+ if len(ent.parents) == 0 or ent.parents[0].name != "Measurement":
+ continue
+
+ for prop in ent.properties:
+ if prop.name != "responsible" or len(prop.value) < 2:
+ continue
+ # change one element; This removes a responsible which is not part of the identifiable
+ del prop.value[-1]
+ return
+ raise RuntimeError("Did not find the property that should be changed.")
@patch("caoscrawler.crawl.Crawler._get_entity_by_id",
diff --git a/unittests/test_variable_substitutions.py b/unittests/test_variable_substitutions.py
index 203197b7f8af51605a413ac354a0426d61c9c0cb..f6c3b6375a3111faff9d746779805ba16af260b7 100644
--- a/unittests/test_variable_substitutions.py
+++ b/unittests/test_variable_substitutions.py
@@ -83,3 +83,18 @@ def test_substitutions_parents(crawler_2):
assert len(parents) == 2
assert parents[0].name == "Experiment"
assert parents[1].name == "Month_05"
+
+
+def test_empty_parents(crawler_2):
+ # This is a test for:
+ # https://gitlab.com/caosdb/caosdb-crawler/-/issues/8
+
+ subd = crawler_2.debug_tree[dircheckstr(
+ "File", "ExperimentalData", "220512_data.dat")]
+
+ parents = subd[1]["RecordWithoutParents"].get_parents()
+ assert len(parents) == 0
+
+ parents = subd[1]["RecordThatGetsParentsLater"].get_parents()
+ assert len(parents) == 1
+ assert parents[0].name == "Month_05"