Fixes for DB scripts

RestComm · Oct 14, 2016 · 44b0403 · 44b0403
1 parent 0e9ff3a
commit 44b0403
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 11 deletions.
diff --git a/...config-scripts/restcomm/upgrade_scripts/patches_for_790/V7_9_2__For_790_add_rms_table.sql b/...config-scripts/restcomm/upgrade_scripts/patches_for_790/V7_9_2__For_790_add_rms_table.sql
@@ -8,12 +8,12 @@ USE ${RESTCOMM_DBNAME};
 DELIMITER //
 CREATE PROCEDURE updateProcedure()
  BEGIN
- SELECT DISTINCTROW IFNULL(table_name, '') INTO @tblName801
+ SELECT DISTINCTROW IFNULL(table_name, '') INTO @tblName792
  FROM information_schema.columns
  WHERE table_schema='${RESTCOMM_DBNAME}'
  AND table_name = 'restcomm_media_servers';
 
-	IF @tblName801 IS NULL THEN
+	IF @tblName792 IS NULL THEN
 		CREATE TABLE restcomm_media_servers (
 			ms_id INT PRIMARY KEY AUTO_INCREMENT, 
 			local_ip VARCHAR(34) NOT NULL, 

diff --git a/...config-scripts/restcomm/upgrade_scripts/patches_for_790/V7_9_3__For_790_add_mrb_table.sql b/...config-scripts/restcomm/upgrade_scripts/patches_for_790/V7_9_3__For_790_add_mrb_table.sql
@@ -8,12 +8,12 @@ USE ${RESTCOMM_DBNAME};
 DELIMITER //
 CREATE PROCEDURE updateProcedure()
  BEGIN
- SELECT DISTINCTROW IFNULL(table_name, '') INTO @tblName802
+ SELECT DISTINCTROW IFNULL(table_name, '') INTO @tblName793
  FROM information_schema.columns
  WHERE table_schema='${RESTCOMM_DBNAME}'
  AND table_name = 'restcomm_media_resource_broker_entity';
 
-	IF @tblName802 IS NULL THEN
+	IF @tblName793 IS NULL THEN
 		CREATE TABLE restcomm_media_resource_broker_entity (
 		conference_sid VARCHAR(34) NOT NULL, 
 		slave_ms_id VARCHAR(34) NOT NULL, 

diff --git a/...m/upgrade_scripts/patches_for_790/V7_9_5__For_790_add_mrb_columns_in_conference_table.sql b/...m/upgrade_scripts/patches_for_790/V7_9_5__For_790_add_mrb_columns_in_conference_table.sql
@@ -17,13 +17,13 @@ USE ${RESTCOMM_DBNAME};
 DELIMITER //
 CREATE PROCEDURE updateProcedure()
  BEGIN
-   SELECT DISTINCTROW IFNULL(column_name, '') INTO @colName804
+   SELECT DISTINCTROW IFNULL(column_name, '') INTO @colName794
    FROM information_schema.columns
    WHERE table_schema='${RESTCOMM_DBNAME}'
    AND table_name = 'restcomm_conference_detail_records'
    AND column_name = 'master_ms_id';
 
-  IF @colName804 IS NULL THEN
+  IF @colName794 IS NULL THEN
   CREATE TABLE temp_table LIKE restcomm_conference_detail_records;
   ALTER TABLE temp_table ADD master_ms_id VARCHAR(34);
   ALTER TABLE temp_table ADD master_conference_endpoint_id VARCHAR(20);

diff --git a/restcomm/restcomm.application/src/main/webapp/WEB-INF/sql/conference-detail-records.xml b/restcomm/restcomm.application/src/main/webapp/WEB-INF/sql/conference-detail-records.xml
@@ -6,11 +6,6 @@
 
     <insert id="addConferenceDetailRecord" parameterType="map">
 		INSERT INTO "restcomm_conference_detail_records" ("sid", "date_created", "date_updated", "account_sid", "status", "friendly_name", "api_version", "uri", "master_ms_id", "master_present") VALUES (#{sid}, #{date_created}, #{date_updated}, #{account_sid}, #{status}, #{friendly_name}, #{api_version}, #{uri}, #{master_ms_id}, #{master_present});
-		<!--call "addConferenceDetailRecord"( #{sid}, #{date_created}, #{date_updated}, #{account_sid}, #{status}, #{friendly_name}, #{api_version}, #{uri}, #{master_ms_id}, #{master_present} );-->
-		<!--IF NOT EXISTS(SELECT * FROM "restcomm_conference_detail_records" WHERE "friendly_name"=${friendly_name} AND "status" LIKE 'RUNNING%')-->
-		<!--THEN-->
-		<!--INSERT INTO restcomm_conference_detail_records ("sid", "date_created", "date_updated", "account_sid", "status", "friendly_name", "api_version", "uri", "master_ms_id", "master_present") VALUES (#{sid}, #{date_created}, #{date_updated}, #{account_sid}, #{status}, #{friendly_name}, #{api_version}, #{uri}, #{master_ms_id}, #{master_present});-->
-		<!--END IF;-->
     </insert>
 	<select id="getConferenceDetailRecord" parameterType="string" resultType="hashmap">
 		SELECT * FROM "restcomm_conference_detail_records" WHERE "sid"=#{sid};