X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=migrations%2Fmigrate-v4-to-v5.sql;h=31027b2515bc45855d390ac3362bba0f8d547af3;hb=eafc0194bc0dde66e31315a72f2cb05775c9800b;hp=86f4db902bb8f915ea80881f472410b57421accb;hpb=b3c3e1029ce254558c7135ef114f72c986093aad;p=plcapi.git

diff --git a/migrations/migrate-v4-to-v5.sql b/migrations/migrate-v4-to-v5.sql
index 86f4db9..31027b2 100644
--- a/migrations/migrate-v4-to-v5.sql
+++ b/migrations/migrate-v4-to-v5.sql
@@ -12,8 +12,9 @@ ALTER TABLE interfaces RENAME COLUMN nodenetwork_id TO interface_id;
 
 ALTER INDEX nodenetworks_node_id_idx RENAME TO interfaces_node_id_idx;
 
-ALTER TABLE nodenetwork_setting_types RENAME TO interface_setting_types;
-ALTER TABLE interface_setting_types RENAME COLUMN nodenetwork_setting_type_id TO interface_setting_type_id;
+-- xxx need manual merge -> turn into tag_type
+--ALTER TABLE nodenetwork_setting_types RENAME TO interface_setting_types;
+--ALTER TABLE interface_setting_types RENAME COLUMN nodenetwork_setting_type_id TO interface_setting_type_id;
 
 ALTER TABLE nodenetwork_setting RENAME TO interface_setting;
 
@@ -31,7 +32,8 @@ ALTER TABLE interface_settings RENAME COLUMN nodenetwork_setting_ids TO interfac
 ALTER TABLE view_nodenetwork_settings RENAME TO view_interface_settings;
 ALTER TABLE view_interface_settings RENAME COLUMN nodenetwork_setting_id TO interface_setting_id;
 ALTER TABLE view_interface_settings RENAME COLUMN nodenetwork_id TO interface_id;
-ALTER TABLE view_interface_settings RENAME COLUMN nodenetwork_setting_type_id TO interface_setting_type_id;
+-- xxx need manual merge -> turn into tag_type
+--ALTER TABLE view_interface_settings RENAME COLUMN nodenetwork_setting_type_id TO interface_setting_type_id;
 
 ALTER TABLE view_nodenetworks RENAME TO view_interfaces;
 ALTER TABLE view_interfaces RENAME COLUMN nodenetwork_id TO interface_id;
@@ -42,7 +44,7 @@ ALTER TABLE view_nodes RENAME COLUMN nodenetwork_ids TO interface_ids;
 ----------------------------------------
 -- node tags
 ----------------------------------------
-CREATE TABLE node_tag_types ...
+CREATE TABLE tag_types ...
 CREATE TABLE node_tag ...
 
 ---------- related views
@@ -72,7 +74,7 @@ CREATE OR REPLACE VIEW view_nodes AS ...
 ----------------------------------------
 -- ilinks
 ----------------------------------------
-CREATE TABLE link_types ...
+--CREATE TABLE link_types ...
 CREATE TABLE ilink ...
 
 CREATE OR REPLACE VIEW ilinks AS ...