adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-19 02:56:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Refactoring DboSource to remove use of str_split, adding $read (false to calls to) DboSource::value() inside DboSource::create(), cleaning up code formatting, fixes #5598, fixes #5682

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7802 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
nate 2008-10-30 05:03:01 +00:00
parent f8ead3efac
commit 40bf675589
3 changed files with 49 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cake/libs/model/datasources/dbo/dbo_postgres.php
View file

@ -295,7 +295,7 @@ class DboPostgres extends DboSource {
return (!empty($data) ? 'TRUE' : 'FALSE');
break;
default:
$data = pg_escape_string($data);
$data = pg_escape_string($this->connection, $data);
break;
}
return "'" . $data . "'";

48
cake/libs/model/datasources/dbo_source.php
View file

@ -129,14 +129,21 @@ class DboSource extends DataSource {
* Prepares a value, or an array of values for database queries by quoting and escaping them.
*
* @param mixed $data A value or an array of values to prepare.
* @param string $column The column into which this data will be inserted
* @param boolean $read Value to be used in READ or WRITE context
* @return mixed Prepared value or array of values.
*/
function value($data, $column = null) {
function value($data, $column = null, $read = true) {
if (is_array($data) && !empty($data)) {
return array_map(array(&$this, 'value'), $data, array_fill(0, count($data), $column));
} elseif (is_object($data)) {
if (isset($data->type) && $data->type == 'identifier') {
return array_map(
array(&$this, 'value'),
$data, array_fill(0, count($data), $column), array_fill(0, count($data), $read)
);
} elseif (is_object($data) && isset($data->type)) {
if ($data->type == 'identifier') {
return $this->name($data->value);
} elseif ($data->type == 'expression') {
return $data->value;
}
} elseif (in_array($data, array('{$__cakeID__$}', '{$__cakeForeignKey__$}'), true)) {
return $data;
@ -564,7 +571,7 @@ class DboSource extends DataSource {
$count = count($fields);
for ($i = 0; $i < $count; $i++) {
$valueInsert[] = $this->value($values[$i], $model->getColumnType($fields[$i]));
$valueInsert[] = $this->value($values[$i], $model->getColumnType($fields[$i]), false);
}
for ($i = 0; $i < $count; $i++) {
$fieldInsert[] = $this->name($fields[$i]);
@ -572,8 +579,13 @@ class DboSource extends DataSource {
$id = $values[$i];
}
}
$query = array(
'table' => $this->fullTableName($model),
'fields' => join(', ', $fieldInsert),
'values' => join(', ', $valueInsert)
);
if ($this->execute('INSERT INTO ' . $this->fullTableName($model) . ' (' . join(',', $fieldInsert). ') VALUES (' . join(',', $valueInsert) . ')')) {
if ($this->execute($this->renderStatement('create', $query))) {
if (empty($id)) {
$id = $this->lastInsertId($this->fullTableName($model, false), $model->primaryKey);
}
@ -1292,6 +1304,9 @@ class DboSource extends DataSource {
case 'select':
return "SELECT {$fields} FROM {$table} {$alias} {$joins} {$conditions} {$group} {$order} {$limit}";
break;
case 'create':
return "INSERT INTO {$table} ({$fields}) VALUES ({$values})";
break;
case 'update':
if (!empty($alias)) {
$aliases = "{$this->alias}{$alias} {$joins} ";
@ -1370,8 +1385,9 @@ class DboSource extends DataSource {
if ($conditions === false) {
return false;
}
$query = compact('table', 'alias', 'joins', 'fields', 'conditions');
if (!$this->execute($this->renderStatement('update', compact('table', 'alias', 'joins', 'fields', 'conditions')))) {
if (!$this->execute($this->renderStatement('update', $query))) {
$model->onError();
return false;
}
@ -1739,7 +1755,9 @@ class DboSource extends DataSource {
if (empty($conditions) || trim($conditions) == '' || $conditions === true) {
return $clause . '1 = 1';
}
if (preg_match('/^WHERE\\x20|^GROUP\\x20BY\\x20|^HAVING\\x20|^ORDER\\x20BY\\x20/i', $conditions, $match)) {
$clauses = '/^WHERE\\x20|^GROUP\\x20BY\\x20|^HAVING\\x20|^ORDER\\x20BY\\x20/i';
if (preg_match($clauses, $conditions, $match)) {
$clause = '';
}
if (trim($conditions) == '') {
@ -1850,8 +1868,8 @@ class DboSource extends DataSource {
return $out;
}
/**
* Extracts a Model.field identifier and an SQL condition operator from a string, formats and inserts values,
* and composes them into an SQL snippet.
* Extracts a Model.field identifier and an SQL condition operator from a string, formats
* and inserts values, and composes them into an SQL snippet.
*
* @param Model $model Model object initiating the query
* @param string $key An SQL key snippet containing a field and optional SQL operator
@ -1869,16 +1887,20 @@ class DboSource extends DataSource {
} else {
list($key, $operator) = explode(' ', trim($key), 2);
if (!preg_match($operatorMatch, trim($operator))) {
if (!preg_match($operatorMatch, trim($operator)) && strpos($operator, ' ') !== false) {
$key = $key . ' ' . $operator;
list($key, $operator) = str_split($key, strrpos($key, ' '));
$split = strrpos($key, ' ');
$operator = substr($key, $split);
$key = substr($key, 0, $split);
}
}
$type = (is_object($model) ? $model->getColumnType($key) : null);
$null = ($value === null || (is_array($value) && empty($value)));
if (strtolower($operator) === 'not') {
$data = $this->conditionKeysToString(array($operator => array($key => $value)), true, $model);
$data = $this->conditionKeysToString(
array($operator => array($key => $value)), true, $model
);
return $data[0];
}
$value = $this->value($value, $type);

17
cake/libs/view/helpers/javascript.php
View file

@ -157,11 +157,17 @@ class JavascriptHelper extends AppHelper {
* Returns a JavaScript script tag.
*
* @param string $script The JavaScript to be wrapped in SCRIPT tags.
* @param array $options Set of options: allowCache, safe
* @param boolean $safe DEPRECATED. Use $options['safe'] instead
* @return string The full SCRIPT element, with the JavaScript inside it.
* @param array $options Set of options:
* - allowCache: boolean, designates whether this block is cacheable using the
* current cache settings.
* - safe: boolean, whether this block should be wrapped in CDATA tags. Defaults
* to helper's object configuration.
* - inline: whether the block should be printed inline, or written
* to cached for later output (i.e. $scripts_for_layout).
* @return string The full SCRIPT element, with the JavaScript inside it, or null,
* if 'inline' is set to false.
*/
function codeBlock($script = null, $options = array(), $safe = true) {
function codeBlock($script = null, $options = array()) {
if (!empty($options) && !is_array($options)) {
$options = array('allowCache' => $options);
} elseif (empty($options)) {
@ -197,7 +203,8 @@ class JavascriptHelper extends AppHelper {
if ($block) {
return sprintf($this->tags['javascriptblock'], $script);
} else {
return sprintf($this->tags['javascriptstart']).ife($safe, "\n" . '//<![CDATA[' . "\n", '');
$safe = ($safe ? "\n" . '//<![CDATA[' . "\n" : '');
return $this->tags['javascriptstart'] . $safe;
}
} elseif ($block) {
$view =& ClassRegistry::getObject('view');