Skip to content

Commit

Permalink
Cleaning usage of ->clean() vs. ->fieldClean() in Postgres*.php classes
Browse files Browse the repository at this point in the history
  • Loading branch information
@ioguix
ioguix committed May 15, 2010
1 parent 4110c5b commit ffb34c3
Show file tree
Hide file tree
Showing 6 changed files with 105 additions and 47 deletions.
93 changes: 59 additions & 34 deletions classes/database/Postgres.php
View file
Expand Up @@ -462,8 +462,10 @@ function getDatabases($currentdatabase = NULL) {
}
else $clause = '';

if ($currentdatabase != NULL)
if ($currentdatabase != NULL) {
$this->clean($currentdatabase);
$orderby = "ORDER BY pdb.datname = '{$currentdatabase}' DESC, pdb.datname";
}
else
$orderby = "ORDER BY pdb.datname";

Expand Down Expand Up @@ -590,8 +592,8 @@ function createDatabase($database, $encoding, $tablespace = '', $comment = '', $
* @return int 0 on success
*/
function alterDatabaseRename($oldName, $newName) {
$this->clean($oldName);
$this->clean($newName);
$this->fieldClean($oldName);
$this->fieldClean($newName);

if ($oldName != $newName) {
$sql = "ALTER DATABASE \"{$oldName}\" RENAME TO \"{$newName}\"";
Expand Down Expand Up @@ -620,8 +622,8 @@ function dropDatabase($database) {
* @return int 0 on success
*/
function alterDatabaseOwner($dbName, $newOwner) {
$this->clean($dbName);
$this->clean($newOwner);
$this->fieldClean($dbName);
$this->fieldClean($newOwner);

$sql = "ALTER DATABASE \"{$dbName}\" OWNER TO \"{$newOwner}\"";
return $this->execute($sql);
Expand All @@ -640,9 +642,6 @@ function alterDatabaseOwner($dbName, $newOwner) {
* @return -4 comment error
*/
function alterDatabase($dbName, $newName, $newOwner = '', $comment = '') {
$this->clean($dbName);
$this->clean($newName);
$this->clean($newOwner);

$status = $this->beginTransaction();
if ($status != 0) {
Expand All @@ -656,6 +655,7 @@ function alterDatabase($dbName, $newName, $newOwner = '', $comment = '') {
$this->rollbackTransaction();
return -3;
}
$dbName = $newName;
}

if ($newOwner != '') {
Expand All @@ -665,7 +665,8 @@ function alterDatabase($dbName, $newName, $newOwner = '', $comment = '') {
return -2;
}
}


$this->fieldClean($dbName);
$status = $this->setComment('DATABASE', $dbName, '', $comment);
if ($status != 0) {
$this->rollbackTransaction();
Expand Down Expand Up @@ -716,7 +717,7 @@ function findObject($term, $filter) {
else {
$where = '';
$lan_where = '';
}
}

// Apply outer filter
$sql = '';
Expand Down Expand Up @@ -1813,6 +1814,7 @@ function createTableLike($name, $like, $defaults = false, $constraints = false,
* @return 0 success
*/
function alterTableName($tblrs, $name = null) {
/* vars cleaned in _alterTable */
// Rename (only if name has changed)
if (!empty($name) && ($name != $tblrs->fields['relname'])) {
$f_schema = $this->_schema;
Expand All @@ -1836,6 +1838,7 @@ function alterTableName($tblrs, $name = null) {
* @return 0 success
*/
function alterTableOwner($tblrs, $owner = null) {
/* vars cleaned in _alterTable */
if (!empty($owner) && ($tblrs->fields['relowner'] != $owner)) {
$f_schema = $this->_schema;
$this->fieldClean($f_schema);
Expand All @@ -1857,6 +1860,7 @@ function alterTableOwner($tblrs, $owner = null) {
* @return 0 success
*/
function alterTableTablespace($tblrs, $tablespace = null) {
/* vars cleaned in _alterTable */
if (!empty($tablespace) && ($tblrs->fields['tablespace'] != $tablespace)) {
$f_schema = $this->_schema;
$this->fieldClean($f_schema);
Expand All @@ -1878,6 +1882,7 @@ function alterTableTablespace($tblrs, $tablespace = null) {
* @return 0 success
*/
function alterTableSchema($tblrs, $schema = null) {
/* vars cleaned in _alterTable */
if (!empty($schema) && ($tblrs->fields['nspname'] != $schema)) {
$f_schema = $this->_schema;
$this->fieldClean($f_schema);
Expand Down Expand Up @@ -2383,16 +2388,16 @@ function getTableAutovacuum($table='') {

if ($table !== '') {
$this->clean($table);
$f_schema = $this->_schema;
$this->fieldClean($f_schema);
$c_schema = $this->_schema;
$this->clean($c_schema);

$sql = "SELECT c.oid, nspname, relname, pg_catalog.array_to_string(reloptions, E',') AS reloptions
FROM pg_class c
LEFT JOIN pg_namespace n ON n.oid = c.relnamespace
WHERE c.relkind = 'r'::\"char\"
AND n.nspname NOT IN ('pg_catalog','information_schema')
AND c.reloptions IS NOT NULL
AND c.relname = '{$table}' AND n.nspname = '{$f_schema}'
AND c.relname = '{$table}' AND n.nspname = '{$c_schema}'
ORDER BY nspname, relname";
}
else {
Expand Down Expand Up @@ -2642,15 +2647,17 @@ function deleteRow($table, $key, $schema=false) {
function getSequence($sequence) {
$c_schema = $this->_schema;
$this->clean($c_schema);
$c_sequence = $sequence;
$this->fieldClean($sequence);
$this->clean($c_sequence);

$sql = "
SELECT c.relname AS seqname, s.*,
pg_catalog.obj_description(s.tableoid, 'pg_class') AS seqcomment,
u.usename AS seqowner, n.nspname
FROM \"{$sequence}\" AS s, pg_catalog.pg_class c, pg_catalog.pg_user u, pg_catalog.pg_namespace n
WHERE c.relowner=u.usesysid AND c.relnamespace=n.oid
AND c.relname = '{$sequence}' AND c.relkind = 'S' AND n.nspname='{$c_schema}'
AND c.relname = '{$c_sequence}' AND c.relkind = 'S' AND n.nspname='{$c_schema}'
AND n.oid = c.relnamespace";

return $this->selectSet( $sql );
Expand Down Expand Up @@ -2692,6 +2699,7 @@ function nextvalSequence($sequence) {
/* This double-cleaning is deliberate */
$f_schema = $this->_schema;
$this->fieldClean($f_schema);
$this->clean($f_schema);
$this->fieldClean($sequence);
$this->clean($sequence);

Expand All @@ -2708,9 +2716,10 @@ function nextvalSequence($sequence) {
* @return -1 sequence not found
*/
function setvalSequence($sequence, $nextvalue) {
/* This double-cleaning is deliberate */
$f_schema = $this->_schema;
$this->fieldClean($f_schema);
/* This double-cleaning is deliberate */
$this->clean($f_schema);
$this->fieldClean($sequence);
$this->clean($sequence);
$this->clean($nextvalue);
Expand Down Expand Up @@ -2783,6 +2792,7 @@ function createSequence($sequence, $increment, $minvalue, $maxvalue,
* @return 0 success
*/
function alterSequenceName($seqrs, $name) {
/* vars are cleaned in _alterSequence */
if (!empty($name) && ($seqrs->fields['seqname'] != $name)) {
$f_schema = $this->_schema;
$this->fieldClean($f_schema);
Expand All @@ -2806,8 +2816,11 @@ function alterSequenceOwner($seqrs, $owner) {
// If owner has been changed, then do the alteration. We are
// careful to avoid this generally as changing owner is a
// superuser only function.
/* vars are cleaned in _alterSequence */
if (!empty($owner) && ($seqrs->fields['seqowner'] != $owner)) {
$sql = "ALTER TABLE \"{$seqrs->fields['seqname']}\" OWNER TO \"{$owner}\"";
$f_schema = $this->_schema;
$this->fieldClean($f_schema);
$sql = "ALTER SEQUENCE \"{$f_schema}\".\"{$seqrs->fields['seqname']}\" OWNER TO \"{$owner}\"";
return $this->execute($sql);
}
return 0;
Expand All @@ -2820,6 +2833,7 @@ function alterSequenceOwner($seqrs, $owner) {
* @return 0 success
*/
function alterSequenceSchema($seqrs, $schema) {
/* vars are cleaned in _alterSequence */
if (!empty($schema) && ($seqrs->fields['nspname'] != $schema)) {
$f_schema = $this->_schema;
$this->fieldClean($f_schema);
Expand All @@ -2844,6 +2858,7 @@ function alterSequenceProps($seqrs, $increment, $minvalue, $maxvalue,
$startvalue, $cachevalue, $cycledvalue) {

$sql = '';
/* vars are cleaned in _alterSequence */
if (!empty($increment) && ($increment != $seqrs->fields['increment_by'])) $sql .= " INCREMENT {$increment}";
if (!empty($minvalue) && ($minvalue != $seqrs->fields['min_value'])) $sql .= " MINVALUE {$minvalue}";
if (!empty($maxvalue) && ($maxvalue != $seqrs->fields['max_value'])) $sql .= " MAXVALUE {$maxvalue}";
Expand Down Expand Up @@ -3005,7 +3020,7 @@ function getView($view) {
pg_catalog.obj_description(c.oid, 'pg_class') AS relcomment
FROM pg_catalog.pg_class c
LEFT JOIN pg_catalog.pg_namespace n ON (n.oid = c.relnamespace)
WHERE (c.relname = '$view') AND n.nspname='{$c_schema}'";
WHERE (c.relname = '{$view}') AND n.nspname='{$c_schema}'";

return $this->selectSet($sql);
}
Expand Down Expand Up @@ -3087,6 +3102,7 @@ function createView($viewname, $definition, $replace, $comment) {
*/
function alterViewName($vwrs, $name) {
// Rename (only if name has changed)
/* $vwrs and $name are cleaned in _alterView */
if (!empty($name) && ($name != $vwrs->fields['relname'])) {
$f_schema = $this->_schema;
$this->fieldClean($f_schema);
Expand All @@ -3107,6 +3123,7 @@ function alterViewName($vwrs, $name) {
* @return 0 success
*/
function alterViewOwner($vwrs, $owner = null) {
/* $vwrs and $owner are cleaned in _alterView */
if ((!empty($owner)) && ($vwrs->fields['relowner'] != $owner)) {
$f_schema = $this->_schema;
$this->fieldClean($f_schema);
Expand All @@ -3126,6 +3143,7 @@ function alterViewOwner($vwrs, $owner = null) {
* @return 0 success
*/
function alterViewSchema($vwrs, $schema) {
/* $vwrs and $schema are cleaned in _alterView */
if (!empty($schema) && ($vwrs->fields['nspname'] != $schema)) {
$f_schema = $this->_schema;
$this->fieldClean($f_schema);
Expand Down Expand Up @@ -3595,7 +3613,9 @@ function dropCheckConstraint($table, $name) {
$this->fieldClean($f_schema);
$c_schema = $this->_schema;
$this->clean($c_schema);
$this->clean($table);
$c_table = $table;
$this->fieldClean($table);
$this->clean($c_table);
$this->clean($name);

// Begin transaction
Expand All @@ -3611,7 +3631,7 @@ function dropCheckConstraint($table, $name) {
}

// Delete the check constraint
$sql = "DELETE FROM pg_relcheck WHERE rcrelid=(SELECT oid FROM pg_catalog.pg_class WHERE relname='{$table}'
$sql = "DELETE FROM pg_relcheck WHERE rcrelid=(SELECT oid FROM pg_catalog.pg_class WHERE relname='{$c_table}'
AND relnamespace = (SELECT oid FROM pg_catalog.pg_namespace WHERE
nspname = '{$c_schema}')) AND rcname='{$name}'";
$status = $this->execute($sql);
Expand All @@ -3622,10 +3642,10 @@ function dropCheckConstraint($table, $name) {

// Update the pg_class catalog to reflect the new number of checks
$sql = "UPDATE pg_class SET relchecks=(SELECT COUNT(*) FROM pg_relcheck WHERE
rcrelid=(SELECT oid FROM pg_catalog.pg_class WHERE relname='{$table}'
rcrelid=(SELECT oid FROM pg_catalog.pg_class WHERE relname='{$c_table}'
AND relnamespace = (SELECT oid FROM pg_catalog.pg_namespace WHERE
nspname = '{$c_schema}')))
WHERE relname='{$table}'";
WHERE relname='{$c_table}'";
$status = $this->execute($sql);
if ($status != 0) {
$this->rollbackTransaction();
Expand Down Expand Up @@ -3707,15 +3727,17 @@ function dropConstraint($constraint, $relation, $type, $cascade) {
*/
function getLinkingKeys($tables) {
if (!is_array($tables)) return -1;

$tables_list = "'{$tables[0]['tablename']}'";
$schema_list = "'{$tables[0]['schemaname']}'";
$schema_tables_list = "'{$tables[0]['schemaname']}.{$tables[0]['tablename']}'";

for ($i = 1; $i < sizeof($tables); $i++) {
$tables_list .= ", '{$tables[$i]['tablename']}'";
$schema_list .= ", '{$tables[$i]['schemaname']}'";
$schema_tables_list .= ", '{$tables[$i]['schemaname']}.{$tables[$i]['tablename']}'";
}
echo "<pre>", print_r(array($tables_list, $schema_list), 1), "</pre>";
$maxDimension = 1;

$sql = "
Expand Down Expand Up @@ -4222,6 +4244,7 @@ function setFunction($function_oid, $funcname, $newname, $args, $returns, $defin

// Rename the function, if necessary
$this->fieldClean($newname);
/* $funcname is escaped in createFunction */
if ($funcname != $newname) {
$sql = "ALTER FUNCTION \"{$f_schema}\".\"{$funcname}\"({$args}) RENAME TO \"{$newname}\"";
$status = $this->execute($sql);
Expand Down Expand Up @@ -4250,7 +4273,8 @@ function setFunction($function_oid, $funcname, $newname, $args, $returns, $defin
// Alter the schema, if necessary
if ($this->hasFunctionAlterSchema()) {
$this->fieldClean($newschema);
if ($funcschema != $newschema) {
/* $funcschema is escaped in createFunction */
if ($funcschema != $newschema) {
$sql = "ALTER FUNCTION \"{$f_schema}\".\"{$funcname}\"({$args}) SET SCHEMA \"{$newschema}\"";
$status = $this->execute($sql);
if ($status != 0) {
Expand Down Expand Up @@ -4291,7 +4315,7 @@ function createFunction($funcname, $args, $returns, $definition, $language, $fla

$this->fieldClean($funcname);
$this->clean($args);
$this->clean($language);
$this->fieldClean($language);
$this->arrayClean($flags);
$this->clean($cost);
$this->clean($rows);
Expand Down Expand Up @@ -4534,7 +4558,7 @@ function createEnumType($name, $values, $typcomment) {
* @return A recordset
*/
function getEnumValues($name) {
$this->fieldClean($name);
$this->clean($name);

$sql = "SELECT enumlabel AS enumval
FROM pg_catalog.pg_type t JOIN pg_catalog.pg_enum e ON (t.oid=e.enumtypid)
Expand Down Expand Up @@ -5666,16 +5690,16 @@ function changeFtsMapping($ftscfg, $mapping, $action, $dictname = null) {
* @return FTS configuration information
*/
function getFtsMappingByName($ftscfg, $mapping) {
$f_schema = $this->_schema;
$this->fieldClean($f_schema);
$this->fieldClean($ftscfg);
$this->fieldClean($mapping);
$c_schema = $this->_schema;
$this->clean($c_schema);
$this->clean($ftscfg);
$this->clean($mapping);

$oidSet = $this->selectSet("SELECT c.oid, cfgparser
FROM pg_catalog.pg_ts_config AS c
LEFT JOIN pg_catalog.pg_namespace AS n ON n.oid = c.cfgnamespace
WHERE c.cfgname = '{$ftscfg}'
AND n.nspname='{$_schema}'");
AND n.nspname='{$c_schema}'");

$oid = $oidSet->fields['oid'];
$cfgparser = $oidSet->fields['cfgparser'];
Expand Down Expand Up @@ -5801,6 +5825,7 @@ function createAggregate($name, $basetype, $sfunc, $stype, $ffunc, $initcond, $s
* @return 0 success
*/
function renameAggregate($aggrschema, $aggrname, $aggrtype, $newaggrname) {
/* this function is called from alterAggregate where params are cleaned */
$sql = "ALTER AGGREGATE \"{$aggrschema}\"" . '.' . "\"{$aggrname}\" (\"{$aggrtype}\") RENAME TO \"{$newaggrname}\"";
return $this->execute($sql);
}
Expand Down Expand Up @@ -7144,12 +7169,12 @@ function saveAutovacuum($table, $vacenabled, $vacthreshold, $vacscalefactor, $an
}

function dropAutovacuum($table) {
$c_schema = $this->_schema;
$this->clean($c_schema);
$this->clean($table);
$f_schema = $this->_schema;
$this->fieldClean($f_schema);
$this->fieldClean($table);

return $this->execute("
ALTER TABLE \"{$c_schema}\".\"{$table}\" RESET (autovacuum_enabled, autovacuum_vacuum_threshold,
ALTER TABLE \"{$f_schema}\".\"{$table}\" RESET (autovacuum_enabled, autovacuum_vacuum_threshold,
autovacuum_vacuum_scale_factor, autovacuum_analyze_threshold, autovacuum_analyze_scale_factor,
autovacuum_vacuum_cost_delay, autovacuum_vacuum_cost_limit
);"
Expand Down
6 changes: 4 additions & 2 deletions classes/database/Postgres74.php
View file
Expand Up @@ -77,11 +77,13 @@ function getDatabases($currentdatabase = NULL) {
$username = $server_info['username'];
$this->clean($username);
$clause = " AND pu.usename='{$username}'";
}
}
else $clause = '';

if ($currentdatabase != NULL)
if ($currentdatabase != NULL) {
$this->clean($currentdatabase);
$orderby = "ORDER BY pdb.datname = '{$currentdatabase}' DESC, pdb.datname";
}
else
$orderby = "ORDER BY pdb.datname";

Expand Down

0 comments on commit ffb34c3

Please sign in to comment.