tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

MINOR Using SQLQuery wrapper in DbDatetimeTest to provide better cross-db support, specifically correct LIMIT syntax in MSSQL (previously broken in a9b13509)

Browse Source
This commit is contained in:
Ingo Schommer 2011-05-19 11:38:43 +12:00
parent cfe0066a3b
commit 11b409aac8
1 changed files with 29 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
tests/model/DbDatetimeTest.php
View File

@ -54,8 +54,8 @@ class DbDatetimeTest extends FunctionalTest {
function testCorrectNow() { function testCorrectNow() {
if($this->supportDbDatetime) { if($this->supportDbDatetime) {
$query = 'SELECT ' . $this->adapter->formattedDatetimeClause('now', '%U'); $query = new SQLQuery($this->adapter->formattedDatetimeClause('now', '%U'));
$result = DB::query($query)->value(); $result = $query->execute()->value();
$this->assertRegExp('/^\d*$/', (string) $result); $this->assertRegExp('/^\d*$/', (string) $result);
$this->assertTrue($result>0); $this->assertTrue($result>0);
} }
@ -63,16 +63,16 @@ class DbDatetimeTest extends FunctionalTest {
function testDbDatetimeFormat() { function testDbDatetimeFormat() {
if($this->supportDbDatetime) { if($this->supportDbDatetime) {
$query = 'SELECT ' . $this->adapter->formattedDatetimeClause('1973-10-14 10:30:00', '%H:%i, %d/%m/%Y'); $query = new SQLQuery($this->adapter->formattedDatetimeClause('1973-10-14 10:30:00', '%H:%i, %d/%m/%Y'));
$result = DB::query($query)->value(); $result = $query->execute()->value();
$this->matchesRoughly($result, date('H:i, d/m/Y', strtotime('1973-10-14 10:30:00')), 'nice literal time'); $this->matchesRoughly($result, date('H:i, d/m/Y', strtotime('1973-10-14 10:30:00')), 'nice literal time');
$query = 'SELECT ' . $this->adapter->formattedDatetimeClause('now', '%d'); $query = new SQLQuery($this->adapter->formattedDatetimeClause('now', '%d'));
$result = DB::query($query)->value(); $result = $query->execute()->value();
$this->matchesRoughly($result, date('d', $this->getDbNow()), 'todays day'); $this->matchesRoughly($result, date('d', $this->getDbNow()), 'todays day');
$query = 'SELECT ' . $this->adapter->formattedDatetimeClause('"Created"', '%U') . ' AS test FROM "DbDateTimeTest_Team"'; $query = new SQLQuery($this->adapter->formattedDatetimeClause('"Created"', '%U') . ' AS test FROM "DbDateTimeTest_Team"');
$result = DB::query($query)->value(); $result = $query->execute()->value();
$this->matchesRoughly($result, strtotime(DataObject::get_one('DbDateTimeTest_Team')->Created), 'fixture ->Created as timestamp'); $this->matchesRoughly($result, strtotime(DataObject::get_one('DbDateTimeTest_Team')->Created), 'fixture ->Created as timestamp');
} }
@ -81,16 +81,19 @@ class DbDatetimeTest extends FunctionalTest {
function testDbDatetimeInterval() { function testDbDatetimeInterval() {
if($this->supportDbDatetime) { if($this->supportDbDatetime) {
$query = 'SELECT ' . $this->adapter->datetimeIntervalClause('1973-10-14 10:30:00', '+18 Years'); $query = new SQLQuery($this->adapter->datetimeIntervalClause('1973-10-14 10:30:00', '+18 Years'));
$result = DB::query($query)->value(); $result = $query->execute()->value();
$this->matchesRoughly($result, '1991-10-14 10:30:00', 'add 18 years'); $this->matchesRoughly($result, '1991-10-14 10:30:00', 'add 18 years');
$query = 'SELECT ' . $this->adapter->datetimeIntervalClause('now', '+1 Day'); $query = new SQLQuery($this->adapter->datetimeIntervalClause('now', '+1 Day'));
$result = DB::query($query)->value(); $result = $query->execute()->value();
$this->matchesRoughly($result, date('Y-m-d H:i:s', strtotime('+1 Day', $this->getDbNow())), 'tomorrow'); $this->matchesRoughly($result, date('Y-m-d H:i:s', strtotime('+1 Day', $this->getDbNow())), 'tomorrow');
$query = 'SELECT ' . $this->adapter->datetimeIntervalClause('"Created"', '-15 Minutes') . ' AS "test" FROM "DbDateTimeTest_Team" LIMIT 1'; $query = new SQLQuery();
$result = DB::query($query)->value(); $query->select($this->adapter->datetimeIntervalClause('"Created"', '-15 Minutes') . ' AS "test"')
->from("DbDateTimeTest_Team")
->limit(1);
$result = $query->execute()->value();
$this->matchesRoughly($result, date('Y-m-d H:i:s', strtotime(Dataobject::get_one('DbDateTimeTest_Team')->Created) - 900), '15 Minutes before creating fixture'); $this->matchesRoughly($result, date('Y-m-d H:i:s', strtotime(Dataobject::get_one('DbDateTimeTest_Team')->Created) - 900), '15 Minutes before creating fixture');
} }
@ -99,20 +102,24 @@ class DbDatetimeTest extends FunctionalTest {
function testDbDatetimeDifference() { function testDbDatetimeDifference() {
if($this->supportDbDatetime) { if($this->supportDbDatetime) {
$query = 'SELECT ' . $this->adapter->datetimeDifferenceClause('1974-10-14 10:30:00', '1973-10-14 10:30:00'); $query = new SQLQuery($this->adapter->datetimeDifferenceClause('1974-10-14 10:30:00', '1973-10-14 10:30:00'));
$result = DB::query($query)->value(); $result = $query->execute()->value();
$this->matchesRoughly($result/86400, 365, '1974 - 1973 = 365 * 86400 sec'); $this->matchesRoughly($result/86400, 365, '1974 - 1973 = 365 * 86400 sec');
$query = 'SELECT ' . $this->adapter->datetimeDifferenceClause(date('Y-m-d H:i:s', strtotime('-15 seconds')), 'now'); $query = new SQLQuery($this->adapter->datetimeDifferenceClause(date('Y-m-d H:i:s', strtotime('-15 seconds')), 'now'));
$result = DB::query($query)->value(); $result = $query->execute()->value();
$this->matchesRoughly($result, -15, '15 seconds ago - now'); $this->matchesRoughly($result, -15, '15 seconds ago - now');
$query = 'SELECT ' . $this->adapter->datetimeDifferenceClause('now', $this->adapter->datetimeIntervalClause('now', '+45 Minutes')); $query = new SQLQuery($this->adapter->datetimeDifferenceClause('now', $this->adapter->datetimeIntervalClause('now', '+45 Minutes')));
$result = DB::query($query)->value(); $result = $query->execute()->value();
$this->matchesRoughly($result, -45 * 60, 'now - 45 minutes ahead'); $this->matchesRoughly($result, -45 * 60, 'now - 45 minutes ahead');
$query = 'SELECT ' . $this->adapter->datetimeDifferenceClause('"LastEdited"', '"Created"') . ' AS "test" FROM "DbDateTimeTest_Team" LIMIT 1'; $query = new SQLQuery();
$result = DB::query($query)->value(); $query->select($this->adapter->datetimeDifferenceClause('"LastEdited"', '"Created"') . ' AS "test"')
->from("DbDateTimeTest_Team")
->limit(1);
$result = $query->execute()->value();
$lastedited = Dataobject::get_one('DbDateTimeTest_Team')->LastEdited; $lastedited = Dataobject::get_one('DbDateTimeTest_Team')->LastEdited;
$created = Dataobject::get_one('DbDateTimeTest_Team')->Created; $created = Dataobject::get_one('DbDateTimeTest_Team')->Created;
$this->matchesRoughly($result, strtotime($lastedited) - strtotime($created), 'age of HomePage record in seconds since unix epoc'); $this->matchesRoughly($result, strtotime($lastedited) - strtotime($created), 'age of HomePage record in seconds since unix epoc');