merge from 1.5.2.1

git-svn-id: http://xe-core.googlecode.com/svn/trunk@10466 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ovclas 2012-03-23 05:49:16 +00:00
parent c727926d9e
commit 9bf08cf3df
26 changed files with 110 additions and 97 deletions

View file

@ -1,16 +1,22 @@
<?php
class MssqlUpdateTest extends MssqlTest {
class MssqlUpdateTest extends MssqlTest {
function _test($xml_file, $argsString, $expected, $expectedArgs = NULL){
$this->_testPreparedQuery($xml_file, $argsString, $expected, 'getUpdateSql', $expectedArgs = NULL);
}
function _test($xml_file, $argsString, $expected, $expectedArgs = NULL) {
$this->_testPreparedQuery($xml_file, $argsString, $expected, 'getUpdateSql', $expectedArgs = NULL);
}
function test_counter_updateCounterUnique() {
$xml_file = _XE_PATH_ . "modules/counter/queries/updateCounterUnique.xml";
$argsString = '$args->regdate = 25;';
$expected = 'UPDATE [counter_status]
SET [unique_visitor] = [unique_visitor] + ?
, [pageview] = [pageview] + ?
FROM [xe_counter_status] as [counter_status]
WHERE [regdate] = ?';
$this->_test($xml_file, $argsString, $expected, array("25", 1, 1));
}
}
function test_counter_updateCounterUnique(){
$xml_file = _XE_PATH_ . "modules/counter/queries/updateCounterUnique.xml";
$argsString = '$args->regdate = 25;';
$expected = 'UPDATE [xe_counter_status] as [counter_status] SET [unique_visitor] = [unique_visitor] + ?, [pageview] = [pageview] + ? WHERE [regdate] = ?';
$this->_test($xml_file, $argsString, $expected, array("25", 1, 1));
}
}
?>