diff --git a/README.md b/README.md
index 40239656a2015944d230376c6c526b583484eb59..1bc1ebe2dbd3c89418783d6a890b83514b20ee41 100644
--- a/README.md
+++ b/README.md
@@ -16,10 +16,29 @@ Mount the custom folder by adding it to the `profile.yml`. E.g.
Also, you need to add the python package to the scripting interface in the
profile:
```
-TODO
+ scripting:
+ packages:
+ loanpy:
+ mode: "copy"
+ path: "loan/loanpy"
+ package: "linkahead-sss-loanpy"
```
+## Configuration
+
+There is an example datamodel in `datamodel-default.yml` in this
+repository that contains the minimal datamodel for LinkAhead Loan
+using all default names for the required entities.
+
+Note that you can adjust names of Recordtypes and Properties that are used.
+If you want to do this, you need to
+1. Create a configuration file for `loanpy`. Place a `~/linkahead_loan.ini` in
+ the sss home directory (`caosdb-server/scripting/home`) and add those keys,
+ that you want to change. Check out the available options in the default file
+ `loanpy/src/loan/default_config.ini`.
+- Add a `caosdb-server/caosdb-webui/src/ext/js/a_box_loan_config.js` to your
+ custom folder such that it overwrites the corresponding file of loan-custom.
## Integration tests
Run `pytest .` in the integration tests folder
diff --git a/datamodel-default.yml b/datamodel-default.yml
new file mode 100644
index 0000000000000000000000000000000000000000..9c618ed9cadb586ed1e3d16879661a9e5c5cdf0b
--- /dev/null
+++ b/datamodel-default.yml
@@ -0,0 +1,62 @@
+# Copyright (C) 2025 IndiScale GmbH <info@indiscale.com>
+# Copyright (C) 2025 Florian Spreckelsen <f.spreckelsen@indiscale.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Affero General Public License for more details.
+#
+# 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/>.
+#
+Box:
+ recommended_properties:
+ Location:
+ Content:
+ Number:
+ datatype: TEXT
+Person:
+ recommended_properties:
+ firstName:
+ datatype: TEXT
+ lastName:
+ datatype: TEXT
+ email:
+ datatype: TEXT
+Loan:
+ recommended_properties:
+ Box:
+ Borrower:
+ datatype: Person
+ expected_return:
+ datatype: DATETIME
+ exhaustContents:
+ datatype: BOOLEAN
+ comment:
+ datatype: TEXT
+ LoanLocation:
+ datatype: Location
+ loanRequested:
+ datatype: DATETIME
+ loanAccepted:
+ datatype: DATETIME
+ lent:
+ datatype: DATETIME
+ returnRequested:
+ datatype: DATETIME
+ Content:
+ datatype: TEXT
+ ReturnLocation:
+ datatype: Location
+ returnAccepted:
+ datatype: DATETIME
+ returned:
+ datatype: DATETIME
+Location:
+
diff --git a/loan-custom/caosdb-server/caosdb-webui/build.properties.d/51_box_loan.properties b/loan-custom/caosdb-server/caosdb-webui/build.properties.d/51_box_loan.properties
new file mode 100644
index 0000000000000000000000000000000000000000..09b7cf8881f5723ad9901d0d5ca5badc271e0382
--- /dev/null
+++ b/loan-custom/caosdb-server/caosdb-webui/build.properties.d/51_box_loan.properties
@@ -0,0 +1 @@
+BUILD_MODULE_BOX_LOAN=ENABLED
diff --git a/loan-custom/caosdb-server/caosdb-webui/src/ext/js/a_box_loan_config.js b/loan-custom/caosdb-server/caosdb-webui/src/ext/js/a_box_loan_config.js
new file mode 100644
index 0000000000000000000000000000000000000000..3ad17f3a1103b6803e76370171b5e71e023f1562
--- /dev/null
+++ b/loan-custom/caosdb-server/caosdb-webui/src/ext/js/a_box_loan_config.js
@@ -0,0 +1,57 @@
+/*
+ * This file is a part of the LinkAhead Project.
+ *
+ * Copyright (C) 2025 Henrik tom Wörden (h.tomwoerden@indiscale.com)
+ * Copyright (C) 2025 IndiScale GmbH (info@indiscale.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * 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/>.
+ *
+ */
+
+
+
+var box_loan_config = function() {
+
+ var datamodel = {
+ loan: "Loan",
+ box: "Box",
+ returned: "returned",
+ returnAccepted: "returnAccepted",
+ returnRequested: "returnRequested",
+ lent: "lent",
+ loanAccepted: "loanAccepted",
+ loanRequested: "loanRequested",
+ location: "Location",
+ firstName: "firstName",
+ lastName: "lastName",
+ email: "email",
+ number: "Number",
+ expectedReturn: "expectedReturn",
+ }
+
+ var init = function() {}
+
+ return {
+ init: init,
+ datamodel: datamodel
+ };
+
+}();
+
+
+$(document).ready(function() {
+ if ("${BUILD_MODULE_BOX_LOAN}" == "ENABLED") {
+ caosdb_modules.register(box_loan_config);
+ }
+});
diff --git a/loan-custom/caosdb-server/caosdb-webui/src/ext/js/box_loan.js b/loan-custom/caosdb-server/caosdb-webui/src/ext/js/box_loan.js
index c7dfc6a2a81f03000af23af156913e2d1fbbabd0..f48b25e347ad05091ec3338f127b45f1fe3a20c0 100644
--- a/loan-custom/caosdb-server/caosdb-webui/src/ext/js/box_loan.js
+++ b/loan-custom/caosdb-server/caosdb-webui/src/ext/js/box_loan.js
@@ -37,28 +37,22 @@ var getHTMLForm = async function(pageName, variables) {
var site = await connection.get("webinterface/html/forms/" + pageName + ".html", "html");
var htmltext = site.getElementById("caosdb-form").innerHTML;
var req = /\{([0-9a-z-A-Z_]+)\}/g;
- return htmltext.replace(req, (match, p1) => {
- return variables[p1] || "";
- });
+ return htmltext.replace(req, (match, p1) => {
+ return variables[p1] || "";
+ });
}
/**
- * AWI Box Loan, refactored code.
+ * Box Loan, refactored code.
*/
-var awi_box_loan = function () {
+var box_loan = function(logger, box_loan_config) {
- var logger = log.getLogger("awi_box_loan");
-
- var datamodel = {
- loan: "Loan",
- box: "Box",
- returned: "returned",
- }
+ const datamodel = box_loan_config.datamodel;
const _dismiss_button = '<button class="btn btn-secondary box-loan-btn">OK</button>'
const _server_did_not_respond = "The server did not respond. Please reload the page.";
- const _return_box_button = '<a title="Return Box." class="btn btn-link box-loan-btn">Return Box</a>';
- const _borrow_box_button = '<a title="Borrow Box." class="btn btn-link box-loan-btn">Borrow Box</a>';
+ const _return_box_button = `<a title="Return ${datamodel.box}." class="btn btn-link box-loan-btn">Return ${datamodel.box}</a>`;
+ const _borrow_box_button = `<a title="Borrow ${datamodel.box}." class="btn btn-link box-loan-btn">Borrow ${datamodel.box}</a>`;
const _confirm_loan_button = '<a title="Confirm Loan." class="btn btn-link box-loan-btn">Confirm Loan</a>';
const _manual_return_button = '<a title="Manual Return." class="btn btn-link box-loan-btn">Manual Return</a>';
const _accept_return_button = '<a title="Accept Return" class="btn btn-link box-loan-btn">Accept Return</a>';
@@ -84,21 +78,21 @@ var awi_box_loan = function () {
* @param text
* @return HTMLElement
*/
- var getPleaseWaitSpan = function (text = "Processing. Please wait...") {
+ var getPleaseWaitSpan = function(text = "Processing. Please wait...") {
return $('<span>' + text + '</span>')[0];
}
/**
* Return the actions panel of a box entity.
*/
- var get_actions_panel = function (box) {
+ var get_actions_panel = function(box) {
return $(box).find('.caosdb-entity-actions-panel');
}
/**
* Open a mail with recepient address address, subject subject and body text.
*/
- this.open_mail_generic = function (address, subject, text) {
+ this.open_mail_generic = function(address, subject, text) {
const mailto = 'mailto:' + address + '?subject=' + subject + '&body=' + text;
location.href = mailto;
}
@@ -108,7 +102,7 @@ var awi_box_loan = function () {
* is present in the property list p.
* This function is used for determining the loan state.
*/
- var loan_state_function = function (p, name) {
+ var loan_state_function = function(p, name) {
var p1 = p.filter(x => x.name == name);
if (p1.length == 1 && p1[0].value.length > 0) {
return true;
@@ -119,24 +113,24 @@ var awi_box_loan = function () {
/**
* This function returns a string on the state of the loan.
*/
- var get_loan_state_string = function (loan) {
+ var get_loan_state_string = function(loan) {
const p = getProperties(loan);
if (loan_state_function(p, datamodel.returned)) {
return "returned";
}
- if (loan_state_function(p, "returnAccepted")) {
+ if (loan_state_function(p, datamodel.returnAccepted)) {
return "return_accepted";
}
- if (loan_state_function(p, "returnRequested")) {
+ if (loan_state_function(p, datamodel.returnRequested)) {
return "return_requested";
}
- if (loan_state_function(p, "lent")) {
+ if (loan_state_function(p, datamodel.lent)) {
return "lent";
}
- if (loan_state_function(p, "loanAccepted")) {
+ if (loan_state_function(p, datamodel.loanAccepted)) {
return "loan_accepted";
}
- if (loan_state_function(p, "loanRequested")) {
+ if (loan_state_function(p, datamodel.loanRequested)) {
return "loan_requested";
}
@@ -149,14 +143,14 @@ var awi_box_loan = function () {
* Query for a Loan entity which references the box and which has no
* `returned` property.
*/
- var get_active_loans = async function (box) {
+ var get_active_loans = async function(box) {
return await query(`FIND ${datamodel.loan} WITH ${datamodel.box} -> ${box.id} AND WHICH DOES NOT HAVE A ${datamodel.returned}`);
}
/**
* Returns detailed information about the loan state of this box:
*/
- var get_loan_state = async function (box) {
+ var get_loan_state = async function(box) {
const loan_state = {
loan: undefined,
state: undefined,
@@ -173,7 +167,7 @@ var awi_box_loan = function () {
return loan_state;
}
- var run_script = async function (script, data) {
+ var run_script = async function(script, data) {
const json_str = JSON.stringify(data);
const params = {
"-p0": {
@@ -191,7 +185,7 @@ var awi_box_loan = function () {
}
}
- var show_result = function (container, result, box) {
+ var show_result = function(container, result, box) {
const dismissable = $('<div/>');
const restore = $(container).children();
restore.hide();
@@ -214,7 +208,7 @@ var awi_box_loan = function () {
}
const dismiss_btn = $(_dismiss_button);
- dismiss_btn.click(function () {
+ dismiss_btn.click(function() {
dismissable.remove();
restore.show();
init(box);
@@ -223,7 +217,7 @@ var awi_box_loan = function () {
}
- var get_request_data = function (form) {
+ var get_request_data = function(form) {
const email = $(form).find("#email").val();
const first_name = $(form).find("#first-name").val();
const last_name = $(form).find("#last-name").val();
@@ -258,7 +252,7 @@ var awi_box_loan = function () {
* Generate a borrow function for a box.
* This function can also be used to assign values to multiple boxes.
*/
- var borrow_function = async function (form, box) {
+ var borrow_function = async function(form, box) {
const wait = getPleaseWaitSpan();
const actions_panel = get_actions_panel(box);
$(actions_panel).append(wait).find('btn').hide()
@@ -277,7 +271,7 @@ var awi_box_loan = function () {
show_result(actions_panel, result, box);
}
- var _add_form = async function (box, form_generator, submit_callback) {
+ var _add_form = async function(box, form_generator, submit_callback) {
const form = $(await form_generator(box));
form.insertAfter($(box).find('.caosdb-entity-actions-panel')).hide();
form.submit(() => {
@@ -296,7 +290,7 @@ var awi_box_loan = function () {
return form[0];
}
- var _init_validator = function (form) {
+ var _init_validator = function(form) {
// initiate validator
// Workaround for missing checkValidity function:
if (form.checkValidity == undefined) {
@@ -313,7 +307,7 @@ var awi_box_loan = function () {
/**
* Add Return button to boxes' actions panels.
*/
- var add_return_button = async function (box) {
+ var add_return_button = async function(box) {
const but = $(_return_box_button);
get_actions_panel(box).append(but);
@@ -323,7 +317,7 @@ var awi_box_loan = function () {
name: "location",
label: "",
required: true,
- query: "FIND Record Location",
+ query: `FIND Record ${datamodel.location}`,
make_desc: getEntityName,
}
const dd = form_elements.make_form_field(config);
@@ -345,7 +339,7 @@ var awi_box_loan = function () {
* If the user is administrator (or a data curator) a button is added
* to accept the borrow request. Else a message is added "pending loan request".
*/
- var add_borrow_accept_button = function (box, loan) {
+ var add_borrow_accept_button = function(box, loan) {
const actionPanel = get_actions_panel(box);
if (userIsAdministrator() === true || userHasRole("curator") === true) {
const but = $(_accept_loan_button);
@@ -360,7 +354,7 @@ var awi_box_loan = function () {
}
}
- var create_link_to_loan = function (loan, text) {
+ var create_link_to_loan = function(loan, text) {
const loan_id = getEntityID(loan);
const href = `${connection.getBasePath()}Entity/${loan_id}`;
const title = "Open loan entity.";
@@ -372,7 +366,7 @@ var awi_box_loan = function () {
/**
* Add Borrow buttons to the boxes' action panels
*/
- var add_borrow_button = async function (box) {
+ var add_borrow_button = async function(box) {
const but = $(_borrow_box_button);
get_actions_panel(box).append(but);
@@ -381,7 +375,7 @@ var awi_box_loan = function () {
name: "destination",
label: "",
required: true,
- query: "FIND Record Location",
+ query: `FIND Record ${datamodel.location}`,
make_desc: getEntityName,
}
const dd = form_elements.make_form_field(config);
@@ -400,19 +394,19 @@ var awi_box_loan = function () {
}
- var open_accept_loan_mail = async function (loan, box) {
+ var open_accept_loan_mail = async function(loan, box) {
try {
const borrower = (await retrieve(getProperty(loan, "Borrower"), case_sensitive = false))[0];
- const email = getProperty(borrower, "email", case_sensitive = false);
- const firstName = getProperty(borrower, "firstName", case_sensitive = false);
- const lastName = getProperty(borrower, "lastName", case_sensitive = false);
- const bn = getProperty(box, "Number", case_sensitive = false);
- const date = getProperty(loan, "expectedReturn", case_sensitive = false);
+ const email = getProperty(borrower, datamodel.email, case_sensitive = false);
+ const firstName = getProperty(borrower, datamodel.firstName, case_sensitive = false);
+ const lastName = getProperty(borrower, datamodel.lastName, case_sensitive = false);
+ const bn = getProperty(box, datamodel.number, case_sensitive = false);
+ const date = getProperty(loan, datamodel.expectedReturn, case_sensitive = false);
- const subject = `Loan Request for Box ${bn} accepted`;
+ const subject = `Loan Request for ${datamodel.box} ${bn} accepted`;
const body = `Dear ${firstName} ${lastName}, %0D%0D` +
- `You can pickup box number ${bn} on ${date}. %0D%0D` +
+ `You can pickup ${datamodel.box} number ${bn} on ${date}. %0D%0D` +
`Kind Regards,%0D%0D ${getUserName()}`;
open_mail_generic(email, subject, body)
} catch (err) {
@@ -421,7 +415,7 @@ var awi_box_loan = function () {
}
- var accept_loan_function = async function (box) {
+ var accept_loan_function = async function(box) {
const wait = getPleaseWaitSpan();
const actions_panel = get_actions_panel(box);
$(actions_panel).append(wait).find('btn').hide()
@@ -439,7 +433,7 @@ var awi_box_loan = function () {
open_accept_loan_mail(loan, box);
}
- var manual_return_function = async function (box) {
+ var manual_return_function = async function(box) {
const wait = getPleaseWaitSpan();
const actions_panel = get_actions_panel(box);
$(actions_panel).append(wait).find('btn').hide()
@@ -458,7 +452,7 @@ var awi_box_loan = function () {
/**
* Add Manual Return button to boxes' actions panels.
*/
- var add_manual_return_button = function (box, loan) {
+ var add_manual_return_button = function(box, loan) {
const actionPanel = get_actions_panel(box);
if (userIsAdministrator() === true || userHasRole("curator") === true) {
const but = $(_manual_return_button);
@@ -489,7 +483,7 @@ var awi_box_loan = function () {
}
- var confirm_loan_function = async function (box) {
+ var confirm_loan_function = async function(box) {
const wait = getPleaseWaitSpan();
const actions_panel = get_actions_panel(box);
$(actions_panel).append(wait).find('btn').hide()
@@ -506,18 +500,18 @@ var awi_box_loan = function () {
}
- var open_reject_return_mail = async function (loan, box) {
+ var open_reject_return_mail = async function(loan, box) {
try {
const borrower = (await retrieve(getProperty(loan, "Borrower"), case_sensitive = false))[0];
- const email = getProperty(borrower, "email", case_sensitive = false);
- const firstName = getProperty(borrower, "firstName", case_sensitive = false);
- const lastName = getProperty(borrower, "lastName", case_sensitive = false);
- const bn = getProperty(box, "Number", case_sensitive = false);
+ const email = getProperty(borrower, datamodel.email, case_sensitive = false);
+ const firstName = getProperty(borrower, datamodel.firstName, case_sensitive = false);
+ const lastName = getProperty(borrower, datamodel.lastName, case_sensitive = false);
+ const bn = getProperty(box, datamodel.number, case_sensitive = false);
- const subject = `Return Request for Box ${bn} rejected`;
+ const subject = `Return Request for ${datamodel.box} ${bn} rejected`;
const body = `Dear ${firstName} ${lastName}, %0D%0D` +
- `your return request for box number ${bn} cannot be accepted.` +
+ `your return request for ${datamodel.box} number ${bn} cannot be accepted.` +
`Kind Regards,%0D ${getUserName()}`;
open_mail_generic(email, subject, body)
} catch (err) {
@@ -526,18 +520,18 @@ var awi_box_loan = function () {
}
- var open_accept_return_mail = async function (loan, box) {
+ var open_accept_return_mail = async function(loan, box) {
try {
const borrower = (await retrieve(getProperty(loan, "Borrower"), case_sensitive = false))[0];
- const email = getProperty(borrower, "email", case_sensitive = false);
- const firstName = getProperty(borrower, "firstName", case_sensitive = false);
- const lastName = getProperty(borrower, "lastName", case_sensitive = false);
- const bn = getProperty(box, "Number", case_sensitive = false);
- const date = getProperty(loan, "expectedReturn", case_sensitive = false);
- const subject = `Return Request for Box ${bn} accepted`;
+ const email = getProperty(borrower, datamodel.email, case_sensitive = false);
+ const firstName = getProperty(borrower, datamodel.firstName, case_sensitive = false);
+ const lastName = getProperty(borrower, datamodel.lastName, case_sensitive = false);
+ const bn = getProperty(box, datamodel.number, case_sensitive = false);
+ const date = getProperty(loan, datamodel.expectedReturn, case_sensitive = false);
+ const subject = `Return Request for ${datamodel.box} ${bn} accepted`;
const body = `Dear ${firstName} ${lastName}, %0D%0D` +
- `please return box number ${bn} on ${date}. %0D%0D` +
+ `please return ${datamodel.box} number ${bn} on ${date}. %0D%0D` +
`Kind Regards,%0D ${getUserName()}`;
open_mail_generic(email, subject, body)
} catch (err) {
@@ -546,7 +540,7 @@ var awi_box_loan = function () {
}
- var accept_return_function = async function (box) {
+ var accept_return_function = async function(box) {
const wait = getPleaseWaitSpan();
const actions_panel = get_actions_panel(box);
$(actions_panel).append(wait).find('btn').hide()
@@ -565,7 +559,7 @@ var awi_box_loan = function () {
}
- var reject_return_function = async function (box) {
+ var reject_return_function = async function(box) {
const wait = getPleaseWaitSpan();
const actions_panel = get_actions_panel(box);
$(actions_panel).append(wait).find('btn').hide()
@@ -589,7 +583,7 @@ var awi_box_loan = function () {
/**
* Add two buttons for confirming or rejecting a return request.
*/
- var add_confirm_reject_return = function (box, loan) {
+ var add_confirm_reject_return = function(box, loan) {
const actionPanel = get_actions_panel(box);
if (userIsAdministrator() === true || userHasRole("curator") === true) {
const confirmButton = $(_accept_return_button);
@@ -617,7 +611,7 @@ var awi_box_loan = function () {
/**
* Add a button for confirming the loan.
*/
- var add_confirm_loan_button = function (box, loan) {
+ var add_confirm_loan_button = function(box, loan) {
const actionsPanel = get_actions_panel(box);
if (userIsAdministrator() === true || userHasRole("curator") === true) {
const but = $(_confirm_loan_button);
@@ -632,7 +626,7 @@ var awi_box_loan = function () {
}
}
- var return_function = async function (form, box) {
+ var return_function = async function(form, box) {
const wait = getPleaseWaitSpan();
const actions_panel = get_actions_panel(box);
$(actions_panel).append(wait).find('btn').hide()
@@ -659,9 +653,9 @@ var awi_box_loan = function () {
/**
* Add buttons for borrowing boxes.
*/
- var add_buttons = function (boxes) {
+ var add_buttons = function(boxes) {
$(boxes).find('.box-loan-btn').remove();
- $(boxes).each(async function () {
+ $(boxes).each(async function() {
const loan_state = await get_loan_state(this);
if (typeof loan_state.loan !== "undefined") {
if (loan_state.state == "loan_requested") {
@@ -686,7 +680,7 @@ var awi_box_loan = function () {
* selectform can be used to generate the form for multiple boxes.
* In case selectform is true, box will be ignored.
*/
- var generate_form_borrow_checkout = async function (box) {
+ var generate_form_borrow_checkout = async function(box) {
const email = window.localStorage["borrower_email"];
const firstname = window.localStorage["borrower_first_name"];
const lastname = window.localStorage["borrower_last_name"];
@@ -720,16 +714,16 @@ var awi_box_loan = function () {
* currentlocation (pre-filled)
* comment
*/
- var generate_return_form = async function (box) {
+ var generate_return_form = async function(box) {
const loan = (await get_active_loans(box))[0];
const borrower = (await retrieve(getProperty(loan, "Borrower", case_sensitive = false)))[0];
- var email = getProperty(borrower, "email", case_sensitive = false);
- var first_name = getProperty(borrower, "firstName",
+ var email = getProperty(borrower, datamodel.email, case_sensitive = false);
+ var first_name = getProperty(borrower, datamodel.firstName,
case_sensitive = false);
- var last_name = getProperty(borrower, "lastName",
+ var last_name = getProperty(borrower, datamodel.lastName,
case_sensitive = false);
- var exp_return = getProperty(loan, "expectedReturn",
+ var exp_return = getProperty(loan, datamodel.expectedReturn,
case_sensitive = false);
var cur_loc = getProperty(loan, "destination", case_sensitive = false);
@@ -744,12 +738,13 @@ var awi_box_loan = function () {
});
}
- var init = function (boxes) {
+ var init = function(boxes) {
const init_boxes = boxes || $(".caosdb-entity-panel")
.not("[data-version-successor]")
- /* TODO: This fails easily (BoxType) */
- .has(".caosdb-parent-name:contains('Box')")
- .not(":has(.caosdb-parent-name:contains('BoxT'))").toArray();
+ .filter(function() {
+ return $(this).find(".caosdb-parent-name").text().trim() === datamodel.box;
+ })
+ .toArray();
add_buttons(init_boxes);
}
@@ -760,13 +755,11 @@ var awi_box_loan = function () {
get_loan_state_string: get_loan_state_string,
};
-}();
+}(log.getLogger("box_loan"), box_loan_config);
-/**
- * Add the extensions to the webui.
- */
-$(document).ready(function () {
- // TODO build variable
- awi_box_loan.init();
+$(document).ready(function() {
+ if ("${BUILD_MODULE_BOX_LOAN}" == "ENABLED") {
+ caosdb_modules.register(box_loan);
+ }
});
diff --git a/loanpy/pyproject.toml b/loanpy/pyproject.toml
index 0e4f0696632bcc6f833eeeec8b05cf4db47c09c2..9534aed6027d3e70922a1f8c5c3773e4dd1164a4 100644
--- a/loanpy/pyproject.toml
+++ b/loanpy/pyproject.toml
@@ -24,10 +24,26 @@ classifiers = [
requires-python = ">= 3.8"
dependencies = [
"caosadvancedtools",
+ "importlib_resources",
"py3-validate-email",
"linkahead@git+https://gitlab.indiscale.com/caosdb/src/caosdb-pylib.git@dev"
]
+
+[project.optional-dependencies]
+test = [
+ "pytest",
+ "pytest-env",
+ "pytest-cov",
+ "coverage>=4.4.2",
+]
+
+[tool.setuptools.packages.find]
+where = ["src"]
+
+[tool.setuptools.package-data]
+"loan" = ["*.ini"]
+
[project.urls]
Homepage = "https://getlinkahead.com"
Documentation = "https://docs.indiscale.com"
diff --git a/loanpy/src/loan/conf.py b/loanpy/src/loan/conf.py
index 16d4bc7b8a30c1711f23eb02bf2ef888286c7490..12faabdda99fabe9fce0a2a88a0cd66b8584b3c6 100644
--- a/loanpy/src/loan/conf.py
+++ b/loanpy/src/loan/conf.py
@@ -1,28 +1,41 @@
import linkahead as db
+import os
+import configparser
+from importlib_resources import files, as_file
+
+with as_file(files('loan').joinpath('default_config.ini')) as default_config_path:
+ user_config_path = os.path.expanduser('~/.linkahead_loan.ini')
+ config = configparser.ConfigParser()
+ config.read([default_config_path, user_config_path])
+ global rts, ps
+ rts = config['RecordTypes']
+ ps = config['Properties']
# RecordTypes
-BOX = db.RecordType(name="Box")
-PERSON = db.RecordType(name="Person")
-LOAN = db.RecordType(name="Loan")
+BOX = db.RecordType(name=rts['BOX'])
+PERSON = db.RecordType(name=rts['PERSON'])
+LOAN = db.RecordType(name=rts['LOAN'])
+LOCATION = db.RecordType(name=rts['LOCATION'])
+
# Properties
-FIRST_NAME = db.Property(name="firstName", datatype=db.TEXT)
-LAST_NAME = db.Property(name="lastName", datatype=db.TEXT)
-EMAIL = db.Property(name="email", datatype=db.TEXT)
-LOCATION = db.RecordType(name="Location")
-DESTINATION = db.Property(name="LoanLocation", datatype="Location")
-RETURNLOCATION = db.Property(name="ReturnLocation", datatype="Location")
-COMMENT = db.Property(name="comment", datatype=db.TEXT)
-EXHAUST_CONTENTS = db.Property(name="exhaustContents", datatype=db.BOOLEAN)
-BORROWER = db.Property(name="Borrower", datatype=PERSON.name)
-CONTENT = db.Property(name="Content", datatype=db.TEXT)
-LOAN_REQUESTED = db.Property(name="loanRequested", datatype=db.DATETIME)
-EXPECTED_RETURN = db.Property(name="expectedReturn", datatype=db.DATETIME)
-LOAN_ACCEPTED = db.Property(name="loanAccepted", datatype=db.DATETIME)
-LENT = db.Property(name="lent", datatype=db.DATETIME)
-RETURN_REQUESTED = db.Property(name="returnRequested", datatype=db.DATETIME)
-RETURN_ACCEPTED = db.Property(name="returnAccepted", datatype=db.DATETIME)
-RETURNED = db.Property(name="returned", datatype=db.DATETIME)
-BOX_NUMBER = db.Property(name="Number", datatype=db.TEXT)
+FIRST_NAME = db.Property(name=ps['FIRST_NAME'], datatype=db.TEXT)
+LAST_NAME = db.Property(name=ps['LAST_NAME'], datatype=db.TEXT)
+EMAIL = db.Property(name=ps['EMAIL'], datatype=db.TEXT)
+
+DESTINATION = db.Property(name=ps['DESTINATION'], datatype=rts['LOCATION'])
+RETURNLOCATION = db.Property(name=ps['RETURNLOCATION'], datatype=rts['LOCATION'])
+COMMENT = db.Property(name=ps['COMMENT'], datatype=db.TEXT)
+EXHAUST_CONTENTS = db.Property(name=ps['EXHAUST_CONTENTS'], datatype=db.BOOLEAN)
+BORROWER = db.Property(name=ps['BORROWER'], datatype=rts['PERSON'])
+CONTENT = db.Property(name=ps['CONTENT'], datatype=db.TEXT)
+LOAN_REQUESTED = db.Property(name=ps['LOAN_REQUESTED'], datatype=db.DATETIME)
+EXPECTED_RETURN = db.Property(name=ps['EXPECTED_RETURN'], datatype=db.DATETIME)
+LOAN_ACCEPTED = db.Property(name=ps['LOAN_ACCEPTED'], datatype=db.DATETIME)
+LENT = db.Property(name=ps['LENT'], datatype=db.DATETIME)
+RETURN_REQUESTED = db.Property(name=ps['RETURN_REQUESTED'], datatype=db.DATETIME)
+RETURN_ACCEPTED = db.Property(name=ps['RETURN_ACCEPTED'], datatype=db.DATETIME)
+RETURNED = db.Property(name=ps['RETURNED'], datatype=db.DATETIME)
+BOX_NUMBER = db.Property(name=ps['BOX_NUMBER'], datatype=db.TEXT)
# Other Strings
# TODO: Adapt datamodel and remove name override
diff --git a/loanpy/src/loan/default_config.ini b/loanpy/src/loan/default_config.ini
new file mode 100644
index 0000000000000000000000000000000000000000..7b49b0fa1978a4a801689b4c2eb242b3513586cd
--- /dev/null
+++ b/loanpy/src/loan/default_config.ini
@@ -0,0 +1,25 @@
+[RecordTypes]
+BOX = Box
+PERSON = Person
+LOAN = Loan
+LOCATION = Location
+
+
+[Properties]
+FIRST_NAME = firstName
+LAST_NAME = lastName
+EMAIL = email
+DESTINATION = LoanLocation
+RETURNLOCATION = ReturnLocation
+COMMENT = comment
+EXHAUST_CONTENTS = exhaustContents
+BORROWER = Borrower
+CONTENT = Content
+LOAN_REQUESTED = loanRequested
+EXPECTED_RETURN = expectedReturn
+LOAN_ACCEPTED = loanAccepted
+LENT = lent
+RETURN_REQUESTED = returnRequested
+RETURN_ACCEPTED = returnAccepted
+RETURNED = returned
+BOX_NUMBER = Number
diff --git a/loanpy/src/loan/request_loan.py b/loanpy/src/loan/request_loan.py
index 16eb783153a1cf292d81262d5c221a37efe27790..e582089bec41c772e5d564b59e032108c87cb5bf 100755
--- a/loanpy/src/loan/request_loan.py
+++ b/loanpy/src/loan/request_loan.py
@@ -83,8 +83,8 @@ def _check_data(data):
bad_references.append(item)
if bad_references:
raise ValueError(
- f"The following value(s) of {F_BOX} has/have the wrong type. It should be "
- f"integers or string representations thereof.\n{bad_references}")
+ f"The following value(s) of {F_BOX} has/have the wrong type. It should be "
+ f"integers or string representations thereof.\n{bad_references}")
assert_date_in_future(
data[F_EXPECTED_RETURN_DATE],
("The expected return date needs to be in the future."
diff --git a/test-profile/custom/other/restore/caosdb.2024-10-24T12:10:03.770053767+00:00.dump.sql b/test-profile/custom/other/restore/caosdb.dump.sql
similarity index 85%
rename from test-profile/custom/other/restore/caosdb.2024-10-24T12:10:03.770053767+00:00.dump.sql
rename to test-profile/custom/other/restore/caosdb.dump.sql
index 7c547b0a9108f6f7285fa4fbf0557fd578ce0577..d601c7cc4af447b9f2a110907559dba56599f48c 100644
--- a/test-profile/custom/other/restore/caosdb.2024-10-24T12:10:03.770053767+00:00.dump.sql
+++ b/test-profile/custom/other/restore/caosdb.dump.sql
@@ -1,8 +1,8 @@
--- MariaDB dump 10.19 Distrib 10.5.26-MariaDB, for debian-linux-gnu (x86_64)
+-- MariaDB dump 10.19 Distrib 10.11.6-MariaDB, for debian-linux-gnu (x86_64)
--
-- Host: sqldb Database: caosdb
-- ------------------------------------------------------
--- Server version 10.5.25-MariaDB-ubu2004
+-- Server version 10.11.9-MariaDB-ubu2204
/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -36,7 +36,7 @@ CREATE TABLE `archive_collection_type` (
CONSTRAINT `archive_collection_type_ibfk_1` FOREIGN KEY (`domain_id`) REFERENCES `entities` (`id`) ON DELETE CASCADE,
CONSTRAINT `archive_collection_type_ibfk_2` FOREIGN KEY (`entity_id`) REFERENCES `entities` (`id`) ON DELETE CASCADE,
CONSTRAINT `archive_collection_type_ibfk_3` FOREIGN KEY (`property_id`) REFERENCES `entities` (`id`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -71,7 +71,7 @@ CREATE TABLE `archive_data_type` (
CONSTRAINT `archive_data_type_ibfk_2` FOREIGN KEY (`entity_id`) REFERENCES `entities` (`id`) ON DELETE CASCADE,
CONSTRAINT `archive_data_type_ibfk_3` FOREIGN KEY (`property_id`) REFERENCES `entities` (`id`) ON DELETE CASCADE,
CONSTRAINT `archive_data_type_ibfk_4` FOREIGN KEY (`datatype`) REFERENCES `entities` (`id`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -105,7 +105,7 @@ CREATE TABLE `archive_date_data` (
CONSTRAINT `archive_date_data_ibfk_1` FOREIGN KEY (`domain_id`) REFERENCES `entities` (`id`) ON DELETE CASCADE,
CONSTRAINT `archive_date_data_ibfk_2` FOREIGN KEY (`entity_id`) REFERENCES `entities` (`id`) ON DELETE CASCADE,
CONSTRAINT `archive_date_data_ibfk_3` FOREIGN KEY (`property_id`) REFERENCES `entities` (`id`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -140,7 +140,7 @@ CREATE TABLE `archive_datetime_data` (
CONSTRAINT `archive_datetime_data_ibfk_1` FOREIGN KEY (`domain_id`) REFERENCES `entities` (`id`) ON DELETE CASCADE,
CONSTRAINT `archive_datetime_data_ibfk_2` FOREIGN KEY (`entity_id`) REFERENCES `entities` (`id`) ON DELETE CASCADE,
CONSTRAINT `archive_datetime_data_ibfk_3` FOREIGN KEY (`property_id`) REFERENCES `entities` (`id`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -173,7 +173,7 @@ CREATE TABLE `archive_desc_overrides` (
CONSTRAINT `archive_desc_overrides_ibfk_1` FOREIGN KEY (`domain_id`) REFERENCES `entities` (`id`) ON DELETE CASCADE,
CONSTRAINT `archive_desc_overrides_ibfk_2` FOREIGN KEY (`entity_id`) REFERENCES `entities` (`id`) ON DELETE CASCADE,
CONSTRAINT `archive_desc_overrides_ibfk_3` FOREIGN KEY (`property_id`) REFERENCES `entities` (`id`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -208,7 +208,7 @@ CREATE TABLE `archive_double_data` (
CONSTRAINT `archive_double_data_ibfk_1` FOREIGN KEY (`domain_id`) REFERENCES `entities` (`id`) ON DELETE CASCADE,
CONSTRAINT `archive_double_data_ibfk_2` FOREIGN KEY (`entity_id`) REFERENCES `entities` (`id`) ON DELETE CASCADE,
CONSTRAINT `archive_double_data_ibfk_3` FOREIGN KEY (`property_id`) REFERENCES `entities` (`id`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -237,7 +237,7 @@ CREATE TABLE `archive_entities` (
KEY `acl` (`acl`),
CONSTRAINT `archive_entities_ibfk_1` FOREIGN KEY (`id`, `_iversion`) REFERENCES `entity_version` (`entity_id`, `_iversion`) ON DELETE CASCADE,
CONSTRAINT `archive_entities_ibfk_2` FOREIGN KEY (`acl`) REFERENCES `entity_acl` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -246,7 +246,12 @@ CREATE TABLE `archive_entities` (
LOCK TABLES `archive_entities` WRITE;
/*!40000 ALTER TABLE `archive_entities` DISABLE KEYS */;
-INSERT INTO `archive_entities` VALUES (123,NULL,'RECORD',2,1);
+INSERT INTO `archive_entities` VALUES
+(101,NULL,'RECORDTYPE',2,1),
+(102,NULL,'RECORDTYPE',2,1),
+(103,NULL,'RECORDTYPE',2,1),
+(122,NULL,'RECORD',2,1),
+(123,NULL,'RECORD',2,1);
/*!40000 ALTER TABLE `archive_entities` ENABLE KEYS */;
UNLOCK TABLES;
@@ -272,7 +277,7 @@ CREATE TABLE `archive_enum_data` (
CONSTRAINT `archive_enum_data_ibfk_1` FOREIGN KEY (`domain_id`) REFERENCES `entities` (`id`) ON DELETE CASCADE,
CONSTRAINT `archive_enum_data_ibfk_2` FOREIGN KEY (`entity_id`) REFERENCES `entities` (`id`) ON DELETE CASCADE,
CONSTRAINT `archive_enum_data_ibfk_3` FOREIGN KEY (`property_id`) REFERENCES `entities` (`id`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -299,7 +304,7 @@ CREATE TABLE `archive_files` (
`_iversion` int(10) unsigned NOT NULL,
PRIMARY KEY (`file_id`,`_iversion`),
CONSTRAINT `archive_files_ibfk_1` FOREIGN KEY (`file_id`, `_iversion`) REFERENCES `entity_version` (`entity_id`, `_iversion`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -334,7 +339,7 @@ CREATE TABLE `archive_integer_data` (
CONSTRAINT `archive_integer_data_ibfk_1` FOREIGN KEY (`domain_id`) REFERENCES `entities` (`id`) ON DELETE CASCADE,
CONSTRAINT `archive_integer_data_ibfk_2` FOREIGN KEY (`entity_id`) REFERENCES `entities` (`id`) ON DELETE CASCADE,
CONSTRAINT `archive_integer_data_ibfk_3` FOREIGN KEY (`property_id`) REFERENCES `entities` (`id`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -362,7 +367,7 @@ CREATE TABLE `archive_isa` (
KEY `child` (`child`,`child_iversion`),
CONSTRAINT `archive_isa_ibfk_1` FOREIGN KEY (`parent`) REFERENCES `entities` (`id`) ON DELETE CASCADE,
CONSTRAINT `archive_isa_ibfk_2` FOREIGN KEY (`child`, `child_iversion`) REFERENCES `entity_version` (`entity_id`, `_iversion`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -371,7 +376,9 @@ CREATE TABLE `archive_isa` (
LOCK TABLES `archive_isa` WRITE;
/*!40000 ALTER TABLE `archive_isa` DISABLE KEYS */;
-INSERT INTO `archive_isa` VALUES (123,1,102,1);
+INSERT INTO `archive_isa` VALUES
+(123,1,102,1),
+(122,1,101,1);
/*!40000 ALTER TABLE `archive_isa` ENABLE KEYS */;
UNLOCK TABLES;
@@ -398,7 +405,7 @@ CREATE TABLE `archive_name_data` (
CONSTRAINT `archive_name_data_ibfk_1` FOREIGN KEY (`domain_id`) REFERENCES `entities` (`id`) ON DELETE CASCADE,
CONSTRAINT `archive_name_data_ibfk_2` FOREIGN KEY (`entity_id`) REFERENCES `entities` (`id`) ON DELETE CASCADE,
CONSTRAINT `archive_name_data_ibfk_3` FOREIGN KEY (`property_id`) REFERENCES `entities` (`id`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -407,7 +414,12 @@ CREATE TABLE `archive_name_data` (
LOCK TABLES `archive_name_data` WRITE;
/*!40000 ALTER TABLE `archive_name_data` DISABLE KEYS */;
-INSERT INTO `archive_name_data` VALUES (0,123,20,'Henrik','FIX',0,1);
+INSERT INTO `archive_name_data` VALUES
+(0,123,20,'Henrik','FIX',0,1),
+(0,101,20,'Box','FIX',0,1),
+(0,102,20,'Person','FIX',0,1),
+(0,103,20,'Loan','FIX',0,1),
+(0,122,20,'testbox','FIX',0,1);
/*!40000 ALTER TABLE `archive_name_data` ENABLE KEYS */;
UNLOCK TABLES;
@@ -432,7 +444,7 @@ CREATE TABLE `archive_name_overrides` (
CONSTRAINT `archive_name_overrides_ibfk_1` FOREIGN KEY (`domain_id`) REFERENCES `entities` (`id`) ON DELETE CASCADE,
CONSTRAINT `archive_name_overrides_ibfk_2` FOREIGN KEY (`entity_id`) REFERENCES `entities` (`id`) ON DELETE CASCADE,
CONSTRAINT `archive_name_overrides_ibfk_3` FOREIGN KEY (`property_id`) REFERENCES `entities` (`id`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -465,7 +477,7 @@ CREATE TABLE `archive_null_data` (
CONSTRAINT `archive_null_data_ibfk_1` FOREIGN KEY (`domain_id`) REFERENCES `entities` (`id`) ON DELETE CASCADE,
CONSTRAINT `archive_null_data_ibfk_2` FOREIGN KEY (`entity_id`) REFERENCES `entities` (`id`) ON DELETE CASCADE,
CONSTRAINT `archive_null_data_ibfk_3` FOREIGN KEY (`property_id`) REFERENCES `entities` (`id`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -490,7 +502,7 @@ CREATE TABLE `archive_query_template_def` (
`_iversion` int(10) unsigned NOT NULL,
PRIMARY KEY (`id`,`_iversion`),
CONSTRAINT `archive_query_template_def_ibfk_1` FOREIGN KEY (`id`, `_iversion`) REFERENCES `entity_version` (`entity_id`, `_iversion`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -527,7 +539,7 @@ CREATE TABLE `archive_reference_data` (
CONSTRAINT `archive_reference_data_ibfk_2` FOREIGN KEY (`entity_id`) REFERENCES `entities` (`id`) ON DELETE CASCADE,
CONSTRAINT `archive_reference_data_ibfk_3` FOREIGN KEY (`property_id`) REFERENCES `entities` (`id`) ON DELETE CASCADE,
CONSTRAINT `archive_reference_data_ibfk_4` FOREIGN KEY (`value`) REFERENCES `entities` (`id`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -561,7 +573,7 @@ CREATE TABLE `archive_text_data` (
CONSTRAINT `archive_text_data_ibfk_1` FOREIGN KEY (`domain_id`) REFERENCES `entities` (`id`) ON DELETE CASCADE,
CONSTRAINT `archive_text_data_ibfk_2` FOREIGN KEY (`entity_id`) REFERENCES `entities` (`id`) ON DELETE CASCADE,
CONSTRAINT `archive_text_data_ibfk_3` FOREIGN KEY (`property_id`) REFERENCES `entities` (`id`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -592,7 +604,7 @@ CREATE TABLE `collection_type` (
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;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -625,7 +637,7 @@ CREATE TABLE `data_type` (
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;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -634,7 +646,30 @@ CREATE 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),(0,0,104,14),(0,0,105,14),(0,0,106,14),(0,0,110,14),(0,0,113,14),(0,0,121,14),(0,0,114,15),(0,0,115,15),(0,0,116,15),(0,0,117,15),(0,0,118,15),(0,0,119,15),(0,0,120,15),(0,0,111,18),(0,0,112,102),(0,0,108,107),(0,0,109,107);
+INSERT INTO `data_type` VALUES
+(0,0,20,14),
+(0,0,21,14),
+(0,0,24,14),
+(0,0,104,14),
+(0,0,105,14),
+(0,0,106,14),
+(0,0,110,14),
+(0,0,113,14),
+(0,0,121,14),
+(0,0,114,15),
+(0,0,115,15),
+(0,0,116,15),
+(0,0,117,15),
+(0,0,118,15),
+(0,0,119,15),
+(0,0,120,15),
+(0,0,125,15),
+(0,0,111,18),
+(0,103,126,101),
+(0,0,112,102),
+(0,0,108,107),
+(0,0,109,107),
+(0,101,126,107);
/*!40000 ALTER TABLE `data_type` ENABLE KEYS */;
UNLOCK TABLES;
@@ -658,7 +693,7 @@ CREATE TABLE `date_data` (
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;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -691,7 +726,7 @@ CREATE TABLE `datetime_data` (
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;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -722,7 +757,7 @@ CREATE TABLE `desc_overrides` (
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;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -755,7 +790,7 @@ CREATE TABLE `double_data` (
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;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -782,7 +817,7 @@ CREATE TABLE `entities` (
PRIMARY KEY (`id`),
KEY `entity_entity_acl` (`acl`),
CONSTRAINT `entity_entity_acl` FOREIGN KEY (`acl`) REFERENCES `entity_acl` (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=125 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=127 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -791,7 +826,51 @@ CREATE TABLE `entities` (
LOCK TABLES `entities` WRITE;
/*!40000 ALTER TABLE `entities` DISABLE KEYS */;
-INSERT INTO `entities` VALUES (0,'The default domain.','ROLE',0),(1,'The default recordtype.','ROLE',0),(2,'The default record.','ROLE',0),(3,'The default file.','ROLE',0),(4,'The default property.','ROLE',0),(7,'The default datatype.','ROLE',0),(8,'The QueryTemplate role.','ROLE',0),(11,'The default reference data type.','DATATYPE',0),(12,'The default integer data type.','DATATYPE',0),(13,'The default double data type.','DATATYPE',0),(14,'The default text data type.','DATATYPE',0),(15,'The default datetime data type.','DATATYPE',0),(16,'The default timespan data type.','DATATYPE',0),(17,'The default file reference data type.','DATATYPE',0),(18,'The defaulf boolean data type','DATATYPE',0),(20,'Name of an entity','PROPERTY',0),(21,'Unit of an entity.','PROPERTY',0),(24,'Description of an entity.','PROPERTY',0),(101,NULL,'RECORDTYPE',2),(102,NULL,'RECORDTYPE',2),(103,NULL,'RECORDTYPE',2),(104,NULL,'PROPERTY',2),(105,NULL,'PROPERTY',2),(106,NULL,'PROPERTY',2),(107,NULL,'RECORDTYPE',2),(108,NULL,'PROPERTY',2),(109,NULL,'PROPERTY',2),(110,NULL,'PROPERTY',2),(111,NULL,'PROPERTY',2),(112,NULL,'PROPERTY',2),(113,NULL,'PROPERTY',2),(114,NULL,'PROPERTY',2),(115,NULL,'PROPERTY',2),(116,NULL,'PROPERTY',2),(117,NULL,'PROPERTY',2),(118,NULL,'PROPERTY',2),(119,NULL,'PROPERTY',2),(120,NULL,'PROPERTY',2),(121,NULL,'PROPERTY',2),(122,NULL,'RECORD',2),(123,NULL,'RECORD',2),(124,NULL,'RECORD',2);
+INSERT INTO `entities` VALUES
+(0,'The default domain.','ROLE',0),
+(1,'The default recordtype.','ROLE',0),
+(2,'The default record.','ROLE',0),
+(3,'The default file.','ROLE',0),
+(4,'The default property.','ROLE',0),
+(7,'The default datatype.','ROLE',0),
+(8,'The QueryTemplate role.','ROLE',0),
+(11,'The default reference data type.','DATATYPE',0),
+(12,'The default integer data type.','DATATYPE',0),
+(13,'The default double data type.','DATATYPE',0),
+(14,'The default text data type.','DATATYPE',0),
+(15,'The default datetime data type.','DATATYPE',0),
+(16,'The default timespan data type.','DATATYPE',0),
+(17,'The default file reference data type.','DATATYPE',0),
+(18,'The defaulf boolean data type','DATATYPE',0),
+(20,'Name of an entity','PROPERTY',0),
+(21,'Unit of an entity.','PROPERTY',0),
+(24,'Description of an entity.','PROPERTY',0),
+(101,NULL,'RECORDTYPE',2),
+(102,NULL,'RECORDTYPE',2),
+(103,NULL,'RECORDTYPE',2),
+(104,NULL,'PROPERTY',2),
+(105,NULL,'PROPERTY',2),
+(106,NULL,'PROPERTY',2),
+(107,NULL,'RECORDTYPE',2),
+(108,NULL,'PROPERTY',2),
+(109,NULL,'PROPERTY',2),
+(110,NULL,'PROPERTY',2),
+(111,NULL,'PROPERTY',2),
+(112,NULL,'PROPERTY',2),
+(113,NULL,'PROPERTY',2),
+(114,NULL,'PROPERTY',2),
+(115,NULL,'PROPERTY',2),
+(116,NULL,'PROPERTY',2),
+(117,NULL,'PROPERTY',2),
+(118,NULL,'PROPERTY',2),
+(119,NULL,'PROPERTY',2),
+(120,NULL,'PROPERTY',2),
+(121,NULL,'PROPERTY',2),
+(122,NULL,'RECORD',2),
+(123,NULL,'RECORD',2),
+(124,NULL,'RECORD',2),
+(125,NULL,'PROPERTY',2),
+(126,NULL,'_REPLACEMENT',0);
/*!40000 ALTER TABLE `entities` ENABLE KEYS */;
UNLOCK TABLES;
@@ -807,7 +886,7 @@ CREATE TABLE `entity_acl` (
`acl` varbinary(65525) NOT NULL,
PRIMARY KEY (`id`),
KEY `entity_acl_acl` (`acl`(3072))
-) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -816,7 +895,9 @@ CREATE TABLE `entity_acl` (
LOCK TABLES `entity_acl` WRITE;
/*!40000 ALTER TABLE `entity_acl` DISABLE KEYS */;
-INSERT INTO `entity_acl` VALUES (0,''),(2,'[{\"realm\":\"PAM\",\"bitSet\":536608371,\"username\":\"admin\"}]');
+INSERT INTO `entity_acl` VALUES
+(0,''),
+(2,'[{\"realm\":\"PAM\",\"bitSet\":536608371,\"username\":\"admin\"}]');
/*!40000 ALTER TABLE `entity_acl` ENABLE KEYS */;
UNLOCK TABLES;
@@ -842,7 +923,49 @@ CREATE TABLE `entity_ids` (
LOCK TABLES `entity_ids` WRITE;
/*!40000 ALTER TABLE `entity_ids` DISABLE KEYS */;
-INSERT INTO `entity_ids` VALUES ('1',1),('2',2),('3',3),('4',4),('7',7),('8',8),('11',11),('12',12),('13',13),('14',14),('15',15),('16',16),('17',17),('18',18),('20',20),('21',21),('24',24),('102',101),('103',102),('104',103),('105',104),('106',105),('107',106),('108',107),('109',108),('110',109),('111',110),('112',111),('113',112),('114',113),('115',114),('116',115),('117',116),('118',117),('119',118),('120',119),('121',120),('122',121),('123',122),('124',123),('125',124);
+INSERT INTO `entity_ids` VALUES
+('1',1),
+('2',2),
+('3',3),
+('4',4),
+('7',7),
+('8',8),
+('11',11),
+('12',12),
+('13',13),
+('14',14),
+('15',15),
+('16',16),
+('17',17),
+('18',18),
+('20',20),
+('21',21),
+('24',24),
+('102',101),
+('103',102),
+('104',103),
+('105',104),
+('106',105),
+('107',106),
+('108',107),
+('109',108),
+('110',109),
+('111',110),
+('112',111),
+('113',112),
+('114',113),
+('115',114),
+('116',115),
+('117',116),
+('118',117),
+('119',118),
+('120',119),
+('121',120),
+('122',121),
+('123',122),
+('124',123),
+('125',124),
+('126',125);
/*!40000 ALTER TABLE `entity_ids` ENABLE KEYS */;
UNLOCK TABLES;
@@ -865,7 +988,7 @@ CREATE TABLE `entity_version` (
KEY `srid` (`srid`),
CONSTRAINT `entity_version_ibfk_1` FOREIGN KEY (`entity_id`) REFERENCES `entities` (`id`) ON DELETE CASCADE,
CONSTRAINT `entity_version_ibfk_2` FOREIGN KEY (`srid`) REFERENCES `transactions` (`srid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -874,7 +997,55 @@ CREATE TABLE `entity_version` (
LOCK TABLES `entity_version` WRITE;
/*!40000 ALTER TABLE `entity_version` DISABLE KEYS */;
-INSERT INTO `entity_version` VALUES (0,NULL,'17a614da482783fc501c21a98a83d8b44d8d3f9b',1,NULL,'cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e'),(1,NULL,'84f03d370353770d71e7dc07f9f00c263f026e22',1,NULL,'cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e'),(2,NULL,'2d2faa9bdbc4cd48f3fcaac54c52668b7c5f1f1c',1,NULL,'cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e'),(3,NULL,'fa65b9b783c36ff694d9212df96d05e637fd9ecb',1,NULL,'cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e'),(4,NULL,'07de7952f1651ba3b69117d285ccf28c5ca7d956',1,NULL,'cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e'),(7,NULL,'2b0276af86c02ac33ceebaaea2a71497a72b2ec1',1,NULL,'cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e'),(8,NULL,'a5b6b050ccc5ac04fd7078c8dfabad9fd5b59b6b',1,NULL,'cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e'),(11,NULL,'da8e07ee8867b385db7e553bc8da0d8875deeef1',1,NULL,'cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e'),(12,NULL,'f572e439aac441e4e58773316dbba38ae6404907',1,NULL,'cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e'),(13,NULL,'2f9537d5434141dc620487ea7ecef8ef8c6915dd',1,NULL,'cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e'),(14,NULL,'9658a375370fa8a14026723ed25ea8bffebf4f6b',1,NULL,'cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e'),(15,NULL,'04bff2ab282998c327e8f5f460db277e5a3d58fb',1,NULL,'cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e'),(16,NULL,'d3627fe225cfa2381f690de434728d0f546cc8bf',1,NULL,'cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e'),(17,NULL,'7aa80399376a1912fdc2a996056cab71c1d8c42d',1,NULL,'cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e'),(18,NULL,'2ef88447ea48cfb21f11cbb2583f86d3d2cda088',1,NULL,'cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e'),(20,NULL,'75462fb8fe9b2c696cbb9c5e82038c32e6b814c4',1,NULL,'cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e'),(21,NULL,'5432f3086adbded25101e36d11e3d1948611c49c',1,NULL,'cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e'),(24,NULL,'29a85dbc0ca204bdb436261cbb429415e2485344',1,NULL,'cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e'),(101,NULL,'6e5103dc495751a2f1725913796fea0e70881ad9',1,NULL,'abbefec0-f108-4026-a473-5587c5e8eb63'),(102,NULL,'809d3320f8d23dae6aa8d2328ba2c004c4b20c16',1,NULL,'abbefec0-f108-4026-a473-5587c5e8eb63'),(103,NULL,'61dc0b1ca2124c5c95ec5a5623e89456ed44946f',1,NULL,'abbefec0-f108-4026-a473-5587c5e8eb63'),(104,NULL,'a721a7d53605f921502ce588e7188af65dba0c0b',1,NULL,'abbefec0-f108-4026-a473-5587c5e8eb63'),(105,NULL,'810ece5493caba000c786a0f215d879f6cadf357',1,NULL,'abbefec0-f108-4026-a473-5587c5e8eb63'),(106,NULL,'723837036edd5d57f74d426238aade49dbccf8a8',1,NULL,'abbefec0-f108-4026-a473-5587c5e8eb63'),(107,NULL,'32b1a490388f353fb87bba19f27c9c559122320e',1,NULL,'abbefec0-f108-4026-a473-5587c5e8eb63'),(108,NULL,'256ac05a671702d60606ddd82d9adea643423649',1,NULL,'abbefec0-f108-4026-a473-5587c5e8eb63'),(109,NULL,'7445d9c906c0cc31a64125ec0b56bdf21f78110d',1,NULL,'abbefec0-f108-4026-a473-5587c5e8eb63'),(110,NULL,'f81cd557678b9945e348ff760d25c4aa39489d81',1,NULL,'abbefec0-f108-4026-a473-5587c5e8eb63'),(111,NULL,'dbcb7cb1af1e7e6e5d1debd32ac6e48f078cb132',1,NULL,'abbefec0-f108-4026-a473-5587c5e8eb63'),(112,NULL,'3500ef2ac065dfb8ebb165e7f63d79e4a865d6d3',1,NULL,'abbefec0-f108-4026-a473-5587c5e8eb63'),(113,NULL,'bcd266dcdd0092db03d4ab4e085fce6c02130662',1,NULL,'abbefec0-f108-4026-a473-5587c5e8eb63'),(114,NULL,'8aaf53ebae47c36e6e9a2d43b5901b537960cdd6',1,NULL,'abbefec0-f108-4026-a473-5587c5e8eb63'),(115,NULL,'89a21931d88c773f9e1cb2f0ed875a534ede2a02',1,NULL,'abbefec0-f108-4026-a473-5587c5e8eb63'),(116,NULL,'f5f038e5b805189cfd68f7ca226812d461906527',1,NULL,'abbefec0-f108-4026-a473-5587c5e8eb63'),(117,NULL,'6a2a4249f11cc0f500c4fb3e34eb205e149372d2',1,NULL,'abbefec0-f108-4026-a473-5587c5e8eb63'),(118,NULL,'8da92f3a5bc2a7f0b1f732c8bd401ea64a746b65',1,NULL,'abbefec0-f108-4026-a473-5587c5e8eb63'),(119,NULL,'1191dd8cc6affe5a6492b69a076d525f85983597',1,NULL,'abbefec0-f108-4026-a473-5587c5e8eb63'),(120,NULL,'daf4ee1d70d498fbfc0c2817ebca3e8adbd0e865',1,NULL,'abbefec0-f108-4026-a473-5587c5e8eb63'),(121,NULL,'283572b2be74db29d67eeb823f94dffd4c35a6fb',1,NULL,'abbefec0-f108-4026-a473-5587c5e8eb63'),(122,NULL,'7c5a3606c58f2635accc03e32aec66990d3b03f1',1,NULL,'87b61c68-1b6b-48a9-915b-2533b6ccbf15'),(123,NULL,'f909c629e787d72e449e81508409c4a0acc0fb10',1,NULL,'d3dd1cca-cf29-42a5-aec1-0c162df9fc5e'),(123,NULL,'40aa3d619b1bd2c8ee787845542d82d03dbe6360',2,1,'b0e78639-d3e9-454d-aaac-856f5299d47d'),(124,NULL,'564c8b4954b94590e83769a5bc367f13cbaaca91',1,NULL,'f01fac04-1f04-4cec-955b-4aa091c29f5c');
+INSERT INTO `entity_version` VALUES
+(0,NULL,'17a614da482783fc501c21a98a83d8b44d8d3f9b',1,NULL,'cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e'),
+(1,NULL,'84f03d370353770d71e7dc07f9f00c263f026e22',1,NULL,'cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e'),
+(2,NULL,'2d2faa9bdbc4cd48f3fcaac54c52668b7c5f1f1c',1,NULL,'cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e'),
+(3,NULL,'fa65b9b783c36ff694d9212df96d05e637fd9ecb',1,NULL,'cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e'),
+(4,NULL,'07de7952f1651ba3b69117d285ccf28c5ca7d956',1,NULL,'cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e'),
+(7,NULL,'2b0276af86c02ac33ceebaaea2a71497a72b2ec1',1,NULL,'cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e'),
+(8,NULL,'a5b6b050ccc5ac04fd7078c8dfabad9fd5b59b6b',1,NULL,'cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e'),
+(11,NULL,'da8e07ee8867b385db7e553bc8da0d8875deeef1',1,NULL,'cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e'),
+(12,NULL,'f572e439aac441e4e58773316dbba38ae6404907',1,NULL,'cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e'),
+(13,NULL,'2f9537d5434141dc620487ea7ecef8ef8c6915dd',1,NULL,'cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e'),
+(14,NULL,'9658a375370fa8a14026723ed25ea8bffebf4f6b',1,NULL,'cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e'),
+(15,NULL,'04bff2ab282998c327e8f5f460db277e5a3d58fb',1,NULL,'cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e'),
+(16,NULL,'d3627fe225cfa2381f690de434728d0f546cc8bf',1,NULL,'cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e'),
+(17,NULL,'7aa80399376a1912fdc2a996056cab71c1d8c42d',1,NULL,'cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e'),
+(18,NULL,'2ef88447ea48cfb21f11cbb2583f86d3d2cda088',1,NULL,'cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e'),
+(20,NULL,'75462fb8fe9b2c696cbb9c5e82038c32e6b814c4',1,NULL,'cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e'),
+(21,NULL,'5432f3086adbded25101e36d11e3d1948611c49c',1,NULL,'cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e'),
+(24,NULL,'29a85dbc0ca204bdb436261cbb429415e2485344',1,NULL,'cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e'),
+(101,NULL,'6e5103dc495751a2f1725913796fea0e70881ad9',1,NULL,'abbefec0-f108-4026-a473-5587c5e8eb63'),
+(101,NULL,'add33a0ea854c88e41ebc33efee0ad6371e31f6f',2,1,'49cbd7aa-8c34-46a6-b291-134fd2f16afb'),
+(102,NULL,'809d3320f8d23dae6aa8d2328ba2c004c4b20c16',1,NULL,'abbefec0-f108-4026-a473-5587c5e8eb63'),
+(102,NULL,'3eda50eb3d735c1f6798a52a3fba2d8ae5da340b',2,1,'49cbd7aa-8c34-46a6-b291-134fd2f16afb'),
+(103,NULL,'61dc0b1ca2124c5c95ec5a5623e89456ed44946f',1,NULL,'abbefec0-f108-4026-a473-5587c5e8eb63'),
+(103,NULL,'48f2c20151bcc6641a0fce491cce24f37b5c7f59',2,1,'49cbd7aa-8c34-46a6-b291-134fd2f16afb'),
+(104,NULL,'a721a7d53605f921502ce588e7188af65dba0c0b',1,NULL,'abbefec0-f108-4026-a473-5587c5e8eb63'),
+(105,NULL,'810ece5493caba000c786a0f215d879f6cadf357',1,NULL,'abbefec0-f108-4026-a473-5587c5e8eb63'),
+(106,NULL,'723837036edd5d57f74d426238aade49dbccf8a8',1,NULL,'abbefec0-f108-4026-a473-5587c5e8eb63'),
+(107,NULL,'32b1a490388f353fb87bba19f27c9c559122320e',1,NULL,'abbefec0-f108-4026-a473-5587c5e8eb63'),
+(108,NULL,'256ac05a671702d60606ddd82d9adea643423649',1,NULL,'abbefec0-f108-4026-a473-5587c5e8eb63'),
+(109,NULL,'7445d9c906c0cc31a64125ec0b56bdf21f78110d',1,NULL,'abbefec0-f108-4026-a473-5587c5e8eb63'),
+(110,NULL,'f81cd557678b9945e348ff760d25c4aa39489d81',1,NULL,'abbefec0-f108-4026-a473-5587c5e8eb63'),
+(111,NULL,'dbcb7cb1af1e7e6e5d1debd32ac6e48f078cb132',1,NULL,'abbefec0-f108-4026-a473-5587c5e8eb63'),
+(112,NULL,'3500ef2ac065dfb8ebb165e7f63d79e4a865d6d3',1,NULL,'abbefec0-f108-4026-a473-5587c5e8eb63'),
+(113,NULL,'bcd266dcdd0092db03d4ab4e085fce6c02130662',1,NULL,'abbefec0-f108-4026-a473-5587c5e8eb63'),
+(114,NULL,'8aaf53ebae47c36e6e9a2d43b5901b537960cdd6',1,NULL,'abbefec0-f108-4026-a473-5587c5e8eb63'),
+(115,NULL,'89a21931d88c773f9e1cb2f0ed875a534ede2a02',1,NULL,'abbefec0-f108-4026-a473-5587c5e8eb63'),
+(116,NULL,'f5f038e5b805189cfd68f7ca226812d461906527',1,NULL,'abbefec0-f108-4026-a473-5587c5e8eb63'),
+(117,NULL,'6a2a4249f11cc0f500c4fb3e34eb205e149372d2',1,NULL,'abbefec0-f108-4026-a473-5587c5e8eb63'),
+(118,NULL,'8da92f3a5bc2a7f0b1f732c8bd401ea64a746b65',1,NULL,'abbefec0-f108-4026-a473-5587c5e8eb63'),
+(119,NULL,'1191dd8cc6affe5a6492b69a076d525f85983597',1,NULL,'abbefec0-f108-4026-a473-5587c5e8eb63'),
+(120,NULL,'daf4ee1d70d498fbfc0c2817ebca3e8adbd0e865',1,NULL,'abbefec0-f108-4026-a473-5587c5e8eb63'),
+(121,NULL,'283572b2be74db29d67eeb823f94dffd4c35a6fb',1,NULL,'abbefec0-f108-4026-a473-5587c5e8eb63'),
+(122,NULL,'7c5a3606c58f2635accc03e32aec66990d3b03f1',1,NULL,'87b61c68-1b6b-48a9-915b-2533b6ccbf15'),
+(122,NULL,'f9b9c7eda512b9cfe37aeb920d0da608b3c09c63',2,1,'a5b91491-1c8c-44b5-b223-8c8fd44dc1c3'),
+(123,NULL,'f909c629e787d72e449e81508409c4a0acc0fb10',1,NULL,'d3dd1cca-cf29-42a5-aec1-0c162df9fc5e'),
+(123,NULL,'40aa3d619b1bd2c8ee787845542d82d03dbe6360',2,1,'b0e78639-d3e9-454d-aaac-856f5299d47d'),
+(124,NULL,'564c8b4954b94590e83769a5bc367f13cbaaca91',1,NULL,'f01fac04-1f04-4cec-955b-4aa091c29f5c'),
+(125,NULL,'09e8317ee136da2e5c4ff2e7289a5d95bf7c76c8',1,NULL,'8c4d8797-0c40-479d-a648-813bba41819f');
/*!40000 ALTER TABLE `entity_version` ENABLE KEYS */;
UNLOCK TABLES;
@@ -898,7 +1069,7 @@ CREATE TABLE `enum_data` (
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;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -921,7 +1092,7 @@ CREATE TABLE `feature_config` (
`_key` varchar(255) NOT NULL,
`_value` varchar(255) DEFAULT NULL,
PRIMARY KEY (`_key`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -930,7 +1101,8 @@ CREATE TABLE `feature_config` (
LOCK TABLES `feature_config` WRITE;
/*!40000 ALTER TABLE `feature_config` DISABLE KEYS */;
-INSERT INTO `feature_config` VALUES ('ENTITY_VERSIONING','ENABLED');
+INSERT INTO `feature_config` VALUES
+('ENTITY_VERSIONING','ENABLED');
/*!40000 ALTER TABLE `feature_config` ENABLE KEYS */;
UNLOCK TABLES;
@@ -949,7 +1121,7 @@ CREATE TABLE `files` (
`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;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -982,7 +1154,7 @@ CREATE TABLE `integer_data` (
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;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -1009,7 +1181,7 @@ CREATE TABLE `isa_cache` (
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;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -1018,7 +1190,10 @@ CREATE TABLE `isa_cache` (
LOCK TABLES `isa_cache` WRITE;
/*!40000 ALTER TABLE `isa_cache` DISABLE KEYS */;
-INSERT INTO `isa_cache` VALUES (122,101,'122'),(123,102,'123'),(124,107,'124');
+INSERT INTO `isa_cache` VALUES
+(122,101,'122'),
+(123,102,'123'),
+(124,107,'124');
/*!40000 ALTER TABLE `isa_cache` ENABLE KEYS */;
UNLOCK TABLES;
@@ -1044,7 +1219,7 @@ CREATE TABLE `name_data` (
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;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -1053,7 +1228,50 @@ CREATE TABLE `name_data` (
LOCK TABLES `name_data` WRITE;
/*!40000 ALTER TABLE `name_data` DISABLE KEYS */;
-INSERT INTO `name_data` VALUES (0,0,20,'DOMAIN','FIX',0),(0,1,20,'RECORDTYPE','FIX',0),(0,2,20,'RECORD','FIX',0),(0,3,20,'FILE','FIX',0),(0,4,20,'PROPERTY','FIX',0),(0,7,20,'DATATYPE','FIX',0),(0,8,20,'QUERYTEMPLATE','FIX',0),(0,11,20,'REFERENCE','FIX',0),(0,12,20,'INTEGER','FIX',0),(0,13,20,'DOUBLE','FIX',0),(0,14,20,'TEXT','FIX',0),(0,15,20,'DATETIME','FIX',0),(0,16,20,'TIMESPAN','FIX',0),(0,17,20,'FILE','FIX',0),(0,18,20,'BOOLEAN','FIX',0),(0,20,20,'name','FIX',0),(0,21,20,'unit','FIX',0),(0,24,20,'description','FIX',0),(0,101,20,'Box','FIX',0),(0,102,20,'Person','FIX',0),(0,103,20,'Loan','FIX',0),(0,104,20,'firstName','FIX',0),(0,105,20,'lastName','FIX',0),(0,106,20,'email','FIX',0),(0,107,20,'Location','FIX',0),(0,108,20,'LoanLocation','FIX',0),(0,109,20,'ReturnLocation','FIX',0),(0,110,20,'comment','FIX',0),(0,111,20,'exhaustContents','FIX',0),(0,112,20,'Borrower','FIX',0),(0,113,20,'Content','FIX',0),(0,114,20,'loanRequested','FIX',0),(0,115,20,'expectedReturn','FIX',0),(0,116,20,'loanAccepted','FIX',0),(0,117,20,'lent','FIX',0),(0,118,20,'returnRequested','FIX',0),(0,119,20,'returnAccepted','FIX',0),(0,120,20,'returned','FIX',0),(0,121,20,'Number','FIX',0),(0,122,20,'testbox','FIX',0),(0,123,20,'Henrik','FIX',0),(0,124,20,'im Büro','FIX',0);
+INSERT INTO `name_data` VALUES
+(0,0,20,'DOMAIN','FIX',0),
+(0,1,20,'RECORDTYPE','FIX',0),
+(0,2,20,'RECORD','FIX',0),
+(0,3,20,'FILE','FIX',0),
+(0,4,20,'PROPERTY','FIX',0),
+(0,7,20,'DATATYPE','FIX',0),
+(0,8,20,'QUERYTEMPLATE','FIX',0),
+(0,11,20,'REFERENCE','FIX',0),
+(0,12,20,'INTEGER','FIX',0),
+(0,13,20,'DOUBLE','FIX',0),
+(0,14,20,'TEXT','FIX',0),
+(0,15,20,'DATETIME','FIX',0),
+(0,16,20,'TIMESPAN','FIX',0),
+(0,17,20,'FILE','FIX',0),
+(0,18,20,'BOOLEAN','FIX',0),
+(0,20,20,'name','FIX',0),
+(0,21,20,'unit','FIX',0),
+(0,24,20,'description','FIX',0),
+(0,101,20,'Box','FIX',0),
+(0,102,20,'Person','FIX',0),
+(0,103,20,'Loan','FIX',0),
+(0,104,20,'firstName','FIX',0),
+(0,105,20,'lastName','FIX',0),
+(0,106,20,'email','FIX',0),
+(0,107,20,'Location','FIX',0),
+(0,108,20,'LoanLocation','FIX',0),
+(0,109,20,'ReturnLocation','FIX',0),
+(0,110,20,'comment','FIX',0),
+(0,111,20,'exhaustContents','FIX',0),
+(0,112,20,'Borrower','FIX',0),
+(0,113,20,'Content','FIX',0),
+(0,114,20,'loanRequested','FIX',0),
+(0,115,20,'expectedReturn','FIX',0),
+(0,116,20,'loanAccepted','FIX',0),
+(0,117,20,'lent','FIX',0),
+(0,118,20,'returnRequested','FIX',0),
+(0,119,20,'returnAccepted','FIX',0),
+(0,120,20,'returned','FIX',0),
+(0,121,20,'Number','FIX',0),
+(0,122,20,'testbox','FIX',0),
+(0,123,20,'Henrik','FIX',0),
+(0,124,20,'im Büro','FIX',0),
+(0,125,20,'expected_return','FIX',0);
/*!40000 ALTER TABLE `name_data` ENABLE KEYS */;
UNLOCK TABLES;
@@ -1076,7 +1294,7 @@ CREATE TABLE `name_overrides` (
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;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -1107,7 +1325,7 @@ CREATE TABLE `null_data` (
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;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -1116,6 +1334,27 @@ CREATE TABLE `null_data` (
LOCK TABLES `null_data` WRITE;
/*!40000 ALTER TABLE `null_data` DISABLE KEYS */;
+INSERT INTO `null_data` VALUES
+(0,101,126,'RECOMMENDED',0),
+(0,101,113,'RECOMMENDED',1),
+(0,101,121,'RECOMMENDED',2),
+(0,102,104,'RECOMMENDED',0),
+(0,102,105,'RECOMMENDED',1),
+(0,102,106,'RECOMMENDED',2),
+(0,103,126,'RECOMMENDED',0),
+(0,103,112,'RECOMMENDED',1),
+(0,103,125,'RECOMMENDED',2),
+(0,103,111,'RECOMMENDED',3),
+(0,103,110,'RECOMMENDED',4),
+(0,103,108,'RECOMMENDED',5),
+(0,103,114,'RECOMMENDED',6),
+(0,103,116,'RECOMMENDED',7),
+(0,103,117,'RECOMMENDED',8),
+(0,103,118,'RECOMMENDED',9),
+(0,103,113,'RECOMMENDED',10),
+(0,103,109,'RECOMMENDED',11),
+(0,103,119,'RECOMMENDED',12),
+(0,103,120,'RECOMMENDED',13);
/*!40000 ALTER TABLE `null_data` ENABLE KEYS */;
UNLOCK TABLES;
@@ -1133,7 +1372,7 @@ CREATE TABLE `passwd` (
`it` int(10) unsigned DEFAULT 5000,
`salt` varbinary(255) NOT NULL,
PRIMARY KEY (`principal`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -1157,7 +1396,7 @@ CREATE TABLE `permissions` (
`permissions` mediumtext NOT NULL,
PRIMARY KEY (`role`),
CONSTRAINT `perm_name_roles` FOREIGN KEY (`role`) REFERENCES `roles` (`name`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -1166,7 +1405,8 @@ CREATE TABLE `permissions` (
LOCK TABLES `permissions` WRITE;
/*!40000 ALTER TABLE `permissions` DISABLE KEYS */;
-INSERT INTO `permissions` VALUES ('administration','[{\"grant\":\"true\",\"priority\":\"true\",\"permission\":\"*\"}]');
+INSERT INTO `permissions` VALUES
+('administration','[{\"grant\":\"true\",\"priority\":\"true\",\"permission\":\"*\"}]');
/*!40000 ALTER TABLE `permissions` ENABLE KEYS */;
UNLOCK TABLES;
@@ -1182,7 +1422,7 @@ CREATE TABLE `query_template_def` (
`definition` mediumtext 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;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -1218,7 +1458,7 @@ CREATE TABLE `reference_data` (
CONSTRAINT `ref_property_id_entity` FOREIGN KEY (`property_id`) REFERENCES `entities` (`id`),
CONSTRAINT `ref_value_entity` FOREIGN KEY (`value`) REFERENCES `entities` (`id`),
CONSTRAINT `reference_data_ibfk_1` FOREIGN KEY (`value`, `value_iversion`) REFERENCES `entity_version` (`entity_id`, `_iversion`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -1227,6 +1467,9 @@ CREATE TABLE `reference_data` (
LOCK TABLES `reference_data` WRITE;
/*!40000 ALTER TABLE `reference_data` DISABLE KEYS */;
+INSERT INTO `reference_data` VALUES
+(0,101,107,126,'REPLACEMENT',0,NULL),
+(0,103,101,126,'REPLACEMENT',0,NULL);
/*!40000 ALTER TABLE `reference_data` ENABLE KEYS */;
UNLOCK TABLES;
@@ -1241,7 +1484,7 @@ CREATE TABLE `roles` (
`name` varbinary(255) NOT NULL,
`description` mediumtext DEFAULT NULL,
PRIMARY KEY (`name`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -1250,7 +1493,9 @@ CREATE 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.');
+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;
@@ -1265,7 +1510,7 @@ CREATE TABLE `stats` (
`name` varchar(255) NOT NULL,
`value` blob DEFAULT NULL,
PRIMARY KEY (`name`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -1274,7 +1519,8 @@ CREATE TABLE `stats` (
LOCK TABLES `stats` WRITE;
/*!40000 ALTER TABLE `stats` DISABLE KEYS */;
-INSERT INTO `stats` VALUES ('RootBenchmark','¬í\0sr\0-org.caosdb.server.database.misc.RootBenchmarkþ¼ƒQk]\0\0xr\04org.caosdb.server.database.misc.TransactionBenchmarkþ¼ƒQk]\0J\0sinceL\0 measurementst\0Ljava/util/Map;[\0stackTraceElementst\0 [Ljava/lang/StackTraceElement;L\0\rsubBenchmarksq\0~\0xp\0\0’¾lŠÿsr\0java.util.HashMapÚÁÃ`Ñ\0F\0\nloadFactorI\0 thresholdxp?@\0\0\0\0\0\0w\0\0\0\0\0\0\0xur\0 [Ljava.lang.StackTraceElement;F*<<ý\"9\0\0xp\0\0\0sr\0java.lang.StackTraceElementa Åš&6Ý…\0B\0formatI\0\nlineNumberL\0classLoaderNamet\0Ljava/lang/String;L\0declaringClassq\0~\0\nL\0fileNameq\0~\0\nL\0\nmethodNameq\0~\0\nL\0\nmoduleNameq\0~\0\nL\0\rmoduleVersionq\0~\0\nxp\0\0Bpt\0java.lang.Threadt\0 Thread.javat\0\rgetStackTracet\0 java.baset\011.0.24sq\0~\0 \0\0!t\0appt\04org.caosdb.server.database.misc.TransactionBenchmarkt\0TransactionBenchmark.javat\0<init>ppsq\0~\0 \0\0\0ƒq\0~\0t\0-org.caosdb.server.database.misc.RootBenchmarkq\0~\0q\0~\0ppsq\0~\0 \0\0q\0~\0q\0~\0q\0~\0t\0<clinit>ppsq\0~\0 \0\0fq\0~\0t\0 org.caosdb.server.CaosDBServert\0CaosDBServer.javat\0 initBackendppsq\0~\0 \0\0\0 q\0~\0q\0~\0q\0~\0 t\0mainppsq\0~\0?@\0\0\0\0\0 w\0\0\0\0\0\0t\0Infosr\0,org.caosdb.server.database.misc.SubBenchmarkþ¼ƒQk]\0L\0nameq\0~\0\nxq\0~\0\0\0’¾l‹sq\0~\0?@\0\0\0\0\0\0w\0\0\0\0\0\0\0xuq\0~\0\0\0\0\nsq\0~\0 \0\0Bpq\0~\0 q\0~\0\rq\0~\0q\0~\0q\0~\0sq\0~\0 \0\0!q\0~\0q\0~\0q\0~\0q\0~\0ppsq\0~\0 \0\0\0×q\0~\0t\0,org.caosdb.server.database.misc.SubBenchmarkq\0~\0q\0~\0ppsq\0~\0 \0\0šq\0~\0q\0~\0q\0~\0t\0 getBenchmarkppsq\0~\0 \0\0£q\0~\0q\0~\0q\0~\0q\0~\0+ppsq\0~\0 \0\0\0$q\0~\0t\02org.caosdb.server.transaction.TransactionInterfacet\0TransactionInterface.javat\0getTransactionBenchmarkppsq\0~\0 \0\0\00q\0~\0q\0~\0.q\0~\0/t\0executeppsq\0~\0 \0\0\0õq\0~\0t\0 org.caosdb.server.utils.Infot\0 Info.javat\0 syncDatabaseppsq\0~\0 \0\0\0–q\0~\0t\0/org.caosdb.server.database.misc.RootBenchmark$1q\0~\0t\0runppsq\0~\0 \0\0=pq\0~\0 q\0~\0\rq\0~\09q\0~\0q\0~\0sq\0~\0?@\0\0\0\0\0 w\0\0\0\0\0\0t\0 SyncStatssq\0~\0\"\0\0’¾l‹sq\0~\0?@\0\0\0\0\0\0w\0\0\0\0\0\0\0xuq\0~\0\0\0\0 sq\0~\0 \0\0Bpq\0~\0 q\0~\0\rq\0~\0q\0~\0q\0~\0sq\0~\0 \0\0!q\0~\0q\0~\0q\0~\0q\0~\0ppsq\0~\0 \0\0\0×q\0~\0q\0~\0)q\0~\0q\0~\0ppsq\0~\0 \0\0šq\0~\0q\0~\0q\0~\0q\0~\0+ppsq\0~\0 \0\0£q\0~\0q\0~\0q\0~\0q\0~\0+ppsq\0~\0 \0\0\00q\0~\0q\0~\0.q\0~\0/q\0~\02ppsq\0~\0 \0\0\0õq\0~\0q\0~\04q\0~\05q\0~\06ppsq\0~\0 \0\0\0–q\0~\0q\0~\08q\0~\0q\0~\09ppsq\0~\0 \0\0=pq\0~\0 q\0~\0\rq\0~\09q\0~\0q\0~\0sq\0~\0?@\0\0\0\0\0 w\0\0\0\0\0\0t\0MySQLSyncStatssq\0~\0\"\0\0’¾l‹sq\0~\0?@\0\0\0\0\0\0w\0\0\0\0\0\0\0xuq\0~\0\0\0\0 sq\0~\0 \0\0Bpq\0~\0 q\0~\0\rq\0~\0q\0~\0q\0~\0sq\0~\0 \0\0!q\0~\0q\0~\0q\0~\0q\0~\0ppsq\0~\0 \0\0\0×q\0~\0q\0~\0)q\0~\0q\0~\0ppsq\0~\0 \0\0šq\0~\0q\0~\0q\0~\0q\0~\0+ppsq\0~\0 \0\0£q\0~\0q\0~\0q\0~\0q\0~\0+ppsq\0~\0 \0\0 q\0~\0t\0-org.caosdb.server.database.BackendTransactiont\0BackendTransaction.javat\0getImplementationppsq\0~\0 \0\0\0+q\0~\0t\08org.caosdb.server.database.backend.transaction.SyncStatst\0SyncStats.javaq\0~\02ppsq\0~\0 \0\0\0žq\0~\0q\0~\0Tq\0~\0Ut\0executeTransactionppsq\0~\0 \0\0\01q\0~\0q\0~\0.q\0~\0/q\0~\02ppsq\0~\0 \0\0\0õq\0~\0q\0~\04q\0~\05q\0~\06ppsq\0~\0 \0\0\0–q\0~\0q\0~\08q\0~\0q\0~\09ppsq\0~\0 \0\0=pq\0~\0 q\0~\0\rq\0~\09q\0~\0q\0~\0sq\0~\0?@\0\0\0\0\0\0w\0\0\0\0\0\0\0xq\0~\0Jxq\0~\0<xq\0~\0!x');
+INSERT INTO `stats` VALUES
+('RootBenchmark','¬í\0sr\0-org.caosdb.server.database.misc.RootBenchmarkþ¼ƒQk]\0\0xr\04org.caosdb.server.database.misc.TransactionBenchmarkþ¼ƒQk]\0J\0sinceL\0 measurementst\0Ljava/util/Map;[\0stackTraceElementst\0 [Ljava/lang/StackTraceElement;L\0\rsubBenchmarksq\0~\0xp\0\0•$\'³^sr\0java.util.HashMapÚÁÃ`Ñ\0F\0\nloadFactorI\0 thresholdxp?@\0\0\0\0\0\0w\0\0\0\0\0\0\0xur\0 [Ljava.lang.StackTraceElement;F*<<ý\"9\0\0xp\0\0\0sr\0java.lang.StackTraceElementa Åš&6Ý…\0B\0formatI\0\nlineNumberL\0classLoaderNamet\0Ljava/lang/String;L\0declaringClassq\0~\0\nL\0fileNameq\0~\0\nL\0\nmethodNameq\0~\0\nL\0\nmoduleNameq\0~\0\nL\0\rmoduleVersionq\0~\0\nxp\0\0Spt\0java.lang.Threadt\0 Thread.javat\0\rgetStackTracet\0 java.baset\017.0.14sq\0~\0 \0\0!t\0appt\04org.caosdb.server.database.misc.TransactionBenchmarkt\0TransactionBenchmark.javat\0<init>ppsq\0~\0 \0\0\0ƒq\0~\0t\0-org.caosdb.server.database.misc.RootBenchmarkq\0~\0q\0~\0ppsq\0~\0 \0\0q\0~\0q\0~\0q\0~\0t\0<clinit>ppsq\0~\0 \0\0fq\0~\0t\0 org.caosdb.server.CaosDBServert\0CaosDBServer.javat\0 initBackendppsq\0~\0 \0\0\0 q\0~\0q\0~\0q\0~\0 t\0mainppsq\0~\0?@\0\0\0\0\0 w\0\0\0\0\0\0t\0Infosr\0,org.caosdb.server.database.misc.SubBenchmarkþ¼ƒQk]\0L\0nameq\0~\0\nxq\0~\0\0\0•$\'³bsq\0~\0?@\0\0\0\0\0\0w\0\0\0\0\0\0\0xuq\0~\0\0\0\0\nsq\0~\0 \0\0Spq\0~\0 q\0~\0\rq\0~\0q\0~\0q\0~\0sq\0~\0 \0\0!q\0~\0q\0~\0q\0~\0q\0~\0ppsq\0~\0 \0\0\0×q\0~\0t\0,org.caosdb.server.database.misc.SubBenchmarkq\0~\0q\0~\0ppsq\0~\0 \0\0šq\0~\0q\0~\0q\0~\0t\0 getBenchmarkppsq\0~\0 \0\0£q\0~\0q\0~\0q\0~\0q\0~\0+ppsq\0~\0 \0\0\0$q\0~\0t\02org.caosdb.server.transaction.TransactionInterfacet\0TransactionInterface.javat\0getTransactionBenchmarkppsq\0~\0 \0\0\00q\0~\0q\0~\0.q\0~\0/t\0executeppsq\0~\0 \0\0\0õq\0~\0t\0 org.caosdb.server.utils.Infot\0 Info.javat\0 syncDatabaseppsq\0~\0 \0\0\0–q\0~\0t\0/org.caosdb.server.database.misc.RootBenchmark$1q\0~\0t\0runppsq\0~\0 \0\0Hpq\0~\0 q\0~\0\rq\0~\09q\0~\0q\0~\0sq\0~\0?@\0\0\0\0\0 w\0\0\0\0\0\0t\0 SyncStatssq\0~\0\"\0\0•$\'³bsq\0~\0?@\0\0\0\0\0\0w\0\0\0\0\0\0\0xuq\0~\0\0\0\0 sq\0~\0 \0\0Spq\0~\0 q\0~\0\rq\0~\0q\0~\0q\0~\0sq\0~\0 \0\0!q\0~\0q\0~\0q\0~\0q\0~\0ppsq\0~\0 \0\0\0×q\0~\0q\0~\0)q\0~\0q\0~\0ppsq\0~\0 \0\0šq\0~\0q\0~\0q\0~\0q\0~\0+ppsq\0~\0 \0\0£q\0~\0q\0~\0q\0~\0q\0~\0+ppsq\0~\0 \0\0\00q\0~\0q\0~\0.q\0~\0/q\0~\02ppsq\0~\0 \0\0\0õq\0~\0q\0~\04q\0~\05q\0~\06ppsq\0~\0 \0\0\0–q\0~\0q\0~\08q\0~\0q\0~\09ppsq\0~\0 \0\0Hpq\0~\0 q\0~\0\rq\0~\09q\0~\0q\0~\0sq\0~\0?@\0\0\0\0\0 w\0\0\0\0\0\0t\0MySQLSyncStatssq\0~\0\"\0\0•$\'³csq\0~\0?@\0\0\0\0\0\0w\0\0\0\0\0\0\0xuq\0~\0\0\0\0 sq\0~\0 \0\0Spq\0~\0 q\0~\0\rq\0~\0q\0~\0q\0~\0sq\0~\0 \0\0!q\0~\0q\0~\0q\0~\0q\0~\0ppsq\0~\0 \0\0\0×q\0~\0q\0~\0)q\0~\0q\0~\0ppsq\0~\0 \0\0šq\0~\0q\0~\0q\0~\0q\0~\0+ppsq\0~\0 \0\0£q\0~\0q\0~\0q\0~\0q\0~\0+ppsq\0~\0 \0\0 q\0~\0t\0-org.caosdb.server.database.BackendTransactiont\0BackendTransaction.javat\0getImplementationppsq\0~\0 \0\0\0+q\0~\0t\08org.caosdb.server.database.backend.transaction.SyncStatst\0SyncStats.javaq\0~\02ppsq\0~\0 \0\0\0žq\0~\0q\0~\0Tq\0~\0Ut\0executeTransactionppsq\0~\0 \0\0\01q\0~\0q\0~\0.q\0~\0/q\0~\02ppsq\0~\0 \0\0\0õq\0~\0q\0~\04q\0~\05q\0~\06ppsq\0~\0 \0\0\0–q\0~\0q\0~\08q\0~\0q\0~\09ppsq\0~\0 \0\0Hpq\0~\0 q\0~\0\rq\0~\09q\0~\0q\0~\0sq\0~\0?@\0\0\0\0\0\0w\0\0\0\0\0\0\0xq\0~\0Jxq\0~\0<xq\0~\0!x');
/*!40000 ALTER TABLE `stats` ENABLE KEYS */;
UNLOCK TABLES;
@@ -1298,7 +1544,7 @@ CREATE TABLE `text_data` (
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;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -1307,7 +1553,10 @@ CREATE TABLE `text_data` (
LOCK TABLES `text_data` WRITE;
/*!40000 ALTER TABLE `text_data` DISABLE KEYS */;
-INSERT INTO `text_data` VALUES (0,123,104,'Henrik','FIX',0),(0,123,105,'tW','FIX',1);
+INSERT INTO `text_data` VALUES
+(0,123,104,'Henrik','FIX',0),
+(0,123,105,'tW','FIX',1),
+(0,122,121,'A38','FIX',0);
/*!40000 ALTER TABLE `text_data` ENABLE KEYS */;
UNLOCK TABLES;
@@ -1326,7 +1575,7 @@ CREATE TABLE `transaction_log` (
`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;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -1335,7 +1584,37 @@ CREATE TABLE `transaction_log` (
LOCK TABLES `transaction_log` WRITE;
/*!40000 ALTER TABLE `transaction_log` DISABLE KEYS */;
-INSERT INTO `transaction_log` VALUES ('Insert','102','admin',1729771724,356000000,'PAM'),('Insert','103','admin',1729771724,356000000,'PAM'),('Insert','104','admin',1729771724,356000000,'PAM'),('Insert','105','admin',1729771724,356000000,'PAM'),('Insert','106','admin',1729771724,356000000,'PAM'),('Insert','107','admin',1729771724,356000000,'PAM'),('Insert','108','admin',1729771724,356000000,'PAM'),('Insert','109','admin',1729771724,356000000,'PAM'),('Insert','110','admin',1729771724,356000000,'PAM'),('Insert','111','admin',1729771724,356000000,'PAM'),('Insert','112','admin',1729771724,356000000,'PAM'),('Insert','113','admin',1729771724,356000000,'PAM'),('Insert','114','admin',1729771724,356000000,'PAM'),('Insert','115','admin',1729771724,356000000,'PAM'),('Insert','116','admin',1729771724,356000000,'PAM'),('Insert','117','admin',1729771724,356000000,'PAM'),('Insert','118','admin',1729771724,356000000,'PAM'),('Insert','119','admin',1729771724,356000000,'PAM'),('Insert','120','admin',1729771724,356000000,'PAM'),('Insert','121','admin',1729771724,356000000,'PAM'),('Insert','122','admin',1729771724,356000000,'PAM'),('Insert','123','admin',1729771759,100000000,'PAM'),('Insert','124','admin',1729771765,62000000,'PAM'),('Update','124','admin',1729771780,301000000,'PAM'),('Insert','125','admin',1729771792,223000000,'PAM');
+INSERT INTO `transaction_log` VALUES
+('Insert','102','admin',1729771724,356000000,'PAM'),
+('Insert','103','admin',1729771724,356000000,'PAM'),
+('Insert','104','admin',1729771724,356000000,'PAM'),
+('Insert','105','admin',1729771724,356000000,'PAM'),
+('Insert','106','admin',1729771724,356000000,'PAM'),
+('Insert','107','admin',1729771724,356000000,'PAM'),
+('Insert','108','admin',1729771724,356000000,'PAM'),
+('Insert','109','admin',1729771724,356000000,'PAM'),
+('Insert','110','admin',1729771724,356000000,'PAM'),
+('Insert','111','admin',1729771724,356000000,'PAM'),
+('Insert','112','admin',1729771724,356000000,'PAM'),
+('Insert','113','admin',1729771724,356000000,'PAM'),
+('Insert','114','admin',1729771724,356000000,'PAM'),
+('Insert','115','admin',1729771724,356000000,'PAM'),
+('Insert','116','admin',1729771724,356000000,'PAM'),
+('Insert','117','admin',1729771724,356000000,'PAM'),
+('Insert','118','admin',1729771724,356000000,'PAM'),
+('Insert','119','admin',1729771724,356000000,'PAM'),
+('Insert','120','admin',1729771724,356000000,'PAM'),
+('Insert','121','admin',1729771724,356000000,'PAM'),
+('Insert','122','admin',1729771724,356000000,'PAM'),
+('Insert','123','admin',1729771759,100000000,'PAM'),
+('Insert','124','admin',1729771765,62000000,'PAM'),
+('Update','124','admin',1729771780,301000000,'PAM'),
+('Insert','125','admin',1729771792,223000000,'PAM'),
+('Insert','126','admin',1740068456,401000000,'PAM'),
+('Update','102','admin',1740068456,947000000,'PAM'),
+('Update','103','admin',1740068456,947000000,'PAM'),
+('Update','104','admin',1740068456,947000000,'PAM'),
+('Update','123','admin',1740068500,514000000,'PAM');
/*!40000 ALTER TABLE `transaction_log` ENABLE KEYS */;
UNLOCK TABLES;
@@ -1353,7 +1632,7 @@ CREATE TABLE `transactions` (
`seconds` bigint(20) unsigned NOT NULL,
`nanos` int(10) unsigned NOT NULL,
PRIMARY KEY (`srid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -1362,7 +1641,16 @@ CREATE TABLE `transactions` (
LOCK TABLES `transactions` WRITE;
/*!40000 ALTER TABLE `transactions` DISABLE KEYS */;
-INSERT INTO `transactions` VALUES ('87b61c68-1b6b-48a9-915b-2533b6ccbf15','admin','PAM',1729771759,100000000),('abbefec0-f108-4026-a473-5587c5e8eb63','admin','PAM',1729771724,356000000),('b0e78639-d3e9-454d-aaac-856f5299d47d','admin','PAM',1729771780,301000000),('cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e','administration','CaosDB',0,0),('d3dd1cca-cf29-42a5-aec1-0c162df9fc5e','admin','PAM',1729771765,62000000),('f01fac04-1f04-4cec-955b-4aa091c29f5c','admin','PAM',1729771792,223000000);
+INSERT INTO `transactions` VALUES
+('49cbd7aa-8c34-46a6-b291-134fd2f16afb','admin','PAM',1740068456,947000000),
+('87b61c68-1b6b-48a9-915b-2533b6ccbf15','admin','PAM',1729771759,100000000),
+('8c4d8797-0c40-479d-a648-813bba41819f','admin','PAM',1740068456,401000000),
+('a5b91491-1c8c-44b5-b223-8c8fd44dc1c3','admin','PAM',1740068500,514000000),
+('abbefec0-f108-4026-a473-5587c5e8eb63','admin','PAM',1729771724,356000000),
+('b0e78639-d3e9-454d-aaac-856f5299d47d','admin','PAM',1729771780,301000000),
+('cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e','administration','CaosDB',0,0),
+('d3dd1cca-cf29-42a5-aec1-0c162df9fc5e','admin','PAM',1729771765,62000000),
+('f01fac04-1f04-4cec-955b-4aa091c29f5c','admin','PAM',1729771792,223000000);
/*!40000 ALTER TABLE `transactions` ENABLE KEYS */;
UNLOCK TABLES;
@@ -1381,7 +1669,7 @@ CREATE TABLE `units_lin_con` (
`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;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -1409,7 +1697,7 @@ CREATE TABLE `user_info` (
PRIMARY KEY (`realm`,`name`),
KEY `subject_entity` (`entity`),
CONSTRAINT `subjects_ibfk_2` FOREIGN KEY (`entity`) REFERENCES `entity_ids` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -1418,7 +1706,8 @@ CREATE TABLE `user_info` (
LOCK TABLES `user_info` WRITE;
/*!40000 ALTER TABLE `user_info` DISABLE KEYS */;
-INSERT INTO `user_info` VALUES ('PAM','admin',NULL,'ACTIVE',NULL);
+INSERT INTO `user_info` VALUES
+('PAM','admin',NULL,'ACTIVE',NULL);
/*!40000 ALTER TABLE `user_info` ENABLE KEYS */;
UNLOCK TABLES;
@@ -1436,7 +1725,7 @@ CREATE TABLE `user_roles` (
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;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -1445,7 +1734,8 @@ CREATE TABLE `user_roles` (
LOCK TABLES `user_roles` WRITE;
/*!40000 ALTER TABLE `user_roles` DISABLE KEYS */;
-INSERT INTO `user_roles` VALUES ('PAM','admin','administration');
+INSERT INTO `user_roles` VALUES
+('PAM','admin','administration');
/*!40000 ALTER TABLE `user_roles` ENABLE KEYS */;
UNLOCK TABLES;
@@ -1458,13 +1748,13 @@ UNLOCK TABLES;
/*!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 = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `CaosDBVersion`() RETURNS varchar(255) CHARSET utf8 COLLATE utf8_unicode_ci
+CREATE DEFINER=`root`@`%` FUNCTION `CaosDBVersion`() RETURNS varchar(255) CHARSET utf8mb3 COLLATE utf8mb3_unicode_ci
DETERMINISTIC
-RETURN 'v7.0.2' ;;
+RETURN 'v8.0.0' ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
/*!50003 SET character_set_client = @saved_cs_client */ ;
@@ -1476,11 +1766,11 @@ DELIMITER ;
/*!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 = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` 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
+CREATE DEFINER=`root`@`%` 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 utf8mb3 COLLATE utf8mb3_unicode_ci
DETERMINISTIC
BEGIN
@@ -1545,9 +1835,9 @@ DELIMITER ;
/*!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 = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`%` FUNCTION `convert_unit`(unit_sig BIGINT, value DECIMAL(65,30)) RETURNS decimal(65,30)
DETERMINISTIC
@@ -1568,11 +1858,11 @@ DELIMITER ;
/*!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 = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `getAggValueWhereClause`(entities VARCHAR(255), properties VARCHAR(255)) RETURNS varchar(20000) CHARSET utf8 COLLATE utf8_unicode_ci
+CREATE DEFINER=`root`@`%` FUNCTION `getAggValueWhereClause`(entities VARCHAR(255), properties VARCHAR(255)) RETURNS varchar(20000) CHARSET utf8mb3 COLLATE utf8mb3_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)"),''));
@@ -1588,11 +1878,11 @@ DELIMITER ;
/*!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 = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `getDateTimeWhereClause`(vDateTime VARCHAR(255), operator CHAR(4)) RETURNS varchar(20000) CHARSET utf8 COLLATE utf8_unicode_ci
+CREATE DEFINER=`root`@`%` FUNCTION `getDateTimeWhereClause`(vDateTime VARCHAR(255), operator CHAR(4)) RETURNS varchar(20000) CHARSET utf8mb3 COLLATE utf8mb3_unicode_ci
DETERMINISTIC
BEGIN
DECLARE sep_loc INTEGER DEFAULT LOCATE('--',vDateTime);
@@ -1619,11 +1909,11 @@ DELIMITER ;
/*!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 = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `getDateWhereClause`(vDateTimeDotNotation VARCHAR(255), operator CHAR(4)) RETURNS varchar(20000) CHARSET utf8 COLLATE utf8_unicode_ci
+CREATE DEFINER=`root`@`%` FUNCTION `getDateWhereClause`(vDateTimeDotNotation VARCHAR(255), operator CHAR(4)) RETURNS varchar(20000) CHARSET utf8mb3 COLLATE utf8mb3_unicode_ci
DETERMINISTIC
BEGIN
DECLARE isInterval INTEGER DEFAULT LOCATE('--',vDateTimeDotNotation);
@@ -1728,11 +2018,11 @@ DELIMITER ;
/*!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 = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` 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
+CREATE DEFINER=`root`@`%` FUNCTION `getDoubleWhereClause`(value DOUBLE, unit_sig BIGINT, valueStdUnit DECIMAL(65,30), stdUnit_sig BIGINT, o CHAR(4)) RETURNS varchar(20000) CHARSET utf8mb3 COLLATE utf8mb3_unicode_ci
DETERMINISTIC
BEGIN
RETURN IF(unit_sig IS NULL AND value IS NOT NULL,
@@ -1753,9 +2043,9 @@ DELIMITER ;
/*!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 = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`%` FUNCTION `get_head_relative`(EntityID VARCHAR(255),
HeadOffset INT UNSIGNED) RETURNS varbinary(255)
@@ -1788,9 +2078,9 @@ DELIMITER ;
/*!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 = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`%` FUNCTION `get_head_version`(EntityID VARCHAR(255)) RETURNS varbinary(255)
READS SQL DATA
@@ -1808,9 +2098,9 @@ DELIMITER ;
/*!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 = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`%` FUNCTION `get_iversion`(InternalEntityID INT UNSIGNED,
Version VARBINARY(255)) RETURNS int(10) unsigned
@@ -1834,9 +2124,9 @@ DELIMITER ;
/*!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 = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`%` FUNCTION `get_primary_parent_version`(EntityID VARCHAR(255),
Version VARBINARY(255)) RETURNS varbinary(255)
@@ -1866,12 +2156,12 @@ DELIMITER ;
/*!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 = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`%` FUNCTION `get_version_timestamp`(EntityID VARCHAR(255),
- Version VARBINARY(255)) RETURNS varchar(255) CHARSET utf8 COLLATE utf8_unicode_ci
+ Version VARBINARY(255)) RETURNS varchar(255) CHARSET utf8mb3 COLLATE utf8mb3_unicode_ci
READS SQL DATA
BEGIN
DECLARE InternalEntityID INT UNSIGNED DEFAULT NULL;
@@ -1897,9 +2187,9 @@ DELIMITER ;
/*!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 = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`%` FUNCTION `is_feature_config`(_Key VARCHAR(255),
Expected VARCHAR(255)) RETURNS tinyint(1)
@@ -1920,12 +2210,12 @@ DELIMITER ;
/*!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 = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`%` FUNCTION `makeStmt`(sourceSet VARCHAR(255), targetSet VARCHAR(255), data VARCHAR(20000),
- properties VARCHAR(20000), versioned BOOLEAN) RETURNS varchar(20000) CHARSET utf8 COLLATE utf8_unicode_ci
+ properties VARCHAR(20000), versioned BOOLEAN) RETURNS varchar(20000) CHARSET utf8mb3 COLLATE utf8mb3_unicode_ci
NO SQL
BEGIN
IF sourceSet = "entities" AND versioned THEN
@@ -1957,13 +2247,30 @@ DELIMITER ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
/*!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' */ ;
+/*!50003 DROP FUNCTION IF EXISTS `ms` */;
+/*!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 = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
+DELIMITER ;;
+CREATE DEFINER=`caosdb`@`%` FUNCTION `ms`(ps bigint(20) unsigned ) RETURNS double
+return TRUNCATE(ps/1000000000,3) ;;
+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 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' */ ;
/*!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 = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`%` FUNCTION `standard_unit`(unit_sig BIGINT) RETURNS bigint(20)
DETERMINISTIC
@@ -1984,9 +2291,9 @@ DELIMITER ;
/*!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 = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`%` FUNCTION `_get_head_iversion`(InternalEntityID INT UNSIGNED) RETURNS int(10) unsigned
READS SQL DATA
@@ -2014,9 +2321,9 @@ DELIMITER ;
/*!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 = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`%` FUNCTION `_get_version`(InternalEntityID INT UNSIGNED,
IVersion INT UNSIGNED) RETURNS varbinary(255)
@@ -2039,9 +2346,9 @@ DELIMITER ;
/*!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 = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`%` PROCEDURE `applyBackReference`(in sourceSet VARCHAR(255), targetSet VARCHAR(255),
in propertiesTable VARCHAR(255), in entitiesTable VARCHAR(255), in subQuery BOOLEAN,
@@ -2220,9 +2527,9 @@ DELIMITER ;
/*!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 = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`%` PROCEDURE `applyIDFilter`(in sourceSet VARCHAR(255), in targetSet VARCHAR(255),
in o CHAR(2), in EntityID VARCHAR(255), in agg CHAR(3), in versioned BOOLEAN)
@@ -2357,9 +2664,9 @@ DELIMITER ;
/*!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 = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`%` PROCEDURE `applyPOV`(in sourceSet VARCHAR(255),
in targetSet VARCHAR(255),
@@ -2662,9 +2969,9 @@ DELIMITER ;
/*!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 = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`%` PROCEDURE `applyRefPOV`(in sourceSet VARCHAR(255), in targetSet VARCHAR(255),
in properties VARCHAR(255), in refs VARCHAR(255),
@@ -2702,9 +3009,9 @@ DELIMITER ;
/*!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 = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`%` PROCEDURE `applySAT`(in sourceSet VARCHAR(255), in targetSet VARCHAR(255), in loc MEDIUMTEXT, in op CHAR(5))
BEGIN
@@ -2731,9 +3038,9 @@ DELIMITER ;
/*!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 = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`%` 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
@@ -2773,9 +3080,9 @@ DELIMITER ;
/*!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 = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`%` PROCEDURE `calcComplementUnion`(in targetSet VARCHAR(255), in subResultSet VARCHAR(255), in universe VARCHAR(255), in versioned BOOLEAN)
BEGIN
@@ -2813,9 +3120,9 @@ DELIMITER ;
/*!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 = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`%` PROCEDURE `calcDifference`(in resultSetTable VARCHAR(255), in diff VARCHAR(255), in versioned BOOLEAN)
BEGIN
@@ -2840,9 +3147,9 @@ DELIMITER ;
/*!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 = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`%` PROCEDURE `calcIntersection`(in resultSetTable VARCHAR(255), in intersectWith VARCHAR(255), in versioned BOOLEAN)
BEGIN
@@ -2875,9 +3182,9 @@ DELIMITER ;
/*!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 = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`%` PROCEDURE `calcUnion`(in targetSet VARCHAR(255), in sourceSet VARCHAR(255))
BEGIN
@@ -2898,9 +3205,9 @@ DELIMITER ;
/*!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 = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`%` PROCEDURE `cleanUpLinCon`()
BEGIN
@@ -2919,9 +3226,9 @@ DELIMITER ;
/*!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 = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`%` PROCEDURE `cleanUpQuery`()
BEGIN
@@ -2946,9 +3253,9 @@ DELIMITER ;
/*!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 = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`%` PROCEDURE `copyTable`(in fromTable VARCHAR(255), in toTable VARCHAR(255))
BEGIN
@@ -2969,9 +3276,9 @@ DELIMITER ;
/*!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 = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`%` PROCEDURE `createTmpTable`(out newTableName VARCHAR(255), in versioned BOOLEAN)
BEGIN
@@ -2999,9 +3306,9 @@ DELIMITER ;
/*!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 = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`%` PROCEDURE `createTmpTable2`(out newTableName VARCHAR(255))
BEGIN
@@ -3025,9 +3332,9 @@ DELIMITER ;
/*!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 = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`%` PROCEDURE `deleteEntity`(in EntityID VARCHAR(255))
BEGIN
@@ -3081,9 +3388,9 @@ DELIMITER ;
/*!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 = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`%` PROCEDURE `deleteEntityProperties`(in EntityID VARCHAR(255))
BEGIN
@@ -3254,9 +3561,9 @@ DELIMITER ;
/*!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 = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`%` PROCEDURE `deleteIsa`(IN InternalEntityID INT UNSIGNED)
BEGIN
@@ -3292,9 +3599,9 @@ DELIMITER ;
/*!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 = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`%` PROCEDURE `deleteLinCon`(in sig BIGINT)
BEGIN
@@ -3313,9 +3620,9 @@ DELIMITER ;
/*!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 = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`%` PROCEDURE `entityACL`(out ACLID INT UNSIGNED, in ACLSTR VARBINARY(65525))
BEGIN
@@ -3336,9 +3643,9 @@ DELIMITER ;
/*!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 = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`%` PROCEDURE `finishNegationFilter`(in resultSetTable VARCHAR(255), in diff VARCHAR(255))
BEGIN
@@ -3355,9 +3662,9 @@ DELIMITER ;
/*!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 = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`%` PROCEDURE `finishSubProperty`(in sourceSet VARCHAR(255),in targetSet VARCHAR(255),
in list VARCHAR(255), in versioned BOOLEAN)
@@ -3383,9 +3690,9 @@ DELIMITER ;
/*!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 = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`%` PROCEDURE `getChildren`(in tableName varchar(255), in versioned BOOLEAN)
BEGIN
@@ -3452,9 +3759,9 @@ DELIMITER ;
/*!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 = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`%` PROCEDURE `getDependentEntities`(in EntityID VARCHAR(255))
BEGIN
@@ -3504,6 +3811,46 @@ BEGIN
DROP TEMPORARY TABLE referring;
+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 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' */ ;
+/*!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 */ ;
+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 */ ;
@@ -3516,9 +3863,9 @@ DELIMITER ;
/*!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 = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`%` PROCEDURE `getFileIdByPath`(in FilePath TEXT)
BEGIN
@@ -3537,9 +3884,9 @@ DELIMITER ;
/*!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 = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`%` PROCEDURE `getIdByName`(in Name VARCHAR(255), in Role VARCHAR(255), in Lmt INT UNSIGNED)
BEGIN
@@ -3561,6 +3908,33 @@ BEGIN
EXECUTE stmt USING @vName;
DEALLOCATE PREPARE stmt;
+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 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' */ ;
+/*!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 */ ;
+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 */ ;
@@ -3573,9 +3947,9 @@ DELIMITER ;
/*!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 = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`%` PROCEDURE `get_version_history`(
in EntityID VARCHAR(255))
@@ -3626,9 +4000,9 @@ DELIMITER ;
/*!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 = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`%` PROCEDURE `initBackReference`(in PropertyID VARCHAR(255), in PropertyName VARCHAR(255), in EntityID VARCHAR(255), in EntityName VARCHAR(255))
BEGIN
@@ -3650,6 +4024,28 @@ BEGIN
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 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' */ ;
+/*!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 */ ;
+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 */ ;
@@ -3662,9 +4058,9 @@ DELIMITER ;
/*!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 = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`%` PROCEDURE `initDisjunctionFilter`(in versioned BOOLEAN)
BEGIN
@@ -3681,9 +4077,9 @@ DELIMITER ;
/*!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 = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`%` PROCEDURE `initEmptyTargetSet`(in targetSet VARCHAR(255), in versioned BOOLEAN)
BEGIN
@@ -3713,9 +4109,9 @@ DELIMITER ;
/*!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 = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`%` PROCEDURE `initEntity`(in eid VARCHAR(255), in ename VARCHAR(255),
in enameLike VARCHAR(255), in enameRegexp VARCHAR(255),
@@ -3767,9 +4163,10 @@ initEntityLabel: BEGIN
IF(versioned,
'` (id, _iversion) SELECT eids.internal_id, _get_head_iversion(eids.internal_id) ',
'` (id) SELECT eids.internal_id '),
- 'FROM entity_ids AS eids WHERE eids.id=',eid,';');
+ 'FROM entity_ids AS eids WHERE eids.id=?;');
+ SET @query_param = eid;
PREPARE initEntityStmt FROM @initEntityStmtStr;
- EXECUTE initEntityStmt;
+ EXECUTE initEntityStmt USING @query_param;
DEALLOCATE PREPARE initEntityStmt;
END IF;
@@ -3822,13 +4219,35 @@ DELIMITER ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
/*!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' */ ;
+/*!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 */ ;
+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 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' */ ;
/*!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 = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`%` PROCEDURE `initPOVPropertiesTable`(in PropertyID VARCHAR(255), in PropertyName VARCHAR(255), in sourceSet VARCHAR(255))
BEGIN
@@ -3908,9 +4327,9 @@ DELIMITER ;
/*!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 = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`%` PROCEDURE `initPOVRefidsTable`(in PropertyID VARCHAR(255), in PropertyName VARCHAR(255))
BEGIN
@@ -3937,9 +4356,9 @@ DELIMITER ;
/*!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 = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`%` PROCEDURE `initQuery`(in versioned BOOLEAN)
BEGIN
@@ -3960,9 +4379,9 @@ DELIMITER ;
/*!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 = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`%` PROCEDURE `initSubEntity`(in EntityID VARCHAR(255), in ename VARCHAR(255), in tableName VARCHAR(255))
BEGIN
@@ -4012,9 +4431,9 @@ DELIMITER ;
/*!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 = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`%` PROCEDURE `initSubProperty`(in sourceSet VARCHAR(255), in propertiesTable VARCHAR(255), in refIdsTable VARCHAR(255))
BEGIN
@@ -4063,9 +4482,9 @@ DELIMITER ;
/*!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 = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`%` PROCEDURE `insertEntity`(in EntityID VARCHAR(255), in EntityName VARCHAR(255), in EntityDesc TEXT, in EntityRole VARCHAR(255), in ACL VARBINARY(65525))
BEGIN
@@ -4117,9 +4536,9 @@ DELIMITER ;
/*!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 = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`%` PROCEDURE `insertEntityCollection`(in PropertyID VARCHAR(255), in Collection VARCHAR(255))
BEGIN
@@ -4141,9 +4560,9 @@ DELIMITER ;
/*!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 = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`%` PROCEDURE `insertEntityDataType`(in PropertyID VARCHAR(255), in DataTypeID VARCHAR(255))
BEGIN
@@ -4166,9 +4585,9 @@ DELIMITER ;
/*!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 = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`%` PROCEDURE `insertEntityProperty`(
in DomainID VARCHAR(255),
@@ -4308,9 +4727,9 @@ DELIMITER ;
/*!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 = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`%` PROCEDURE `insertIsa`(IN ChildID VARCHAR(255), IN ParentID VARCHAR(255))
insert_is_a_proc: BEGIN
@@ -4373,9 +4792,9 @@ DELIMITER ;
/*!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 = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`%` 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
@@ -4394,9 +4813,9 @@ DELIMITER ;
/*!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 = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`%` PROCEDURE `insert_single_child_version`(
in InternalEntityID INT UNSIGNED,
@@ -4449,9 +4868,9 @@ DELIMITER ;
/*!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 = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`%` PROCEDURE `intersectTable`(in resultSetTable VARCHAR(255), in diff VARCHAR(255))
BEGIN
@@ -4472,9 +4891,9 @@ DELIMITER ;
/*!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 = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`%` PROCEDURE `isSubtype`(in ChildID VARCHAR(255), in ParentID VARCHAR(255))
BEGIN
@@ -4499,9 +4918,9 @@ DELIMITER ;
/*!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 = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`%` PROCEDURE `overrideDesc`(in InternalDomainID INT UNSIGNED, in InternalEntityID INT UNSIGNED, in InternalPropertyID INT UNSIGNED, in Description TEXT)
BEGIN
@@ -4518,9 +4937,9 @@ DELIMITER ;
/*!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 = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`%` PROCEDURE `overrideName`(in InternalDomainID INT UNSIGNED, in InternalEntityID INT UNSIGNED, in InternalPropertyID INT UNSIGNED, in Name VARCHAR(255))
BEGIN
@@ -4537,9 +4956,9 @@ DELIMITER ;
/*!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 = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`%` PROCEDURE `overrideType`(in InternalDomainID INT UNSIGNED, in InternalEntityID INT UNSIGNED, in InternalPropertyID INT UNSIGNED, in InternalDataTypeID INT UNSIGNED)
BEGIN
@@ -4556,9 +4975,9 @@ DELIMITER ;
/*!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 = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`%` PROCEDURE `raiseWarning`(in str VARCHAR(20000))
BEGIN
@@ -4575,9 +4994,9 @@ DELIMITER ;
/*!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 = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`%` PROCEDURE `registerReplacementIds`(in amount INT UNSIGNED)
BEGIN
@@ -4606,9 +5025,9 @@ DELIMITER ;
/*!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 = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`%` PROCEDURE `registerTempTableName`(out newTableName VARCHAR(255))
BEGIN
@@ -4625,13 +5044,33 @@ DELIMITER ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
/*!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' */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `reset_stats` */;
+/*!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 = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
+DELIMITER ;;
+CREATE DEFINER=`caosdb`@`%` PROCEDURE `reset_stats`()
+BEGIN
+ truncate table performance_schema.events_statements_summary_by_digest;
+ truncate table performance_schema.events_statements_history_long;
+ 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 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' */ ;
/*!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 = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`%` PROCEDURE `retrieveEntity`(
in EntityID VARCHAR(255),
@@ -4787,9 +5226,9 @@ DELIMITER ;
/*!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 = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`%` PROCEDURE `retrieveEntityParents`(
in EntityID VARCHAR(255),
@@ -4868,9 +5307,9 @@ DELIMITER ;
/*!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 = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`%` PROCEDURE `retrieveEntityProperties`(
in DomainID VARCHAR(255),
@@ -5190,9 +5629,9 @@ DELIMITER ;
/*!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 = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`%` PROCEDURE `retrieveOverrides`(
in DomainID VARCHAR(255),
@@ -5385,9 +5824,9 @@ DELIMITER ;
/*!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 = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`%` PROCEDURE `retrieveQueryTemplateDef`(
in EntityID VARCHAR(255),
@@ -5440,9 +5879,9 @@ DELIMITER ;
/*!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 = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`%` PROCEDURE `setFileProperties`(
in EntityID VARCHAR(255),
@@ -5487,9 +5926,9 @@ DELIMITER ;
/*!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 = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`%` PROCEDURE `set_transaction`(
srid VARBINARY(255),
@@ -5514,9 +5953,9 @@ DELIMITER ;
/*!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 = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`%` PROCEDURE `showEntityAutoIncr`()
BEGIN
@@ -5538,9 +5977,9 @@ DELIMITER ;
/*!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 = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`%` PROCEDURE `updateEntity`(
in EntityID VARCHAR(255),
@@ -5652,9 +6091,9 @@ DELIMITER ;
/*!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 = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`%` 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
@@ -5676,4 +6115,4 @@ DELIMITER ;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
--- Dump completed on 2024-10-24 12:10:03
+-- Dump completed on 2025-02-20 16:22:02
diff --git a/test-profile/custom/other/restore/caosroot.2024-10-24T14101729771803.tar.gz b/test-profile/custom/other/restore/caosroot.2024-10-24T14101729771803.tar.gz
deleted file mode 100644
index db9f268e7dec1358c798000e137519f98cd05398..0000000000000000000000000000000000000000
Binary files a/test-profile/custom/other/restore/caosroot.2024-10-24T14101729771803.tar.gz and /dev/null differ
diff --git a/test-profile/custom/other/restore/caosroot.tar.gz b/test-profile/custom/other/restore/caosroot.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..a4bd6ead5ac37a7e2f0ede16d084c63e3048812d
Binary files /dev/null and b/test-profile/custom/other/restore/caosroot.tar.gz differ