From f45c44076c9b682668ed7ab55e83919c2ec8ac4a Mon Sep 17 00:00:00 2001
From: Timm Fitschen <timm.fitschen@ds.mpg.de>
Date: Wed, 5 Dec 2018 00:41:33 +0100
Subject: [PATCH] MAINT: Renamed some variables for better debugging
---
procedures/query/initBackReference.sql | 4 ++--
procedures/query/initPOV.sql | 2 +-
procedures/query/initSubEntity.sql | 6 +++---
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/procedures/query/initBackReference.sql b/procedures/query/initBackReference.sql
index 4c2c95d..47038ad 100644
--- a/procedures/query/initBackReference.sql
+++ b/procedures/query/initBackReference.sql
@@ -23,7 +23,7 @@
DROP PROCEDURE IF EXISTS db_2_0.initBackReference;
DELIMITER //
-CREATE PROCEDURE db_2_0.initBackReference(in pid INT UNSIGNED, in pname VARCHAR(255), in eid INT UNSIGNED, in ename VARCHAR(255))
+CREATE PROCEDURE db_2_0.initBackReference(in pid INT UNSIGNED, in pname VARCHAR(255), in entity_id INT UNSIGNED, in ename VARCHAR(255))
BEGIN
DECLARE propertiesTable VARCHAR(255) DEFAULT NULL;
DECLARE entitiesTable VARCHAR(255) DEFAULT NULL;
@@ -35,7 +35,7 @@ BEGIN
IF ename IS NOT NULL THEN
call createTmpTable(entitiesTable);
- call initSubEntity(eid, ename, entitiesTable);
+ call initSubEntity(entity_id, ename, entitiesTable);
END IF;
SELECT propertiesTable, entitiesTable;
diff --git a/procedures/query/initPOV.sql b/procedures/query/initPOV.sql
index e42113f..1d7c75a 100644
--- a/procedures/query/initPOV.sql
+++ b/procedures/query/initPOV.sql
@@ -90,7 +90,7 @@ END //
DROP PROCEDURE IF EXISTS db_2_0.initPOVRefidsTable //
-CREATE PROCEDURE db_2_0.initPOVRefidsTable(in vInt INT, in vText VARCHAR(255))
+CREATE PROCEDURE db_2_0.initPOVRefidsTable(in vInt INT UNSIGNED, in vText VARCHAR(255))
BEGIN
DECLARE refIdsTable VARCHAR(255) DEFAULT NULL; /*table for referenced entity ids*/
diff --git a/procedures/query/initSubEntity.sql b/procedures/query/initSubEntity.sql
index b994891..0390fcc 100644
--- a/procedures/query/initSubEntity.sql
+++ b/procedures/query/initSubEntity.sql
@@ -26,7 +26,7 @@ DROP PROCEDURE IF EXISTS db_2_0.initSubEntity;
DELIMITER //
-CREATE PROCEDURE db_2_0.initSubEntity(in eid INT UNSIGNED, in ename VARCHAR(255), in tableName VARCHAR(255))
+CREATE PROCEDURE db_2_0.initSubEntity(in e_id INT UNSIGNED, in ename VARCHAR(255), in tableName VARCHAR(255))
BEGIN
DECLARE ecount INT DEFAULT 0;
@@ -37,8 +37,8 @@ BEGIN
SET ecount = ROW_COUNT();
DEALLOCATE PREPARE stmt;
- IF eid IS NOT NULL THEN
- SET @stmtStr = CONCAT('INSERT IGNORE INTO `', tableName, '` (id) VALUES (', eid, ')');
+ IF e_id IS NOT NULL THEN
+ SET @stmtStr = CONCAT('INSERT IGNORE INTO `', tableName, '` (id) VALUES (', e_id, ')');
PREPARE stmt FROM @stmtStr;
EXECUTE stmt;
SET ecount = ecount + ROW_COUNT();
--
GitLab