diff options
| author | 2019-09-11 18:40:17 +0200 | |
|---|---|---|
| committer | 2019-09-11 18:40:17 +0200 | |
| commit | 7b4cd3abae88bf1b8a04642489b68a741e4d2c6a (patch) | |
| tree | d9c46df4256d27f7925703cbd8476d6d61e8c817 /app/SQL | |
| parent | 84f9311fd53f5fa58ae55986ece9bfa7dac455c1 (diff) | |
add: Allow admins to configure default feeds (#2515)
* Homogenize SQL_INSERT_FEEDS across database types
* Extract default feeds into system configuration
* Adapt default feeds init during installation
Diffstat (limited to 'app/SQL')
| -rw-r--r-- | app/SQL/install.sql.mysql.php | 9 | ||||
| -rw-r--r-- | app/SQL/install.sql.pgsql.php | 13 | ||||
| -rw-r--r-- | app/SQL/install.sql.sqlite.php | 10 |
3 files changed, 14 insertions, 18 deletions
diff --git a/app/SQL/install.sql.mysql.php b/app/SQL/install.sql.mysql.php index b3353ac95..0f396f701 100644 --- a/app/SQL/install.sql.mysql.php +++ b/app/SQL/install.sql.mysql.php @@ -109,10 +109,11 @@ CREATE TABLE IF NOT EXISTS `%1$sentrytag` ( -- v1.12 ENGINE = INNODB; '); -define('SQL_INSERT_FEEDS', ' -INSERT IGNORE INTO `%1$sfeed` (url, category, name, website, description, ttl) VALUES("https://freshrss.org/feeds/all.atom.xml", 1, "FreshRSS.org", "https://freshrss.org/", "FreshRSS, a free, self-hostable aggregator…", 86400); -INSERT IGNORE INTO `%1$sfeed` (url, category, name, website, description, ttl) VALUES("https://github.com/FreshRSS/FreshRSS/releases.atom", 1, "FreshRSS @ GitHub", "https://github.com/FreshRSS/FreshRSS/", "FreshRSS releases @ GitHub", 86400); -'); +define( + 'SQL_INSERT_FEED', + 'INSERT IGNORE INTO `%1$sfeed` (url, category, name, website, description, ttl) + VALUES(:url, 1, :name, :website, :description, 86400);' +); define('SQL_DROP_TABLES', 'DROP TABLE IF EXISTS `%1$sentrytag`, `%1$stag`, `%1$sentrytmp`, `%1$sentry`, `%1$sfeed`, `%1$scategory`'); diff --git a/app/SQL/install.sql.pgsql.php b/app/SQL/install.sql.pgsql.php index e68e6f3be..ef08ca940 100644 --- a/app/SQL/install.sql.pgsql.php +++ b/app/SQL/install.sql.pgsql.php @@ -99,14 +99,11 @@ $SQL_CREATE_TABLE_TAGS = array( 'CREATE INDEX "%1$sentrytag_id_entry_index" ON "%1$sentrytag" ("id_entry");', ); -global $SQL_INSERT_FEEDS; -$SQL_INSERT_FEEDS = array( -'INSERT INTO "%1$sfeed" (url, category, name, website, description, ttl) - SELECT \'https://freshrss.org/feeds/all.atom.xml\', 1, \'FreshRSS.org\', \'https://freshrss.org/\', \'FreshRSS, a free, self-hostable aggregator…\', 86400 - WHERE NOT EXISTS (SELECT id FROM "%1$sfeed" WHERE url = \'https://freshrss.org/feeds/all.atom.xml\');', -'INSERT INTO "%1$sfeed" (url, category, name, website, description, ttl) - SELECT \'https://github.com/FreshRSS/FreshRSS/releases.atom\', 1, \'FreshRSS @ GitHub\', \'https://github.com/FreshRSS/FreshRSS/\', \'FreshRSS releases @ GitHub\', 86400 - WHERE NOT EXISTS (SELECT id FROM "%1$sfeed" WHERE url = \'https://github.com/FreshRSS/FreshRSS/releases.atom\');', +define( + 'SQL_INSERT_FEED', + 'INSERT INTO "%1$sfeed" (url, category, name, website, description, ttl) + SELECT :url::VARCHAR, 1, :name, :website, :description, 86400 + WHERE NOT EXISTS (SELECT id FROM "%1$sfeed" WHERE url = :url);' ); define('SQL_DROP_TABLES', 'DROP TABLE IF EXISTS "%1$sentrytag", "%1$stag", "%1$sentrytmp", "%1$sentry", "%1$sfeed", "%1$scategory"'); diff --git a/app/SQL/install.sql.sqlite.php b/app/SQL/install.sql.sqlite.php index 1dd5f2647..d1dbfc192 100644 --- a/app/SQL/install.sql.sqlite.php +++ b/app/SQL/install.sql.sqlite.php @@ -99,12 +99,10 @@ $SQL_CREATE_TABLE_TAGS = array( 'CREATE INDEX entrytag_id_entry_index ON `entrytag` (`id_entry`);', ); -global $SQL_INSERT_FEEDS; -$SQL_INSERT_FEEDS = array( -'INSERT OR IGNORE INTO `feed` (url, category, name, website, description, ttl) - VALUES ("https://freshrss.org/feeds/all.atom.xml", 1, "FreshRSS.org", "https://freshrss.org/", "FreshRSS, a free, self-hostable aggregator…", 86400);', -'INSERT OR IGNORE INTO `feed` (url, category, name, website, description, ttl) - VALUES ("https://github.com/FreshRSS/FreshRSS/releases.atom", 1, "FreshRSS releases", "https://github.com/FreshRSS/FreshRSS/", "FreshRSS releases @ GitHub", 86400);', +define( + 'SQL_INSERT_FEED', + 'INSERT OR IGNORE INTO `feed` (url, category, name, website, description, ttl) + VALUES(:url, 1, :name, :website, :description, 86400);' ); define('SQL_DROP_TABLES', 'DROP TABLE IF EXISTS `entrytag`, `tag`, `entrytmp`, `entry`, `feed`, `category`'); |
