diff options
| author | 2019-09-29 16:22:50 +0200 | |
|---|---|---|
| committer | 2019-09-29 16:22:50 +0200 | |
| commit | e3e5954394f4523850c78e80e496f1b916622677 (patch) | |
| tree | 2e20d9091735e1da1de85e273e19635f58111e0f /app/SQL/install.sql.pgsql.php | |
| parent | ec4307c1a64a0f60648fdd7d0a2eb819bbf12965 (diff) | |
PDO refactoring for code simplification (#2522)
* PDO refactor
* Automatic prefix when using the syntax `_tableName`
* Uniformity: MySQL is now PDO::ATTR_EMULATE_PREPARES = false just like SQLite and PostgreSQL, with consequences such as only one statement per query
* Use PDO methods exec(), query(), prepare() + execute() in a more efficient way
* Remove auto-update SQL code for versions older than FreshRSS 1.5 (3 years old)
* The name of the default category is set in PHP instead of in the DB (simplies SQL and allows changing the name according to the FreshRSS language)
* Rename `->bd` to `->pdo` (less of a frenshism, and more informative)
* Fix some requests, which were not compatible with MySQL prepared statements
* Whitespace
* Fix syntax for PostgreSQL sequences
+ MySQL install
* Minor formatting
* Fix lastInsertId for PostgreSQL
* Use PHP 5.6+ const
Take advantage of https://github.com/FreshRSS/FreshRSS/pull/2527
https://www.php.net/manual/en/migration56.new-features.php
* A bit of forgotten PHP 5.6 simplification for cURL
* Forgotten $s
* Mini fix custom user config
https://github.com/FreshRSS/FreshRSS/pull/2490/files#r326290346
* More work on install.php but not finished
* install.php working
* More cleaning of PDO in install
* Even more simplification
Take advantage of PDO->exec() to run multiple statements
* Disallow changing the name of the default category
https://github.com/FreshRSS/FreshRSS/pull/2522#discussion_r326967724
Diffstat (limited to 'app/SQL/install.sql.pgsql.php')
| -rw-r--r-- | app/SQL/install.sql.pgsql.php | 93 |
1 files changed, 47 insertions, 46 deletions
diff --git a/app/SQL/install.sql.pgsql.php b/app/SQL/install.sql.pgsql.php index ef08ca940..dfacc38e7 100644 --- a/app/SQL/install.sql.pgsql.php +++ b/app/SQL/install.sql.pgsql.php @@ -1,14 +1,15 @@ <?php -define('SQL_CREATE_DB', 'CREATE DATABASE "%1$s" ENCODING \'UTF8\';'); +const SQL_CREATE_DB = <<<'SQL' +CREATE DATABASE "%1$s" ENCODING 'UTF8'; +SQL; -global $SQL_CREATE_TABLES; -$SQL_CREATE_TABLES = array( -'CREATE TABLE IF NOT EXISTS "%1$scategory" ( +const SQL_CREATE_TABLES = <<<'SQL' +CREATE TABLE IF NOT EXISTS `_category` ( "id" SERIAL PRIMARY KEY, "name" VARCHAR(255) UNIQUE NOT NULL -);', +); -'CREATE TABLE IF NOT EXISTS "%1$sfeed" ( +CREATE TABLE IF NOT EXISTS `_feed` ( "id" SERIAL PRIMARY KEY, "url" VARCHAR(511) UNIQUE NOT NULL, "category" SMALLINT DEFAULT 0, @@ -25,13 +26,13 @@ $SQL_CREATE_TABLES = array( "attributes" TEXT, -- v1.11.0 "cache_nbEntries" INT DEFAULT 0, "cache_nbUnreads" INT DEFAULT 0, - FOREIGN KEY ("category") REFERENCES "%1$scategory" ("id") ON DELETE SET NULL ON UPDATE CASCADE -);', -'CREATE INDEX "%1$sname_index" ON "%1$sfeed" ("name");', -'CREATE INDEX "%1$spriority_index" ON "%1$sfeed" ("priority");', -'CREATE INDEX "%1$skeep_history_index" ON "%1$sfeed" ("keep_history");', + FOREIGN KEY ("category") REFERENCES `_category` ("id") ON DELETE SET NULL ON UPDATE CASCADE +); +CREATE INDEX `_name_index` ON `_feed` ("name"); +CREATE INDEX `_priority_index` ON `_feed` ("priority"); +CREATE INDEX `_keep_history_index` ON `_feed` ("keep_history"); -'CREATE TABLE IF NOT EXISTS "%1$sentry" ( +CREATE TABLE IF NOT EXISTS `_entry` ( "id" BIGINT NOT NULL PRIMARY KEY, "guid" VARCHAR(760) NOT NULL, "title" VARCHAR(255) NOT NULL, @@ -45,22 +46,21 @@ $SQL_CREATE_TABLES = array( "is_favorite" SMALLINT NOT NULL DEFAULT 0, "id_feed" SMALLINT, "tags" VARCHAR(1023), - FOREIGN KEY ("id_feed") REFERENCES "%1$sfeed" ("id") ON DELETE CASCADE ON UPDATE CASCADE, + FOREIGN KEY ("id_feed") REFERENCES `_feed` ("id") ON DELETE CASCADE ON UPDATE CASCADE, UNIQUE ("id_feed","guid") -);', -'CREATE INDEX "%1$sis_favorite_index" ON "%1$sentry" ("is_favorite");', -'CREATE INDEX "%1$sis_read_index" ON "%1$sentry" ("is_read");', -'CREATE INDEX "%1$sentry_lastSeen_index" ON "%1$sentry" ("lastSeen");', - -'INSERT INTO "%1$scategory" (id, name) - SELECT 1, \'%2$s\' - WHERE NOT EXISTS (SELECT id FROM "%1$scategory" WHERE id = 1) - RETURNING nextval(\'"%1$scategory_id_seq"\');', ); +CREATE INDEX `_is_favorite_index` ON `_entry` ("is_favorite"); +CREATE INDEX `_is_read_index` ON `_entry` ("is_read"); +CREATE INDEX `_entry_lastSeen_index` ON `_entry` ("lastSeen"); + +INSERT INTO `_category` (id, name) + SELECT 1, 'Uncategorized' + WHERE NOT EXISTS (SELECT id FROM `_category` WHERE id = 1) + RETURNING nextval('`_category_id_seq`'); +SQL; -global $SQL_CREATE_TABLE_ENTRYTMP; -$SQL_CREATE_TABLE_ENTRYTMP = array( -'CREATE TABLE IF NOT EXISTS "%1$sentrytmp" ( -- v1.7 +const SQL_CREATE_TABLE_ENTRYTMP = <<<'SQL' +CREATE TABLE IF NOT EXISTS `_entrytmp` ( -- v1.7 "id" BIGINT NOT NULL PRIMARY KEY, "guid" VARCHAR(760) NOT NULL, "title" VARCHAR(255) NOT NULL, @@ -74,36 +74,37 @@ $SQL_CREATE_TABLE_ENTRYTMP = array( "is_favorite" SMALLINT NOT NULL DEFAULT 0, "id_feed" SMALLINT, "tags" VARCHAR(1023), - FOREIGN KEY ("id_feed") REFERENCES "%1$sfeed" ("id") ON DELETE CASCADE ON UPDATE CASCADE, + FOREIGN KEY ("id_feed") REFERENCES `_feed` ("id") ON DELETE CASCADE ON UPDATE CASCADE, UNIQUE ("id_feed","guid") -);', -'CREATE INDEX "%1$sentrytmp_date_index" ON "%1$sentrytmp" ("date");', - -'CREATE INDEX "%1$sentry_feed_read_index" ON "%1$sentry" ("id_feed","is_read");', //v1.7 ); +CREATE INDEX `_entrytmp_date_index` ON `_entrytmp` ("date"); + +-- v1.7 +CREATE INDEX `_entry_feed_read_index` ON `_entry` ("id_feed","is_read"); +SQL; -global $SQL_CREATE_TABLE_TAGS; -$SQL_CREATE_TABLE_TAGS = array( -'CREATE TABLE IF NOT EXISTS "%1$stag" ( -- v1.12 +const SQL_CREATE_TABLE_TAGS = <<<'SQL' +CREATE TABLE IF NOT EXISTS `_tag` ( -- v1.12 "id" SERIAL PRIMARY KEY, "name" VARCHAR(63) UNIQUE NOT NULL, "attributes" TEXT -);', -'CREATE TABLE IF NOT EXISTS "%1$sentrytag" ( +); +CREATE TABLE IF NOT EXISTS `_entrytag` ( "id_tag" SMALLINT, "id_entry" BIGINT, PRIMARY KEY ("id_tag","id_entry"), - FOREIGN KEY ("id_tag") REFERENCES "%1$stag" ("id") ON DELETE CASCADE ON UPDATE CASCADE, - FOREIGN KEY ("id_entry") REFERENCES "%1$sentry" ("id") ON DELETE CASCADE ON UPDATE CASCADE -);', -'CREATE INDEX "%1$sentrytag_id_entry_index" ON "%1$sentrytag" ("id_entry");', + FOREIGN KEY ("id_tag") REFERENCES `_tag` ("id") ON DELETE CASCADE ON UPDATE CASCADE, + FOREIGN KEY ("id_entry") REFERENCES `_entry` ("id") ON DELETE CASCADE ON UPDATE CASCADE ); +CREATE INDEX `_entrytag_id_entry_index` ON `_entrytag` ("id_entry"); +SQL; -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);' -); +const 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; -define('SQL_DROP_TABLES', 'DROP TABLE IF EXISTS "%1$sentrytag", "%1$stag", "%1$sentrytmp", "%1$sentry", "%1$sfeed", "%1$scategory"'); +const SQL_DROP_TABLES = <<<'SQL' +DROP TABLE IF EXISTS `_entrytag`, `_tag`, `_entrytmp`, `_entry`, `_feed`, `_category`; +SQL; |
