X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=include%2Fdb.php;h=c02e90ef264d794ce15b4bdca09d3ade9a758a1e;hb=HEAD;hp=0479df6a9ade71280e590160c6801321b643d39f;hpb=00daf19e3722b988fe2d5db3349f0cb51883b80c;p=tt-rss.git
diff --git a/include/db.php b/include/db.php
index 0479df6a..c02e90ef 100644
--- a/include/db.php
+++ b/include/db.php
@@ -1,138 +1,38 @@
escape_string($s, $strip_tags);
}
-function db_escape_string($link, $s, $strip_tags = true) {
- if ($strip_tags) $s = strip_tags($s);
-
- if (DB_TYPE == "pgsql") {
- return pg_escape_string($link, $s);
- } else {
- return mysql_real_escape_string($s, $link);
- }
-}
-
-function db_query($link, $query, $die_on_error = true) {
- if (DB_TYPE == "pgsql") {
- $result = pg_query($link, $query);
- if (!$result) {
- $query = htmlspecialchars($query); // just in case
- if ($die_on_error) {
- die("Query $query failed [$result]: " . ($link ? pg_last_error($link) : "No connection"));
- }
- }
- return $result;
- } else if (DB_TYPE == "mysql") {
- $result = mysql_query($query, $link);
- if (!$result) {
- $query = htmlspecialchars($query);
- if ($die_on_error) {
- die("Query $query failed: " . ($link ? mysql_error($link) : "No connection"));
- }
- }
- return $result;
- }
+function db_query($query, $die_on_error = true) {
+ return Db::get()->query($query, $die_on_error);
}
function db_fetch_assoc($result) {
- if (DB_TYPE == "pgsql") {
- return pg_fetch_assoc($result);
- } else if (DB_TYPE == "mysql") {
- return mysql_fetch_assoc($result);
- }
+ return Db::get()->fetch_assoc($result);
}
function db_num_rows($result) {
- if (DB_TYPE == "pgsql") {
- return pg_num_rows($result);
- } else if (DB_TYPE == "mysql") {
- return mysql_num_rows($result);
- }
+ return Db::get()->num_rows($result);
}
function db_fetch_result($result, $row, $param) {
- if (DB_TYPE == "pgsql") {
- return pg_fetch_result($result, $row, $param);
- } else if (DB_TYPE == "mysql") {
- // I hate incoherent naming of PHP functions
- return mysql_result($result, $row, $param);
- }
-}
-
-function db_unescape_string($str) {
- $tmp = str_replace("\\\"", "\"", $str);
- $tmp = str_replace("\\'", "'", $tmp);
- return $tmp;
+ return Db::get()->fetch_result($result, $row, $param);
}
-function db_close($link) {
- if (DB_TYPE == "pgsql") {
-
- return pg_close($link);
-
- } else if (DB_TYPE == "mysql") {
- return mysql_close($link);
- }
+function db_affected_rows($result) {
+ return Db::get()->affected_rows($result);
}
-function db_affected_rows($link, $result) {
- if (DB_TYPE == "pgsql") {
- return pg_affected_rows($result);
- } else if (DB_TYPE == "mysql") {
- return mysql_affected_rows($link);
- }
+function db_last_error() {
+ return Db::get()->last_error();
}
-function db_last_error($link) {
- if (DB_TYPE == "pgsql") {
- return pg_last_error($link);
- } else if (DB_TYPE == "mysql") {
- return mysql_error($link);
- }
+function db_last_query_error() {
+ return Db::get()->last_query_error();
}
function db_quote($str){
- return("'$str'");
+ return Db::get()->quote($str);
}
-
-?>