aboutsummaryrefslogtreecommitdiff
path: root/app/Models/UserDAO.php
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2019-09-29 16:22:50 +0200
committerGravatar GitHub <noreply@github.com> 2019-09-29 16:22:50 +0200
commite3e5954394f4523850c78e80e496f1b916622677 (patch)
tree2e20d9091735e1da1de85e273e19635f58111e0f /app/Models/UserDAO.php
parentec4307c1a64a0f60648fdd7d0a2eb819bbf12965 (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/Models/UserDAO.php')
-rw-r--r--app/Models/UserDAO.php57
1 files changed, 9 insertions, 48 deletions
diff --git a/app/Models/UserDAO.php b/app/Models/UserDAO.php
index 6292cc09f..7580de06e 100644
--- a/app/Models/UserDAO.php
+++ b/app/Models/UserDAO.php
@@ -1,43 +1,22 @@
<?php
class FreshRSS_UserDAO extends Minz_ModelPdo {
- public function createUser($new_user_language = null, $insertDefaultFeeds = false) {
- require_once(APP_PATH . '/SQL/install.sql.' . $this->bd->dbType() . '.php');
-
- $currentLanguage = Minz_Translate::language();
+ public function createUser($insertDefaultFeeds = false) {
+ require_once(APP_PATH . '/SQL/install.sql.' . $this->pdo->dbType() . '.php');
try {
- if ($new_user_language != null) {
- Minz_Translate::reset($new_user_language);
- }
- $ok = false;
- if (defined('SQL_CREATE_TABLES')) { //E.g. MySQL
- $sql = sprintf(SQL_CREATE_TABLES . SQL_CREATE_TABLE_ENTRYTMP . SQL_CREATE_TABLE_TAGS, $this->prefix, _t('gen.short.default_category'));
- $stm = $this->bd->prepare($sql);
- $ok = $stm && $stm->execute();
- } else { //E.g. SQLite
- global $SQL_CREATE_TABLES, $SQL_CREATE_TABLE_ENTRYTMP, $SQL_CREATE_TABLE_TAGS;
- if (is_array($SQL_CREATE_TABLES)) {
- $instructions = array_merge($SQL_CREATE_TABLES, $SQL_CREATE_TABLE_ENTRYTMP, $SQL_CREATE_TABLE_TAGS);
- $ok = !empty($instructions);
- foreach ($instructions as $instruction) {
- $sql = sprintf($instruction, $this->prefix, _t('gen.short.default_category'));
- $stm = $this->bd->prepare($sql);
- $ok &= ($stm && $stm->execute());
- }
- }
- }
+ $sql = SQL_CREATE_TABLES . SQL_CREATE_TABLE_ENTRYTMP . SQL_CREATE_TABLE_TAGS;
+ $ok = $this->pdo->exec($sql) !== false; //Note: Only exec() can take multiple statements safely.
if ($ok && $insertDefaultFeeds) {
$default_feeds = FreshRSS_Context::$system_conf->default_feeds;
+ $stm = $this->pdo->prepare(SQL_INSERT_FEED);
foreach ($default_feeds as $feed) {
- $sql = sprintf(SQL_INSERT_FEED, $this->prefix);
- $stm = $this->bd->prepare($sql);
- $parameters = array(
+ $parameters = [
':url' => $feed['url'],
':name' => $feed['name'],
':website' => $feed['website'],
':description' => $feed['description'],
- );
+ ];
$ok &= ($stm && $stm->execute($parameters));
}
}
@@ -45,8 +24,6 @@ class FreshRSS_UserDAO extends Minz_ModelPdo {
Minz_Log::error('Error while creating database for user: ' . $e->getMessage());
}
- Minz_Translate::reset($currentLanguage);
-
if ($ok) {
return true;
} else {
@@ -61,25 +38,9 @@ class FreshRSS_UserDAO extends Minz_ModelPdo {
fwrite(STDERR, 'Deleting SQL data for user “' . $this->current_user . "”…\n");
}
- require_once(APP_PATH . '/SQL/install.sql.' . $this->bd->dbType() . '.php');
+ require_once(APP_PATH . '/SQL/install.sql.' . $this->pdo->dbType() . '.php');
- $ok = false;
- if (defined('SQL_DROP_TABLES')) { //E.g. MySQL
- $sql = sprintf(SQL_DROP_TABLES, $this->prefix);
- $stm = $this->bd->prepare($sql);
- $ok = $stm && $stm->execute();
- } else { //E.g. SQLite
- global $SQL_DROP_TABLES;
- if (is_array($SQL_DROP_TABLES)) {
- $instructions = $SQL_DROP_TABLES;
- $ok = !empty($instructions);
- foreach ($instructions as $instruction) {
- $sql = sprintf($instruction, $this->prefix);
- $stm = $this->bd->prepare($sql);
- $ok &= ($stm && $stm->execute());
- }
- }
- }
+ $ok = $this->pdo->exec(SQL_DROP_TABLES) !== false;
if ($ok) {
return true;