From 81bdd9e0a371590cdbc68b78e9258b1a13379be9 Mon Sep 17 00:00:00 2001 From: Rene Krenn Date: Mon, 11 Jun 2018 20:52:44 +0200 Subject: [PATCH] Revert "TT#25451 use ngcp.timezone in v_timezone views" This reverts commit 578720e36b635ed480ccfa4e56fbe9e4dcd9b85c. Change-Id: I324e5c50258ebbc7c227936dda195673adc95452 --- db_scripts/diff/15374.down | 28 ---------------------------- db_scripts/diff/15374.up | 31 ------------------------------- 2 files changed, 59 deletions(-) delete mode 100644 db_scripts/diff/15374.down delete mode 100644 db_scripts/diff/15374.up diff --git a/db_scripts/diff/15374.down b/db_scripts/diff/15374.down deleted file mode 100644 index 839f676b..00000000 --- a/db_scripts/diff/15374.down +++ /dev/null @@ -1,28 +0,0 @@ -USE billing; - -CREATE OR REPLACE VIEW v_subscriber_timezone AS - SELECT sc.id as contact_id, s.id as subscriber_id, s.uuid, - COALESCE(sc.timezone, cc.timezone, rc.timezone) as name - FROM voip_subscribers s -LEFT OUTER JOIN contacts sc ON sc.id = s.contact_id -JOIN contracts c ON c.id = s.contract_id -JOIN contacts cc ON cc.id = c.contact_id -JOIN resellers r ON r.id = cc.reseller_id -JOIN contracts i ON i.id = r.contract_id -JOIN contacts rc ON rc.id = i.contact_id; - -CREATE OR REPLACE VIEW v_contract_timezone AS - SELECT cc.id as contact_id, c.id as contract_id, - COALESCE(cc.timezone, rc.timezone) as name - FROM contracts c -JOIN contacts cc ON cc.id = c.contact_id -JOIN resellers r ON r.id = cc.reseller_id -JOIN contracts i ON i.id = r.contract_id -JOIN contacts rc ON rc.id = i.contact_id; - -CREATE OR REPLACE VIEW v_reseller_timezone AS - SELECT rc.id as contact_id, r.id as reseller_id, - rc.timezone as name -FROM resellers r -JOIN contracts i ON i.id = r.contract_id -JOIN contacts rc ON rc.id = i.contact_id; diff --git a/db_scripts/diff/15374.up b/db_scripts/diff/15374.up deleted file mode 100644 index 9a114381..00000000 --- a/db_scripts/diff/15374.up +++ /dev/null @@ -1,31 +0,0 @@ -USE billing; - -CREATE OR REPLACE VIEW v_subscriber_timezone AS - SELECT sc.id as contact_id, s.id as subscriber_id, s.uuid, - COALESCE(sc.timezone, cc.timezone, rc.timezone, t.name) as name - FROM voip_subscribers s -LEFT OUTER JOIN contacts sc ON sc.id = s.contact_id -JOIN contracts c ON c.id = s.contract_id -JOIN contacts cc ON cc.id = c.contact_id -JOIN resellers r ON r.id = cc.reseller_id -JOIN contracts i ON i.id = r.contract_id -JOIN contacts rc ON rc.id = i.contact_id -JOIN ngcp.timezone t; - -CREATE OR REPLACE VIEW v_contract_timezone AS - SELECT cc.id as contact_id, c.id as contract_id, - COALESCE(cc.timezone, rc.timezone, t.name) as name - FROM contracts c -JOIN contacts cc ON cc.id = c.contact_id -JOIN resellers r ON r.id = cc.reseller_id -JOIN contracts i ON i.id = r.contract_id -JOIN contacts rc ON rc.id = i.contact_id -JOIN ngcp.timezone t; - -CREATE OR REPLACE VIEW v_reseller_timezone AS - SELECT rc.id as contact_id, r.id as reseller_id, - COALESCE(rc.timezone, t.name) as name -FROM resellers r -JOIN contracts i ON i.id = r.contract_id -JOIN contacts rc ON rc.id = i.contact_id -JOIN ngcp.timezone t;