Changeset:
2132567531a1
https://sourceforge.net/p/mrbs/hg-code/ci/2132567531a123d255abc69ad467162aef60daf0
Author:
John Beranek <[email protected]>
Date:
Sat Sep 24 21:05:26 2016 +0100
Log message:
Removed references to the sql_* wrappers in internal code
diffstat:
web/auth/auth_db_ext.inc | 6 +++---
web/lib/MRBS/DB.php | 6 +++---
web/lib/MRBS/DB_mysql.php | 4 ++--
web/lib/MRBS/DB_pgsql.php | 2 +-
4 files changed, 9 insertions(+), 9 deletions(-)
diffs (87 lines):
diff -r 23a136da33a7 -r 2132567531a1 web/auth/auth_db_ext.inc
--- a/web/auth/auth_db_ext.inc Sat Sep 24 20:42:51 2016 +0100
+++ b/web/auth/auth_db_ext.inc Sat Sep 24 21:05:26 2016 +0100
@@ -53,7 +53,7 @@
$retval = 0;
- // sql_syntax_casesensitive_equals() modifies our SQL params array for us.
We need an exact match -
+ // syntax_casesensitive_equals() modifies our SQL params array for us. We
need an exact match -
// MySQL allows trailing spaces when using an '=' comparison, eg 'john' =
'john '
$sql_params = array();
@@ -169,7 +169,7 @@
$persist = 0;
$port = isset($auth['db_ext']['db_port']) ?
(int)$auth['db_ext']['db_port'] : NULL;
- // sql_syntax_casesensitive_equals() modifies our SQL params array for
us. We need an exact match -
+ // syntax_casesensitive_equals() modifies our SQL params array for us.
We need an exact match -
// MySQL allows trailing spaces when using an '=' comparison, eg 'john' =
'john '
$sql_params = array();
@@ -223,7 +223,7 @@
$persist = 0;
$port = isset($auth['db_ext']['db_port']) ? (int)$auth['db_ext']['db_port']
: NULL;
- // sql_syntax_casesensitive_equals() modifies our SQL params array for us.
We need an exact match -
+ // syntax_casesensitive_equals() modifies our SQL params array for us. We
need an exact match -
// MySQL allows trailing spaces when using an '=' comparison, eg 'john' =
'john '
$sql_params = array();
diff -r 23a136da33a7 -r 2132567531a1 web/lib/MRBS/DB.php
--- a/web/lib/MRBS/DB.php Sat Sep 24 20:42:51 2016 +0100
+++ b/web/lib/MRBS/DB.php Sat Sep 24 21:05:26 2016 +0100
@@ -97,7 +97,7 @@
// Execute a non-SELECT SQL command (insert/update/delete).
// Returns the number of tuples affected if OK (a number >= 0).
- // Returns -1 on error; use sql_error to get the error message.
+ // Returns -1 on error; use error() to get the error message.
public function command($sql, $params = array())
{
$ret = -1;
@@ -122,7 +122,7 @@
// Execute an SQL query which should return a single non-negative number
value.
- // This is a lightweight alternative to sql_query, good for use with count(*)
+ // This is a lightweight alternative to query(), good for use with count(*)
// and similar queries. It returns -1 on error or if the query did not return
// exactly one value, so error checking is somewhat limited.
// It also returns -1 if the query returns a single NULL value, such as from
@@ -203,7 +203,7 @@
// Return a row from a result as an associative array keyed by field name.
// The first row is 0.
- // This is actually upward compatible with sql_row since the underlying
+ // This is actually upward compatible with row() since the underlying
// routing also stores the data under number indexes.
// When called with i >= number of rows in the result, cleans up from
// the query and returns 0.
diff -r 23a136da33a7 -r 2132567531a1 web/lib/MRBS/DB_mysql.php
--- a/web/lib/MRBS/DB_mysql.php Sat Sep 24 20:42:51 2016 +0100
+++ b/web/lib/MRBS/DB_mysql.php Sat Sep 24 21:05:26 2016 +0100
@@ -47,9 +47,9 @@
// It will lock out other callers of this routine with the same name
argument.
// It may timeout in 20 seconds and return 0, or may wait forever.
// It returns 1 when the lock has been acquired.
- // Caller must release the lock with sql_mutex_unlock().
+ // Caller must release the lock with mutex_unlock().
// Caller must not have more than one mutex at any time.
- // Do not mix this with sql_begin()/sql_end() calls.
+ // Do not mix this with begin()/end() calls.
//
// In MySQL, we avoid table locks, and use low-level locks instead.
public function mutex_lock($name)
diff -r 23a136da33a7 -r 2132567531a1 web/lib/MRBS/DB_pgsql.php
--- a/web/lib/MRBS/DB_pgsql.php Sat Sep 24 20:42:51 2016 +0100
+++ b/web/lib/MRBS/DB_pgsql.php Sat Sep 24 21:05:26 2016 +0100
@@ -79,7 +79,7 @@
// It will lock out other callers of this routine with the same name
argument.
// It may timeout in 20 seconds and return 0, or may wait forever.
// It returns 1 when the lock has been acquired.
- // Caller must release the lock with sql_mutex_unlock().
+ // Caller must release the lock with mutex_unlock().
// Caller must not have more than one mutex at any time.
// Do not mix this with begin()/end() calls.
//
------------------------------------------------------------------------------
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
