diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2019-11-04 17:45:15 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2019-11-04 17:45:15 +0100 |
| commit | 7819a43197d34ef7a6c5626e9e48d7db075c37c9 (patch) | |
| tree | c53735a350f01292642125fcb8686e2121afc38e /app/SQL | |
| parent | 67fc72fb618558f352acc7e098163d05294a6a66 (diff) | |
Default or custom OPML (#2627)
* Default or custom OPML
Fix https://github.com/FreshRSS/FreshRSS/issues/2075
Replaces https://github.com/FreshRSS/FreshRSS/pull/2515
https://github.com/FreshRSS/FreshRSS/issues/2514
Uses the local ./data/opml.xml if it exists, otherwise
./opml.default.xml
* Better message
* Move to controller
Diffstat (limited to 'app/SQL')
| -rw-r--r-- | app/SQL/install.sql.mysql.php | 5 | ||||
| -rw-r--r-- | app/SQL/install.sql.pgsql.php | 6 | ||||
| -rw-r--r-- | app/SQL/install.sql.sqlite.php | 5 |
3 files changed, 0 insertions, 16 deletions
diff --git a/app/SQL/install.sql.mysql.php b/app/SQL/install.sql.mysql.php index 1eabfae8b..f8972b186 100644 --- a/app/SQL/install.sql.mysql.php +++ b/app/SQL/install.sql.mysql.php @@ -112,11 +112,6 @@ CREATE TABLE IF NOT EXISTS `_entrytag` ( -- v1.12 ENGINE = INNODB; SQL; -$SQL_INSERT_FEED = <<<'SQL' -INSERT IGNORE INTO `_feed` (url, category, name, website, description, ttl) - VALUES(:url, 1, :name, :website, :description, 86400); -SQL; - $SQL_DROP_TABLES = <<<'SQL' DROP TABLE IF EXISTS `_entrytag`, `_tag`, `_entrytmp`, `_entry`, `_feed`, `_category`; SQL; diff --git a/app/SQL/install.sql.pgsql.php b/app/SQL/install.sql.pgsql.php index 53afc8a17..c17a45127 100644 --- a/app/SQL/install.sql.pgsql.php +++ b/app/SQL/install.sql.pgsql.php @@ -100,12 +100,6 @@ CREATE TABLE IF NOT EXISTS `_entrytag` ( CREATE INDEX IF NOT EXISTS `_entrytag_id_entry_index` ON `_entrytag` ("id_entry"); SQL; -$SQL_INSERT_FEED = <<<'SQL' -INSERT INTO `_feed` (url, category, name, website, description, ttl) - SELECT :url::VARCHAR, 1, :name, :website, :description, 86400 - WHERE NOT EXISTS (SELECT id FROM `_feed` WHERE url = :url); -SQL; - $SQL_DROP_TABLES = <<<'SQL' DROP TABLE IF EXISTS `_entrytag`, `_tag`, `_entrytmp`, `_entry`, `_feed`, `_category`; SQL; diff --git a/app/SQL/install.sql.sqlite.php b/app/SQL/install.sql.sqlite.php index 2a4763637..ff7c03354 100644 --- a/app/SQL/install.sql.sqlite.php +++ b/app/SQL/install.sql.sqlite.php @@ -102,11 +102,6 @@ CREATE TABLE IF NOT EXISTS `entrytag` ( CREATE INDEX IF NOT EXISTS entrytag_id_entry_index ON `entrytag` (`id_entry`); SQL; -$SQL_INSERT_FEED = <<<'SQL' -INSERT OR IGNORE INTO `feed` (url, category, name, website, description, ttl) - VALUES(:url, 1, :name, :website, :description, 86400); -SQL; - $SQL_DROP_TABLES = <<<'SQL' DROP TABLE IF EXISTS `entrytag`; DROP TABLE IF EXISTS `tag`; |