From ff767a14ff7675fce7b23b918f41fa92157dd0c0 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Mon, 22 Sep 2014 03:31:11 -0400
Subject: [PATCH] Merge branch 'oracle'
---
bin/updatedb.sh | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/bin/updatedb.sh b/bin/updatedb.sh
index 964bc18..e981807 100755
--- a/bin/updatedb.sh
+++ b/bin/updatedb.sh
@@ -55,9 +55,9 @@
// Read DB schema version from database (if 'system' table exists)
if (in_array($DB->table_name('system'), (array)$DB->list_tables())) {
- $DB->query("SELECT " . $DB->quote_identifier('value')
- ." FROM " . $DB->quote_identifier($DB->table_name('system'))
- ." WHERE " . $DB->quote_identifier('name') ." = ?",
+ $DB->query("SELECT `value`"
+ ." FROM " . $DB->table_name('system', true)
+ ." WHERE `name` = ?",
$opts['package'] . '-version');
$row = $DB->fetch_array();
@@ -159,17 +159,16 @@
return;
}
- $system_table = $DB->quote_identifier($DB->table_name('system'));
+ $system_table = $DB->table_name('system', true);
$DB->query("UPDATE " . $system_table
- ." SET " . $DB->quote_identifier('value') . " = ?"
- ." WHERE " . $DB->quote_identifier('name') . " = ?",
+ ." SET `value` = ?"
+ ." WHERE `name` = ?",
$version, $package . '-version');
if (!$DB->is_error() && !$DB->affected_rows()) {
$DB->query("INSERT INTO " . $system_table
- ." (" . $DB->quote_identifier('name') . ", " . $DB->quote_identifier('value') . ")"
- ." VALUES (?, ?)",
+ ." (`name`, `value`) VALUES (?, ?)",
$package . '-version', $version);
}
--
Gitblit v1.9.1