1 files changed, 3 insertions, 3 deletions
diff --git a/sql/serenitasdb.sql b/sql/serenitasdb.sql
index e27f1c62..dc383a5c 100644
--- a/sql/serenitasdb.sql
+++ b/sql/serenitasdb.sql
@@ -273,7 +273,7 @@ CREATE TYPE bbgSource AS ENUM('MSG1', 'CBIN', 'CBGN', 'MKIT', 'CMAN');
 CREATE TYPE DocClause AS ENUM('No Restructuring', 'Modified Modified Restructurin', 'Full Restructuring', 'Modified Restructuring');
 CREATE TYPE ShortCode AS ENUM('CR14', 'XR14', 'MM14');
 CREATE TYPE tenor AS ENUM('6mo', '1yr', '2yr', '3yr', '4yr', '5yr', '7yr', '10yr');
-CREATE TYPE index_type AS ENUM('IG', 'HY', 'EU', 'LCDX', 'XO', 'BS');
+CREATE TYPE index_type AS ENUM('IG', 'HY', 'EU', 'LCDX', 'XO', 'BS', 'HY.BB');
 CREATE TYPE BBG_CC AS ENUM('OC');
 
 CREATE TABLE CDS_Issuers_old(
@@ -406,8 +406,8 @@ CREATE OR REPLACE FUNCTION nameToBasketID(index_name varchar(4), p_date date) RE
       p_series smallint;
       p_basketid integer;
        BEGIN
-	   p_index := upper(left(index_name, 2))::index_type;
-       p_series := right(index_name, -2);
+	   p_index := upper(substring(index_name, '[A-Za-z]{2,4}'))::index_type;
+       p_series := substring(index_name, '[0-9]{1,2}')::smallint;
        	SELECT MIN(basketid) INTO p_basketid FROM index_version WHERE Index=p_index and
 	Series=p_series and lastdate>=p_date;
        	RETURN p_basketid;