DataObjects/core.sql

[Pman.Core] / DataObjects / core_enum_functions.sql

diff --git a/DataObjects/core_enum_functions.sql b/DataObjects/core_enum_functions.sql
index 89ccebf..720a66c 100644 (file)
--- a/DataObjects/core_enum_functions.sql
+++ b/DataObjects/core_enum_functions.sql
@@ -1,4 +1,7 @@
 
+
+-- also update the pgsql version of these!?
+
 DROP FUNCTION IF EXISTS core_enum_display_name;
 DELIMITER $$
 CREATE FUNCTION core_enum_display_name(in_id INT(11))
@@ -12,6 +15,10 @@ CREATE FUNCTION core_enum_display_name(in_id INT(11))
     END $$
 DELIMITER ;
 
+
+
+
+
 DROP FUNCTION IF EXISTS core_enum_name;
 DELIMITER $$
 CREATE FUNCTION core_enum_name(in_id INT(11))
@@ -25,15 +32,28 @@ CREATE FUNCTION core_enum_name(in_id INT(11))
     END $$
 DELIMITER ;
 
+DROP FUNCTION IF EXISTS core_enum_name_to_display_name;
+DELIMITER $$
+CREATE FUNCTION core_enum_name_to_display_name(in_etype VARCHAR(256), in_name VARCHAR(256))
+        RETURNS VARCHAR(256) DETERMINISTIC
+    BEGIN
+        DECLARE ret VARCHAR(256);
+        SET ret  = '';
+        SELECT display_name INTO ret FROM core_enum
+            WHERE name=in_name AND etype=in_etype LIMIT 1;
+        RETURN ret;
+    END $$
+DELIMITER ;
+
 DROP FUNCTION IF EXISTS core_enum_id_by_name;
 DELIMITER $$
-CREATE FUNCTION core_enum_id_by_name(in_name VARCHAR(256))
+CREATE FUNCTION core_enum_id_by_name(in_etype VARCHAR(256), in_name VARCHAR(256))
         RETURNS INT(11) DETERMINISTIC
     BEGIN
         DECLARE ret  INT(11);
         SET ret  = '';
         SELECT id INTO ret FROM core_enum
-            WHERE name=in_name LIMIT 1;
+            WHERE name=in_name AND etype=in_etype LIMIT 1;
         RETURN ret;
     END $$
 DELIMITER ;
\ No newline at end of file