From a2f571f759c6484d6f61c60ac8c9af9cf467cbe0 Mon Sep 17 00:00:00 2001
From: Fred Gleason <fredg@paraelsystems.com>
Date: Sun, 23 Feb 2020 14:55:51 -0500
Subject: [PATCH] Revised schema update 315

---
 ChangeLog                      | 5 ++++-
 docs/tables/superfeed_maps.txt | 0
 utils/rddbmgr/revertschema.cpp | 2 +-
 utils/rddbmgr/updateschema.cpp | 8 ++++++--
 4 files changed, 11 insertions(+), 4 deletions(-)
 create mode 100644 docs/tables/superfeed_maps.txt

diff --git a/ChangeLog b/ChangeLog
index 59547951..c8b222d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19544,7 +19544,7 @@
 	rdadmin(1).
 2020-02-11 Fred Gleason <fredg@paravelsys tems.com>
 	* Added a 'FEEDS.IS_SUPERFEED' field to the database.
-	* Added a 'FEED_KEY_NAMES' table to the database.
+	* Added a 'SUPERFEED_MAPS' table to the database.
 	* Incremented the database version to 315.
 	* Added a 'Superfeed' column to the feed list in the 'Rivendell
 	Feed List' dialog in rdadmin(1).
@@ -19586,3 +19586,6 @@
 	static methods.
 	* Added logic to rdcastmanager(1) to insert the author's e-mail
 	contact automatically when posting a new episode.
+2020-02-21 Fred Gleason <fredg@paravelsystems.com>
+	* Tweaked controls to be disabled for superfeeds in the 'Edit Feed'
+	dialog in rdadmin(1).
diff --git a/docs/tables/superfeed_maps.txt b/docs/tables/superfeed_maps.txt
new file mode 100644
index 00000000..e69de29b
diff --git a/utils/rddbmgr/revertschema.cpp b/utils/rddbmgr/revertschema.cpp
index 11f89209..5a4598cf 100644
--- a/utils/rddbmgr/revertschema.cpp
+++ b/utils/rddbmgr/revertschema.cpp
@@ -63,7 +63,7 @@ bool MainObject::RevertSchema(int cur_schema,int set_schema,QString *err_msg)
   // Revert 315
   //
   if((cur_schema==315)&&(set_schema<cur_schema)) {
-    DropTable("FEED_KEY_NAMES");
+    DropTable("SUPERFEED_MAPS");
     DropIndex("FEEDS","IS_SUPERFEED_IDX");
     DropColumn("FEEDS","IS_SUPERFEED");
 
diff --git a/utils/rddbmgr/updateschema.cpp b/utils/rddbmgr/updateschema.cpp
index 9d4c2cdb..5f75735b 100644
--- a/utils/rddbmgr/updateschema.cpp
+++ b/utils/rddbmgr/updateschema.cpp
@@ -9914,9 +9914,14 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg)
       return false;
     }
 
-    sql=QString("create table FEED_KEY_NAMES (")+
+    sql=QString("create table SUPERFEED_MAPS (")+
+      "ID int unsigned primary key auto_increment,"+
+      "FEED_ID int unsigned not null,"+
+      "MEMBER_FEED_ID int unsigned not null,"+
       "KEY_NAME varchar(8) not null,"+
       "MEMBER_KEY_NAME varchar(8) not null,"+
+      "index FEED_ID_IDX(FEED_ID),"+
+      "index MEMBER_FEED_ID_IDX(MEMBER_FEED_ID),"+
       "index KEY_NAME_IDX(KEY_NAME),"+
       "index MEMBER_KEY_NAME_IDX(MEMBER_KEY_NAME))";
     if(!RDSqlQuery::apply(sql,err_msg)) {
@@ -9951,7 +9956,6 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg)
   }
 
 
-
   // NEW SCHEMA UPDATES GO HERE...
 
   //