Permalink
Browse files

Merge branch 'master' of github.com:sunnysingh/database

  • Loading branch information...
2 parents cc72b1c + d58274d commit 6a41de0d7e8fd42d418b5d46f1ee682c6dcaadee Sunny Singh committed Oct 2, 2011
Showing with 3 additions and 3 deletions.
  1. +1 −1 database.php
  2. +2 −2 docs.md
View
@@ -108,9 +108,9 @@ public function query($query, $params = array()) {
}
} else {
$this->query_count_error++;
+ $debug_backtrace = debug_backtrace();
error_log("MySQL database error: ".$this->connection->error." for query ".$query." in ".$debug_backtrace[1]["file"]." on line ".$debug_backtrace[1]["line"]);
if ($this->debug) {
- $debug_backtrace = debug_backtrace();
echo "Database error: ".$this->connection->error." for query <code>".$query."</code> in ".$debug_backtrace[1]["file"]." on line ".$debug_backtrace[1]["line"];
exit();
}
View
@@ -245,8 +245,8 @@ $db->add_filter("query", function($query) {
return str_replace(
- array("accounts", "music"),
- array("bob_accounts", "bob_music"),
+ array("accounts.", "music."),
+ array("bob_accounts.", "bob_music."),
$query);

0 comments on commit 6a41de0

Please sign in to comment.