mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #6052 from owncloud/datetime-doctrine 

Get rid of date strings for DB. Completely use Doctrine and DateTime.
This commit is contained in:
Thomas Müller 2013-12-01 01:29:35 -08:00
parent c2b11cae83 06df3822a0
commit 832be7c908
2 changed files with 5 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/public/share.php
View File

@ -827,11 +827,12 @@ class Share {
$date = null; $date = null;
} else { } else {
$date = new \DateTime($date); $date = new \DateTime($date);
$date = date('Y-m-d H:i', $date->format('U') - $date->getOffset());
} }
$query = \OC_DB::prepare('UPDATE `*PREFIX*share` SET `expiration` = ? WHERE `id` = ?'); $query = \OC_DB::prepare('UPDATE `*PREFIX*share` SET `expiration` = ? WHERE `id` = ?');
$query->bindValue(1, $date, 'datetime');
foreach ($items as $item) { foreach ($items as $item) {
$query->execute(array($date, $item['id'])); $query->bindValue(2, (int) $item['id']);
$query->execute();
} }
return true; return true;
} }
@ -847,7 +848,8 @@ class Share {
protected static function expireItem(array $item) { protected static function expireItem(array $item) {
if (!empty($item['expiration'])) { if (!empty($item['expiration'])) {
$now = new \DateTime(); $now = new \DateTime();
$expirationDate = new \DateTime($item['expiration'], new \DateTimeZone('UTC')); $expirationDate = \Doctrine\DBAL\Types\Type::getType('datetime')
->convertToPhpValue($item['expiration'], \OC_DB::getConnection()->getDatabasePlatform());
if ($now > $expirationDate) { if ($now > $expirationDate) {
self::unshareItem($item); self::unshareItem($item);
return true; return true;

38
tests/lib/db.php
View File

@ -145,42 +145,4 @@ class Test_DB extends PHPUnit_Framework_TestCase {
$this->assertEquals(1, $result->numRows()); $this->assertEquals(1, $result->numRows());
} }
/**
* Tests whether the database is configured so it accepts and returns dates
* in the expected format.
*/
public function testTimestampDateFormat() {
$table = '*PREFIX*'.$this->test_prefix.'timestamp';
$column = 'timestamptest';
$expectedFormat = 'Y-m-d H:i:s';
$expected = new \DateTime;
$query = OC_DB::prepare("INSERT INTO `$table` (`$column`) VALUES (?)");
$result = $query->execute(array($expected->format($expectedFormat)));
$this->assertEquals(
1,
$result,
"Database failed to accept dates in the format '$expectedFormat'."
);
$id = OC_DB::insertid($table);
$query = OC_DB::prepare("SELECT * FROM `$table` WHERE `id` = ?");
$result = $query->execute(array($id));
$row = $result->fetchRow();
$actual = \DateTime::createFromFormat($expectedFormat, $row[$column]);
$this->assertInstanceOf(
'\DateTime',
$actual,
"Database failed to return dates in the format '$expectedFormat'."
);
$this->assertEquals(
$expected,
$actual,
'Failed asserting that the returned date is the same as the inserted.'
);
}
} }