1
0
mirror of https://github.com/dg/dibi.git synced 2025-08-12 17:14:16 +02:00

* quoteName -> delimite

* fixed mysql_connect bug
This commit is contained in:
David Grudl
2007-04-16 03:01:55 +00:00
parent 57fa5831b1
commit 166f716091
10 changed files with 34 additions and 34 deletions

View File

@@ -63,7 +63,7 @@ class DibiMySqlDriver extends DibiDriver
$php_errormsg = '';
if (empty($config['persistent']))
$conn = @mysql_connect($host, $config['username'], $config['password']);
$conn = @mysql_connect($host, $config['username'], $config['password'], TRUE);
else
$conn = @mysql_pconnect($host, $config['username'], $config['password']);
@@ -159,7 +159,7 @@ class DibiMySqlDriver extends DibiDriver
}
public function escape($value, $appendQuotes = FALSE)
public function escape($value, $appendQuotes=TRUE)
{
return $appendQuotes
? "'" . mysql_real_escape_string($value, $this->conn) . "'"
@@ -167,7 +167,7 @@ class DibiMySqlDriver extends DibiDriver
}
public function quoteName($value)
public function delimite($value)
{
return '`' . str_replace('.', '`.`', $value) . '`';
}

View File

@@ -133,7 +133,7 @@ class DibiMySqliDriver extends DibiDriver
public function escape($value, $appendQuotes = FALSE)
public function escape($value, $appendQuotes=TRUE)
{
return $appendQuotes
? "'" . mysqli_real_escape_string($this->conn, $value) . "'"
@@ -141,7 +141,7 @@ class DibiMySqliDriver extends DibiDriver
}
public function quoteName($value)
public function delimite($value)
{
return '`' . str_replace('.', '`.`', $value) . '`';
}

View File

@@ -133,7 +133,7 @@ class DibiOdbcDriver extends DibiDriver
public function escape($value, $appendQuotes = FALSE)
public function escape($value, $appendQuotes=TRUE)
{
$value = str_replace("'", "''", $value);
return $appendQuotes
@@ -142,7 +142,7 @@ class DibiOdbcDriver extends DibiDriver
}
public function quoteName($value)
public function delimite($value)
{
return '[' . str_replace('.', '].[', $value) . ']';
}

View File

@@ -112,7 +112,7 @@ class DibiPdoDriver extends DibiDriver
}
public function escape($value, $appendQuotes = FALSE)
public function escape($value, $appendQuotes=TRUE)
{
if (!$appendQuotes) {
trigger_error('dibi: escaping without qoutes is not supported by PDO', E_USER_WARNING);
@@ -122,7 +122,7 @@ class DibiPdoDriver extends DibiDriver
}
public function quoteName($value)
public function delimite($value)
{
// quoting is not supported by PDO
return $value;

View File

@@ -123,7 +123,7 @@ class DibiPostgreDriver extends DibiDriver
}
public function escape($value, $appendQuotes = FALSE)
public function escape($value, $appendQuotes=TRUE)
{
return $appendQuotes
? "'" . pg_escape_string($value) . "'"
@@ -131,7 +131,7 @@ class DibiPostgreDriver extends DibiDriver
}
public function quoteName($value)
public function delimite($value)
{
return $value;
}

View File

@@ -125,7 +125,7 @@ class DibiSqliteDriver extends DibiDriver
}
public function escape($value, $appendQuotes = FALSE)
public function escape($value, $appendQuotes=TRUE)
{
return $appendQuotes
? "'" . sqlite_escape_string($value) . "'"
@@ -133,7 +133,7 @@ class DibiSqliteDriver extends DibiDriver
}
public function quoteName($value)
public function delimite($value)
{
return '[' . $value . ']';
}