Skip to content
This repository has been archived by the owner on Jan 8, 2020. It is now read-only.

Commit

Permalink
Merge branch 'hotfix/4241' into develop
Browse files Browse the repository at this point in the history 
Forward port #4241
  • Loading branch information
@weierophinney
weierophinney committed Apr 16, 2013
2 parents 8b094a3 + 5c4dc0a commit e0df92e
Show file tree
Hide file tree
Showing 4 changed files with 51 additions and 51 deletions.
46 changes: 23 additions & 23 deletions library/Zend/Db/Metadata/Source/MysqlMetadata.php
View file
Expand Up @@ -25,7 +25,7 @@ protected function loadSchemaData()
$sql = 'SELECT ' . $p->quoteIdentifier('SCHEMA_NAME')
. ' FROM ' . $p->quoteIdentifierChain(array('INFORMATION_SCHEMA', 'SCHEMATA'))
. ' WHERE ' . $p->quoteIdentifier('SCHEMA_NAME')
. ' != ' . $p->quoteValue('INFORMATION_SCHEMA');
. ' != \'INFORMATION_SCHEMA\'';

$results = $this->adapter->query($sql, Adapter::QUERY_MODE_EXECUTE);

Expand Down Expand Up @@ -66,14 +66,14 @@ protected function loadTableNameData($schema)
. ' = ' . $p->quoteIdentifierChain(array('V','TABLE_NAME'))

. ' WHERE ' . $p->quoteIdentifierChain(array('T','TABLE_TYPE'))
. ' IN (' . $p->quoteValueList(array('BASE TABLE', 'VIEW')) . ')';
. ' IN (\'BASE TABLE\', \'VIEW\')';

if ($schema != self::DEFAULT_SCHEMA) {
$sql .= ' AND ' . $p->quoteIdentifierChain(array('T','TABLE_SCHEMA'))
. ' = ' . $p->quoteValue($schema);
. ' = ' . $p->quoteTrustedValue($schema);
} else {
$sql .= ' AND ' . $p->quoteIdentifierChain(array('T','TABLE_SCHEMA'))
. ' != ' . $p->quoteValue('INFORMATION_SCHEMA');
. ' != \'INFORMATION_SCHEMA\'';
}

$results = $this->adapter->query($sql, Adapter::QUERY_MODE_EXECUTE);
Expand Down Expand Up @@ -122,16 +122,16 @@ protected function loadColumnData($table, $schema)
. ' AND ' . $p->quoteIdentifierChain(array('T','TABLE_NAME'))
. ' = ' . $p->quoteIdentifierChain(array('C','TABLE_NAME'))
. ' WHERE ' . $p->quoteIdentifierChain(array('T','TABLE_TYPE'))
. ' IN (' . $p->quoteValueList(array('BASE TABLE', 'VIEW')) . ')'
. ' IN (\'BASE TABLE\', \'VIEW\')'
. ' AND ' . $p->quoteIdentifierChain(array('T','TABLE_NAME'))
. ' = ' . $p->quoteValue($table);
. ' = ' . $p->quoteTrustedValue($table);

if ($schema != self::DEFAULT_SCHEMA) {
$sql .= ' AND ' . $p->quoteIdentifierChain(array('T','TABLE_SCHEMA'))
. ' = ' . $p->quoteValue($schema);
. ' = ' . $p->quoteTrustedValue($schema);
} else {
$sql .= ' AND ' . $p->quoteIdentifierChain(array('T','TABLE_SCHEMA'))
. ' != ' . $p->quoteValue('INFORMATION_SCHEMA');
. ' != \'INFORMATION_SCHEMA\'';
}

$results = $this->adapter->query($sql, Adapter::QUERY_MODE_EXECUTE);
Expand Down Expand Up @@ -216,16 +216,16 @@ protected function loadConstraintData($table, $schema)
. ' = ' . $p->quoteIdentifierChain(array('RC','CONSTRAINT_NAME'))

. ' WHERE ' . $p->quoteIdentifierChain(array('T','TABLE_NAME'))
. ' = ' . $p->quoteValue($table)
. ' = ' . $p->quoteTrustedValue($table)
. ' AND ' . $p->quoteIdentifierChain(array('T','TABLE_TYPE'))
. ' IN (' . $p->quoteValueList(array('BASE TABLE', 'VIEW')) . ')';
. ' IN (\'BASE TABLE\', \'VIEW\')';

if ($schema != self::DEFAULT_SCHEMA) {
$sql .= ' AND ' . $p->quoteIdentifierChain(array('T','TABLE_SCHEMA'))
. ' = ' . $p->quoteValue($schema);
. ' = ' . $p->quoteTrustedValue($schema);
} else {
$sql .= ' AND ' . $p->quoteIdentifierChain(array('T','TABLE_SCHEMA'))
. ' != ' . $p->quoteValue('INFORMATION_SCHEMA');
. ' != \'INFORMATION_SCHEMA\'';
}

$sql .= ' ORDER BY CASE ' . $p->quoteIdentifierChain(array('TC','CONSTRAINT_TYPE'))
Expand Down Expand Up @@ -302,14 +302,14 @@ protected function loadConstraintDataNames($schema)
. ' AND ' . $p->quoteIdentifierChain(array('T','TABLE_NAME'))
. ' = ' . $p->quoteIdentifierChain(array('TC','TABLE_NAME'))
. ' WHERE ' . $p->quoteIdentifierChain(array('T','TABLE_TYPE'))
. ' IN (' . $p->quoteValueList(array('BASE TABLE', 'VIEW')) . ')';
. ' IN (\'BASE TABLE\', \'VIEW\')';

if ($schema != self::DEFAULT_SCHEMA) {
$sql .= ' AND ' . $p->quoteIdentifierChain(array('T','TABLE_SCHEMA'))
. ' = ' . $p->quoteValue($schema);
. ' = ' . $p->quoteTrustedValue($schema);
} else {
$sql .= ' AND ' . $p->quoteIdentifierChain(array('T','TABLE_SCHEMA'))
. ' != ' . $p->quoteValue('INFORMATION_SCHEMA');
. ' != \'INFORMATION_SCHEMA\'';
}

$results = $this->adapter->query($sql, Adapter::QUERY_MODE_EXECUTE);
Expand Down Expand Up @@ -353,14 +353,14 @@ protected function loadConstraintDataKeys($schema)
. ' = ' . $p->quoteIdentifierChain(array('KCU','TABLE_NAME'))

. ' WHERE ' . $p->quoteIdentifierChain(array('T','TABLE_TYPE'))
. ' IN (' . $p->quoteValueList(array('BASE TABLE', 'VIEW')) . ')';
. ' IN (\'BASE TABLE\', \'VIEW\')';

if ($schema != self::DEFAULT_SCHEMA) {
$sql .= ' AND ' . $p->quoteIdentifierChain(array('T','TABLE_SCHEMA'))
. ' = ' . $p->quoteValue($schema);
. ' = ' . $p->quoteTrustedValue($schema);
} else {
$sql .= ' AND ' . $p->quoteIdentifierChain(array('T','TABLE_SCHEMA'))
. ' != ' . $p->quoteValue('INFORMATION_SCHEMA');
. ' != \'INFORMATION_SCHEMA\'';
}

$results = $this->adapter->query($sql, Adapter::QUERY_MODE_EXECUTE);
Expand Down Expand Up @@ -415,14 +415,14 @@ protected function loadConstraintReferences($schema)
. ' = ' . $p->quoteIdentifierChain(array('KCU','CONSTRAINT_NAME'))

. 'WHERE ' . $p->quoteIdentifierChain(array('T','TABLE_TYPE'))
. ' IN (' . $p->quoteValueList(array('BASE TABLE', 'VIEW')) . ')';
. ' IN (\'BASE TABLE\', \'VIEW\')';

if ($schema != self::DEFAULT_SCHEMA) {
$sql .= ' AND ' . $p->quoteIdentifierChain(array('T','TABLE_SCHEMA'))
. ' = ' . $p->quoteValue($schema);
. ' = ' . $p->quoteTrustedValue($schema);
} else {
$sql .= ' AND ' . $p->quoteIdentifierChain(array('T','TABLE_SCHEMA'))
. ' != ' . $p->quoteValue('INFORMATION_SCHEMA');
. ' != \'INFORMATION_SCHEMA\'';
}

$results = $this->adapter->query($sql, Adapter::QUERY_MODE_EXECUTE);
Expand Down Expand Up @@ -475,10 +475,10 @@ protected function loadTriggerData($schema)

if ($schema != self::DEFAULT_SCHEMA) {
$sql .= $p->quoteIdentifier('TRIGGER_SCHEMA')
. ' = ' . $p->quoteValue($schema);
. ' = ' . $p->quoteTrustedValue($schema);
} else {
$sql .= $p->quoteIdentifier('TRIGGER_SCHEMA')
. ' != ' . $p->quoteValue('INFORMATION_SCHEMA');
. ' != \'INFORMATION_SCHEMA\'';
}

$results = $this->adapter->query($sql, Adapter::QUERY_MODE_EXECUTE);
Expand Down
26 changes: 13 additions & 13 deletions library/Zend/Db/Metadata/Source/PostgresqlMetadata.php
View file
Expand Up @@ -26,7 +26,7 @@ protected function loadSchemaData()
$sql = 'SELECT ' . $p->quoteIdentifier('schema_name')
. ' FROM ' . $p->quoteIdentifierChain(array('information_schema', 'schemata'))
. ' WHERE ' . $p->quoteIdentifier('schema_name')
. ' != ' . $p->quoteValue('information_schema')
. ' != \'information_schema\''
. ' AND ' . $p->quoteIdentifier('schema_name') . " NOT LIKE 'pg_%'";

$results = $this->adapter->query($sql, Adapter::QUERY_MODE_EXECUTE);
Expand Down Expand Up @@ -68,14 +68,14 @@ protected function loadTableNameData($schema)
. ' = ' . $p->quoteIdentifierChain(array('v','table_name'))

. ' WHERE ' . $p->quoteIdentifierChain(array('t','table_type'))
. ' IN (' . $p->quoteValueList(array('BASE TABLE', 'VIEW')) . ')';
. ' IN (\'BASE TABLE\', \'VIEW\')';

if ($schema != self::DEFAULT_SCHEMA) {
$sql .= ' AND ' . $p->quoteIdentifierChain(array('t','table_schema'))
. ' = ' . $p->quoteValue($schema);
. ' = ' . $p->quoteTrustedValue($schema);
} else {
$sql .= ' AND ' . $p->quoteIdentifierChain(array('t','table_schema'))
. ' != ' . $p->quoteValue('information_schema');
. ' != \'information_schema\'';
}

$results = $this->adapter->query($sql, Adapter::QUERY_MODE_EXECUTE);
Expand Down Expand Up @@ -122,13 +122,13 @@ protected function loadColumnData($table, $schema)
. ' FROM ' . $platform->quoteIdentifier('information_schema')
. $platform->getIdentifierSeparator() . $platform->quoteIdentifier('columns')
. ' WHERE ' . $platform->quoteIdentifier('table_schema')
. ' != ' . $platform->quoteValue('information')
. ' != \'information\''
. ' AND ' . $platform->quoteIdentifier('table_name')
. ' = ' . $platform->quoteValue($table);
. ' = ' . $platform->quoteTrustedValue($table);

if ($schema != '__DEFAULT_SCHEMA__') {
$sql .= ' AND ' . $platform->quoteIdentifier('table_schema')
. ' = ' . $platform->quoteValue($schema);
. ' = ' . $platform->quoteTrustedValue($schema);
}

$results = $this->adapter->query($sql, Adapter::QUERY_MODE_EXECUTE);
Expand Down Expand Up @@ -221,16 +221,16 @@ protected function loadConstraintData($table, $schema)
. ' = ' . $p->quoteIdentifierChain(array('kcu2','ordinal_position'))

. ' WHERE ' . $p->quoteIdentifierChain(array('t','table_name'))
. ' = ' . $p->quoteValue($table)
. ' = ' . $p->quoteTrustedValue($table)
. ' AND ' . $p->quoteIdentifierChain(array('t','table_type'))
. ' IN (' . $p->quoteValueList(array('BASE TABLE', 'VIEW')) . ')';
. ' IN (\'BASE TABLE\', \'VIEW\')';

if ($schema != self::DEFAULT_SCHEMA) {
$sql .= ' AND ' . $p->quoteIdentifierChain(array('t','table_schema'))
. ' = ' . $p->quoteValue($schema);
. ' = ' . $p->quoteTrustedValue($schema);
} else {
$sql .= ' AND ' . $p->quoteIdentifierChain(array('t','table_schema'))
. ' != ' . $p->quoteValue('information_schema');
. ' != \'information_schema\'';
}

$sql .= ' ORDER BY CASE ' . $p->quoteIdentifierChain(array('tc','constraint_type'))
Expand Down Expand Up @@ -322,10 +322,10 @@ protected function loadTriggerData($schema)

if ($schema != self::DEFAULT_SCHEMA) {
$sql .= $p->quoteIdentifier('trigger_schema')
. ' = ' . $p->quoteValue($schema);
. ' = ' . $p->quoteTrustedValue($schema);
} else {
$sql .= $p->quoteIdentifier('trigger_schema')
. ' != ' . $p->quoteValue('information_schema');
. ' != \'information_schema\'';
}

$results = $this->adapter->query($sql, Adapter::QUERY_MODE_EXECUTE);
Expand Down
28 changes: 14 additions & 14 deletions library/Zend/Db/Metadata/Source/SqlServerMetadata.php
View file
Expand Up @@ -27,7 +27,7 @@ protected function loadSchemaData()
$sql = 'SELECT ' . $p->quoteIdentifier('SCHEMA_NAME')
. ' FROM ' . $p->quoteIdentifierChain(array('INFORMATION_SCHEMA', 'SCHEMATA'))
. ' WHERE ' . $p->quoteIdentifier('SCHEMA_NAME')
. ' != ' . $p->quoteValue('INFORMATION_SCHEMA');
. ' != \'INFORMATION_SCHEMA\'';

$results = $this->adapter->query($sql, Adapter::QUERY_MODE_EXECUTE);

Expand Down Expand Up @@ -68,14 +68,14 @@ protected function loadTableNameData($schema)
. ' = ' . $p->quoteIdentifierChain(array('V','TABLE_NAME'))

. ' WHERE ' . $p->quoteIdentifierChain(array('T','TABLE_TYPE'))
. ' IN (' . $p->quoteValueList(array('BASE TABLE', 'VIEW')) . ')';
. ' IN (\'BASE TABLE\', \'VIEW\')';

if ($schema != self::DEFAULT_SCHEMA) {
$sql .= ' AND ' . $p->quoteIdentifierChain(array('T','TABLE_SCHEMA'))
. ' = ' . $p->quoteValue($schema);
. ' = ' . $p->quoteTrustedValue($schema);
} else {
$sql .= ' AND ' . $p->quoteIdentifierChain(array('T','TABLE_SCHEMA'))
. ' != ' . $p->quoteValue('INFORMATION_SCHEMA');
. ' != \'INFORMATION_SCHEMA\'';
}

$results = $this->adapter->query($sql, Adapter::QUERY_MODE_EXECUTE);
Expand Down Expand Up @@ -123,16 +123,16 @@ protected function loadColumnData($table, $schema)
. ' AND ' . $p->quoteIdentifierChain(array('T','TABLE_NAME'))
. ' = ' . $p->quoteIdentifierChain(array('C','TABLE_NAME'))
. ' WHERE ' . $p->quoteIdentifierChain(array('T','TABLE_TYPE'))
. ' IN (' . $p->quoteValueList(array('BASE TABLE', 'VIEW')) . ')'
. ' IN (\'BASE TABLE\', \'VIEW\')'
. ' AND ' . $p->quoteIdentifierChain(array('T','TABLE_NAME'))
. ' = ' . $p->quoteValue($table);
. ' = ' . $p->quoteTrustedValue($table);

if ($schema != self::DEFAULT_SCHEMA) {
$sql .= ' AND ' . $p->quoteIdentifierChain(array('T','TABLE_SCHEMA'))
. ' = ' . $p->quoteValue($schema);
. ' = ' . $p->quoteTrustedValue($schema);
} else {
$sql .= ' AND ' . $p->quoteIdentifierChain(array('T','TABLE_SCHEMA'))
. ' != ' . $p->quoteValue('INFORMATION_SCHEMA');
. ' != \'INFORMATION_SCHEMA\'';
}

$results = $this->adapter->query($sql, Adapter::QUERY_MODE_EXECUTE);
Expand Down Expand Up @@ -225,16 +225,16 @@ protected function loadConstraintData($table, $schema)
. ' = ' . $p->quoteIdentifierChain(array('KCU2','ORDINAL_POSITION'))

. ' WHERE ' . $p->quoteIdentifierChain(array('T','TABLE_NAME'))
. ' = ' . $p->quoteValue($table)
. ' = ' . $p->quoteTrustedValue($table)
. ' AND ' . $p->quoteIdentifierChain(array('T','TABLE_TYPE'))
. ' IN (' . $p->quoteValueList(array('BASE TABLE', 'VIEW')) . ')';
. ' IN (\'BASE TABLE\', \'VIEW\')';

if ($schema != self::DEFAULT_SCHEMA) {
$sql .= ' AND ' . $p->quoteIdentifierChain(array('T','TABLE_SCHEMA'))
. ' = ' . $p->quoteValue($schema);
. ' = ' . $p->quoteTrustedValue($schema);
} else {
$sql .= ' AND ' . $p->quoteIdentifierChain(array('T','TABLE_SCHEMA'))
. ' != ' . $p->quoteValue('INFORMATION_SCHEMA');
. ' != \'INFORMATION_SCHEMA\'';
}

$sql .= ' ORDER BY CASE ' . $p->quoteIdentifierChain(array('TC','CONSTRAINT_TYPE'))
Expand Down Expand Up @@ -321,10 +321,10 @@ protected function loadTriggerData($schema)

if ($schema != self::DEFAULT_SCHEMA) {
$sql .= $p->quoteIdentifier('TRIGGER_SCHEMA')
. ' = ' . $p->quoteValue($schema);
. ' = ' . $p->quoteTrustedValue($schema);
} else {
$sql .= $p->quoteIdentifier('TRIGGER_SCHEMA')
. ' != ' . $p->quoteValue('INFORMATION_SCHEMA');
. ' != \'INFORMATION_SCHEMA\'';
}

$results = $this->adapter->query($sql, Adapter::QUERY_MODE_EXECUTE);
Expand Down
2 changes: 1 addition & 1 deletion library/Zend/Db/Metadata/Source/SqliteMetadata.php
View file
Expand Up @@ -246,7 +246,7 @@ protected function fetchPragma($name, $value = null, $schema = null)
$sql .= $name;

if (null !== $value) {
$sql .= '(' . $p->quoteValue($value) . ')';
$sql .= '(' . $p->quoteTrustedValue($value) . ')';
}

$results = $this->adapter->query($sql, Adapter::QUERY_MODE_EXECUTE);
Expand Down

0 comments on commit e0df92e

Please sign in to comment.