chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Restoring old database.lib.php (before doctrine changes).

Browse Source
1.10.x
Julio Montoya 11 years ago
parent 0a9e0565a1
commit 38c626596b
2 changed files with 1157 additions and 92 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 123
      main/inc/lib/database.lib.php
  2. 1126
      main/inc/lib/databaseDoctrine.php

123
main/inc/lib/database.lib.php
Unescape View File

@ -134,8 +134,8 @@ class Database
public static function get_main_table($short_table_name)
{
return self::format_table_name(
self::get_main_database(),
$short_table_name);
self::get_main_database(),
$short_table_name);
}
/**
@ -186,10 +186,8 @@ class Database
* @param resource $connection (optional) The database server connection, for detailed description see the method query().
* @return int Returns the number of affected rows on success, and -1 if the last query failed.
*/
public static function affected_rows(Statement $result)
{
return $result->rowCount();
//return self::use_default_connection($connection) ? mysql_affected_rows() : mysql_affected_rows($connection);
public static function affected_rows($connection = null) {
return self::use_default_connection($connection) ? mysql_affected_rows() : mysql_affected_rows($connection);
}
/**
@ -288,16 +286,13 @@ class Database
*/
public static function escape_string($string, $connection = null, $addFix = true)
{
$string = self::getManager()->getConnection()->quote($string);
return trim($string, "'");
/*return get_magic_quotes_gpc()
return get_magic_quotes_gpc()
? (self::use_default_connection($connection)
? mysql_real_escape_string(stripslashes($string))
: mysql_real_escape_string(stripslashes($string), $connection))
: (self::use_default_connection($connection)
? mysql_real_escape_string($string)
: mysql_real_escape_string($string, $connection));-*/
: mysql_real_escape_string($string, $connection));
}
@ -308,14 +303,10 @@ class Database
* @return array Array of results as returned by php
* @author Yannick Warnier <yannick.warnier@beeznest.com>
*/
public static function fetch_array(Statement $result, $option = 'BOTH')
public static function fetch_array($result, $option = 'BOTH')
{
if ($result === false) {
return array();
}
return $result->fetch(self::customOptionToDoctrineOption($option));
//if ($result === false) { return array(); }
//return $option == 'ASSOC' ? mysql_fetch_array($result, MYSQL_ASSOC) : ($option == 'NUM' ? mysql_fetch_array($result, MYSQL_NUM) : mysql_fetch_array($result));
if ($result === false) { return array(); }
return $option == 'ASSOC' ? mysql_fetch_array($result, MYSQL_ASSOC) : ($option == 'NUM' ? mysql_fetch_array($result, MYSQL_NUM) : mysql_fetch_array($result));
}
/**
@ -324,10 +315,8 @@ class Database
* @param resource $result The result from a call to sql_query (e.g. Database::query).
* @return array Returns an associative array that corresponds to the fetched row and moves the internal data pointer ahead.
*/
public static function fetch_assoc(Statement $result)
{
return $result->fetch(PDO::FETCH_ASSOC);
//return mysql_fetch_assoc($result);
public static function fetch_assoc($result) {
return mysql_fetch_assoc($result);
}
/**
@ -338,11 +327,8 @@ class Database
* @return object Object of class StdClass or the required class, containing the query result row
* @author Yannick Warnier <yannick.warnier@beeznest.com>
*/
//public static function fetch_object($result, $class = null, $params = null) {
public static function fetch_object(Statement $result)
{
return $result->fetch(PDO::FETCH_OBJ);
//return !empty($class) ? (is_array($params) ? mysql_fetch_object($result, $class, $params) : mysql_fetch_object($result, $class)) : mysql_fetch_object($result);
public static function fetch_object($result, $class = null, $params = null) {
return !empty($class) ? (is_array($params) ? mysql_fetch_object($result, $class, $params) : mysql_fetch_object($result, $class)) : mysql_fetch_object($result);
}
/**
@ -350,10 +336,8 @@ class Database
* @param resource The result from a call to sql_query (see Database::query()).
* @return array Array of results as returned by php (mysql_fetch_row)
*/
public static function fetch_row(Statement $result)
{
return $result->fetch(PDO::FETCH_NUM);
//return mysql_fetch_row($result);
public static function fetch_row($result) {
return mysql_fetch_row($result);
}
/**
@ -362,10 +346,8 @@ class Database
* Notes: Use this method if you are concerned about how much memory is being used for queries that return large result sets.
* Anyway, all associated result memory is automatically freed at the end of the script's execution.
*/
public static function free_result(Statement $result)
{
$result->closeCursor();
//return mysql_free_result($result);
public static function free_result($result) {
return mysql_free_result($result);
}
/**
@ -449,10 +431,8 @@ class Database
* @param resource $connection (optional) The database server connection, for detailed description see the method query().
* @return int The last ID as returned by the DB function
*/
public static function insert_id()
{
return self::getManager()->getConnection()->lastInsertId();
//return self::use_default_connection($connection) ? mysql_insert_id() : mysql_insert_id($connection);
public static function insert_id($connection = null) {
return self::use_default_connection($connection) ? mysql_insert_id() : mysql_insert_id($connection);
}
/**
@ -461,10 +441,8 @@ class Database
* @return integer The number of rows contained in this result
* @author Yannick Warnier <yannick.warnier@beeznest.com>
**/
public static function num_rows(Statement $result)
{
return $result->rowCount();
//return is_resource($result) ? mysql_num_rows($result) : false;
public static function num_rows($result) {
return is_resource($result) ? mysql_num_rows($result) : false;
}
/**
@ -475,13 +453,8 @@ class Database
* @param string Optional field name or number
* @return mixed One cell of the result, or FALSE on error
*/
public static function result(Statement $resource, $row, $field = '')
{
if ($resource->rowCount() > 0) {
$result = $resource->fetchAll(PDO::FETCH_BOTH);
return $result[$row][$field];
}
//return self::num_rows($resource) > 0 ? (!empty($field) ? mysql_result($resource, $row, $field) : mysql_result($resource, $row)) : null;
public static function result($resource, $row, $field = '') {
return self::num_rows($resource) > 0 ? (!empty($field) ? mysql_result($resource, $row, $field) : mysql_result($resource, $row)) : null;
}
/**
@ -497,7 +470,7 @@ class Database
* @param string $file (optional) On error it shows the file in which the error has been trigerred (use the "magic" constant __FILE__ as input parameter)
* @param string $line (optional) On error it shows the line in which the error has been trigerred (use the "magic" constant __LINE__ as input parameter)
*
* @return Statement The returned result from the query
* @return resource The returned result from the query
*
* Note: The parameter $connection could be skipped. Here are examples of this method usage:
* Database::query($query);
@ -512,10 +485,6 @@ class Database
*/
public static function query($query, $connection = null, $file = null, $line = null)
{
$result = self::getManager()->getConnection()->executeQuery($query);
return $result;
$use_default_connection = self::use_default_connection($connection);
if ($use_default_connection) {
// Let us do parameter shifting, thus the method would be similar
@ -645,26 +614,6 @@ class Database
return $result;
}
/**
* @param string $option
* @return int
*/
public static function customOptionToDoctrineOption($option)
{
switch($option) {
case 'ASSOC':
return PDO::FETCH_ASSOC;
break;
case 'NUM':
return PDO::FETCH_NUM;
break;
case 'BOTH':
default:
return PDO::FETCH_BOTH;
break;
}
}
/**
* Selects a database.
* @param string $database_name The name of the database that is to be selected.
@ -683,10 +632,7 @@ class Database
* @param option BOTH, ASSOC, or NUM
* @return array - the value returned by the query
*/
public static function store_result(Statement $result, $option = 'BOTH')
{
return $result->fetchAll(self::customOptionToDoctrineOption($option));
public static function store_result($result, $option = 'BOTH') {
$array = array();
if ($result !== false) { // For isolation from database engine's behaviour.
while ($row = self::fetch_array($result, $option)) {
@ -954,13 +900,6 @@ class Database
*/
public static function insert($table_name, $attributes, $show_query = false)
{
$result = self::getManager()->getConnection()->insert($table_name, $attributes);
if ($result) {
return self::insert_id();
}
return false;
if (empty($attributes) || empty($table_name)) {
return false;
}
@ -991,7 +930,7 @@ class Database
* @example array('where'=> array('course_code LIKE "?%"'))
* @example array('where'=> array('type = ? AND category = ?' => array('setting', 'Plugins'))
* @example array('where'=> array('name = "Julio" AND lastname = "montoya"'))
*/
*/
public static function select($columns, $table_name, $conditions = array(), $type_result = 'all', $option = 'ASSOC')
{
$conditions = self::parse_conditions($conditions);
@ -1030,7 +969,7 @@ class Database
* @todo known issues, it doesn't work when using
* LIKE conditions example: array('where'=>array('course_code LIKE "?%"'))
* @param array $conditions
*/
*/
public static function parse_conditions($conditions)
{
if (empty($conditions)) {
@ -1143,8 +1082,8 @@ class Database
$where_return = self::parse_where_conditions($where_conditions);
$sql = "DELETE FROM $table_name $where_return ";
if ($show_query) { echo $sql; echo '<br />'; }
$result = self::query($sql);
$affected_rows = self::affected_rows($result);
self::query($sql);
$affected_rows = self::affected_rows();
//@todo should return affected_rows for
return $affected_rows;
}
@ -1184,8 +1123,8 @@ class Database
if ($show_query) {
var_dump($sql);
}
$result = self::query($sql);
$affected_rows = self::affected_rows($result);
self::query($sql);
$affected_rows = self::affected_rows();
return $affected_rows;
}
}

1126
main/inc/lib/databaseDoctrine.php
View File

File diff suppressed because it is too large Load Diff
Write Preview
Loading…
Cancel
Save