Feature #23087 » 14985_dbal_v2.diff
| class.ux_t3lib_sqlparser.php (working copy) | ||
|---|---|---|
|
$output .= ($v['func']['table'] ? $v['func']['table'] . '.' : '') . $v['func']['field'];
|
||
|
$output .= ', ' . $v['func']['default'][1] . $this->compileAddslashes($v['func']['default'][0]) . $v['func']['default'][1];
|
||
|
$output .= ')';
|
||
|
} else {
|
||
|
} elseif (isset($v['func']) && $v['func']['type'] === 'FIND_IN_SET') {
|
||
|
$output = ' ' . trim($v['modifier']) . ' ';
|
||
|
switch (TRUE) {
|
||
|
case ($GLOBALS['TYPO3_DB']->runningADOdbDriver('oci8')):
|
||
|
if ($functionMapping) {
|
||
|
$field = ($v['func']['table'] ? $v['func']['table'] . '.' : '') . $v['func']['field'];
|
||
|
if (!isset($v['func']['str_like'])) {
|
||
|
$v['func']['str_like'] = $v['func']['str'][0];
|
||
|
}
|
||
|
$output .= '\',\'||' . $field . '||\',\' LIKE \'%,' . $v['func']['str_like'] . ',%\'';
|
||
|
break;
|
||
|
}
|
||
|
// Beware: No break here if !$functionMapping to handle remapping of fields (twice in this method)
|
||
|
case ($GLOBALS['TYPO3_DB']->runningADOdbDriver('mssql')):
|
||
|
if ($functionMapping) {
|
||
|
$field = ($v['func']['table'] ? $v['func']['table'] . '.' : '') . $v['func']['field'];
|
||
|
if (!isset($v['func']['str_like'])) {
|
||
|
$v['func']['str_like'] = $v['func']['str'][0];
|
||
|
}
|
||
|
$output .= '\',\'+' . $field . '+\',\' LIKE \'%,' . $v['func']['str_like'] . ',%\'';
|
||
|
break;
|
||
|
}
|
||
|
// Beware: No break here if !$functionMapping to handle remapping of fields (twice in this method)
|
||
|
case ($GLOBALS['TYPO3_DB']->runningADOdbDriver('postgres') && $functionMapping):
|
||
|
$output .= ' FIND_IN_SET(';
|
||
|
$output .= $v['func']['str'][1] . $v['func']['str'][0] . $v['func']['str'][1];
|
||
|
$output .= ', ' . ($v['func']['table'] ? $v['func']['table'] . '.' : '') . $v['func']['field'];
|
||
|
$output .= ')';
|
||
|
break;
|
||
|
default:
|
||
|
$field = ($v['func']['table'] ? $v['func']['table'] . '.' : '') . $v['func']['field'];
|
||
|
if (!isset($v['func']['str_like'])) {
|
||
|
$v['func']['str_like'] = $v['func']['str'][0];
|
||
|
}
|
||
|
$output .= '('
|
||
|
. $field . ' LIKE \'%,' . $v['func']['str_like'] . ',%\''
|
||
|
. ' OR ' . $field . ' LIKE \'' . $v['func']['str_like'] . ',%\''
|
||
|
. ' OR ' . $field . ' LIKE \'%,' . $v['func']['str_like'] . '\''
|
||
|
. ' OR ' . $field . '= ' . $v['func']['str'][1] . $v['func']['str'][0] . $v['func']['str'][1]
|
||
|
. ')';
|
||
|
break;
|
||
|
}
|
||
|
switch (TRUE) {
|
||
|
case ($GLOBALS['TYPO3_DB']->runningADOdbDriver('postgres') && $functionMapping):
|
||
|
$output .= ' != 0';
|
||
|
break;
|
||
|
default:
|
||
|
// Nothing more to do
|
||
|
break;
|
||
|
}
|
||
|
} else {
|
||
|
// Set field/table with modifying prefix if any:
|
||
|
$output .= ' ' . trim($v['modifier']) . ' ';
|
||
| class.ux_t3lib_db.php (working copy) | ||
|---|---|---|
|
case 'EXISTS':
|
||
|
$where_clause[$k]['func']['subquery'] = $this->quoteSELECTsubquery($v['func']['subquery']);
|
||
|
break;
|
||
|
case 'FIND_IN_SET':
|
||
|
// quoteStr that will be used for Oracle
|
||
|
$pattern = str_replace($where_clause[$k]['func']['str'][1], '\\' . $where_clause[$k]['func']['str'][1], $where_clause[$k]['func']['str'][0]);
|
||
|
// table is not really needed and may in fact be empty in real statements
|
||
|
// but it's not overriden from t3lib_db at the moment...
|
||
|
$patternForLike = $this->escapeStrForLike($pattern, $where_clause[$k]['func']['table']);
|
||
|
$where_clause[$k]['func']['str_like'] = $patternForLike;
|
||
|
// BEWARE: no break here to have next statements too
|
||
|
case 'IFNULL':
|
||
|
case 'LOCATE':
|
||
|
if ($where_clause[$k]['func']['table'] != '') {
|
||
| ... | ... | |
|
if ($where_clause[$k]['func']['field'] != '') {
|
||
|
$where_clause[$k]['func']['field'] = $this->quoteName($v['func']['field']);
|
||
|
}
|
||
|
break;
|
||
|
break;
|
||
|
}
|
||
|
} else {
|
||
| ... | ... | |
|
case 'EXISTS':
|
||
|
$this->map_subquery($sqlPartArray[$k]['func']['subquery']);
|
||
|
break;
|
||
|
case 'FIND_IN_SET':
|
||
|
case 'IFNULL':
|
||
|
case 'LOCATE':
|
||
|
// For the field, look for table mapping (generic):
|
||
| res/postgresql/postgresql-compatibility.sql (working copy) | ||
|---|---|---|
|
SELECT COALESCE($1, $2)
|
||
|
$$ IMMUTABLE STRICT LANGUAGE SQL;
|
||
|
-- FIND_IN_SET
|
||
|
-- FIND_IN_SET()
|
||
|
CREATE OR REPLACE FUNCTION find_in_set(text, text)
|
||
|
RETURNS integer AS $$
|
||
|
DECLARE
|
||
|
list text[];
|
||
|
len integer;
|
||
|
BEGIN
|
||
|
IF $2 = '' THEN
|
||
|
RETURN 0;
|
||
|
END IF;
|
||
|
list := pg_catalog.string_to_array($2, ',');
|
||
|
len := pg_catalog.array_upper(list, 1);
|
||
|
FOR i IN 1..len LOOP
|
||
|
IF list[i] = $1 THEN
|
||
|
RETURN i;
|
||
|
END IF;
|
||
|
END LOOP;
|
||
|
RETURN 0;
|
||
|
END;
|
||
|
$$ STRICT IMMUTABLE LANGUAGE PLPGSQL;
|
||
|
-- Remove Compatibility operators
|
||
|
--
|
||
|
--DROP OPERATOR ~~ (integer,text);
|
||
| tests/dbPostgresqlTest.php (working copy) | ||
|---|---|---|
|
$expected = 'SELECT * FROM "be_users" WHERE 1 = 1 LIMIT 40 OFFSET 20';
|
||
|
$this->assertEquals($expected, $query);
|
||
|
}
|
||
|
/**
|
||
|
* @test
|
||
|
* @see http://bugs.typo3.org/view.php?id=14985
|
||
|
*/
|
||
|
public function findInSetIsProperlyRemapped() {
|
||
|
$query = $this->cleanSql($GLOBALS['TYPO3_DB']->SELECTquery(
|
||
|
'*',
|
||
|
'fe_users',
|
||
|
'FIND_IN_SET(10, usergroup)'
|
||
|
));
|
||
|
$expected = 'SELECT * FROM "fe_users" WHERE FIND_IN_SET(10, "usergroup") != 0';
|
||
|
$this->assertEquals($expected, $query);
|
||
|
}
|
||
|
}
|
||
|
?>
|
||
| tests/sqlParserGeneralTest.php (working copy) | ||
|---|---|---|
|
$this->assertEquals($expected, $alterTable[0]);
|
||
|
}
|
||
|
/**
|
||
|
* @test
|
||
|
* @see http://bugs.typo3.org/view.php?id=14985
|
||
|
*/
|
||
|
public function canParseFindInSetStatement() {
|
||
|
$parseString = 'SELECT * FROM fe_users WHERE FIND_IN_SET(10, usergroup)';
|
||
|
$components = $this->fixture->_callRef('parseSELECT', $parseString);
|
||
|
$this->assertTrue(is_array($components), $components);
|
||
|
$selectTable = $this->cleanSql($this->fixture->_callRef('compileSELECT', $components));
|
||
|
$expected = 'SELECT * FROM fe_users WHERE FIND_IN_SET(10, usergroup)';
|
||
|
$this->assertEquals($expected, $selectTable);
|
||
|
}
|
||
|
///////////////////////////////////////
|
||
|
// Tests concerning JOINs
|
||
|
///////////////////////////////////////
|
||
| tests/dbOracleTest.php (working copy) | ||
|---|---|---|
|
$expected = 'SELECT * FROM "tt_news_cat_mm" WHERE NVL("tt_news_cat_mm"."uid_foreign", 0) IN (21,22)';
|
||
|
$this->assertEquals($expected, $query);
|
||
|
}
|
||
|
/**
|
||
|
* @test
|
||
|
* @see http://bugs.typo3.org/view.php?id=14985
|
||
|
*/
|
||
|
public function findInSetIsProperlyRemapped() {
|
||
|
$query = $this->cleanSql($GLOBALS['TYPO3_DB']->SELECTquery(
|
||
|
'*',
|
||
|
'fe_users',
|
||
|
'FIND_IN_SET(10, usergroup)'
|
||
|
));
|
||
|
$expected = 'SELECT * FROM "fe_users" WHERE \',\'||"usergroup"||\',\' LIKE \'%,10,%\'';
|
||
|
$this->assertEquals($expected, $query);
|
||
|
}
|
||
|
/**
|
||
|
* @test
|
||
|
* @see http://bugs.typo3.org/view.php?id=14985
|
||
|
*/
|
||
|
public function findInSetFieldIsProperlyRemapped() {
|
||
|
$selectFields = 'fe_group';
|
||
|
$fromTables = 'tt_news';
|
||
|
$whereClause = 'FIND_IN_SET(10, fe_group)';
|
||
|
$groupBy = '';
|
||
|
$orderBy = '';
|
||
|
$GLOBALS['TYPO3_DB']->_callRef('map_remapSELECTQueryParts', $selectFields, $fromTables, $whereClause, $groupBy, $orderBy);
|
||
|
$query = $this->cleanSql($GLOBALS['TYPO3_DB']->SELECTquery($selectFields, $fromTables, $whereClause, $groupBy, $orderBy));
|
||
|
$expected = 'SELECT "usergroup" FROM "ext_tt_news" WHERE \',\'||"ext_tt_news"."usergroup"||\',\' LIKE \'%,10,%\'';
|
||
|
$this->assertEquals($expected, $query);
|
||
|
}
|
||
|
}
|
||
|
?>
|
||
| tests/fixtures/oci8.config.php (working copy) | ||
|---|---|---|
|
'tt_news' => array(
|
||
|
'mapTableName' => 'ext_tt_news',
|
||
|
'mapFieldNames' => array(
|
||
|
'uid' => 'news_uid',
|
||
|
'uid' => 'news_uid',
|
||
|
'fe_group' => 'usergroup',
|
||
|
),
|
||
|
),
|
||
|
'tt_news_cat' => array(
|
||
| tests/dbMssqlTest.php (working copy) | ||
|---|---|---|
|
}
|
||
|
}
|
||
|
/**
|
||
|
* @test
|
||
|
* @see http://bugs.typo3.org/view.php?id=14985
|
||
|
*/
|
||
|
public function findInSetIsProperlyRemapped() {
|
||
|
$query = $this->cleanSql($GLOBALS['TYPO3_DB']->SELECTquery(
|
||
|
'*',
|
||
|
'fe_users',
|
||
|
'FIND_IN_SET(10, usergroup)'
|
||
|
));
|
||
|
$expected = 'SELECT * FROM "fe_users" WHERE \',\'+"usergroup"+\',\' LIKE \'%,10,%\'';
|
||
|
$this->assertEquals($expected, $query);
|
||
|
}
|
||
|
///////////////////////////////////////
|
||
|
// Tests concerning remapping with
|
||
|
// external (non-TYPO3) databases
|
||
- « Previous
- 1
- 2
- 3
- 4
- Next »