summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2013-07-17 13:57:43 -0700
committerThomas Müller <thomas.mueller@tmit.eu>2013-07-17 13:57:43 -0700
commit3c6b205e37591fa3302d9e0b4de12b24c3b5cdd3 (patch)
treed4f5d3e16c7094fb6207e693c9945f09975d145c
parent93b9bad6bb44dfa38386b15fbfd56d52510c0f51 (diff)
parent24283425a6681a074ee72a61ad31b2ee45f1be7c (diff)
downloadnextcloud-server-3c6b205e37591fa3302d9e0b4de12b24c3b5cdd3.tar.gz
nextcloud-server-3c6b205e37591fa3302d9e0b4de12b24c3b5cdd3.zip
Merge pull request #4099 from owncloud/fixing-unix-timestamp-mssql-master
fixing UNIX_TIMESTAMP() for mssql
-rw-r--r--lib/db.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/db.php b/lib/db.php
index 6fec60e53ce..66627856461 100644
--- a/lib/db.php
+++ b/lib/db.php
@@ -775,10 +775,10 @@ class OC_DB {
$query = str_ireplace( 'UNIX_TIMESTAMP()', '((CAST(SYS_EXTRACT_UTC(systimestamp) AS DATE))-TO_DATE(\'1970101000000\',\'YYYYMMDDHH24MiSS\'))*24*3600', $query );
}elseif( $type == 'mssql' ) {
$query = preg_replace( "/\`(.*?)`/", "[$1]", $query );
- $query = str_replace( 'NOW()', 'CURRENT_TIMESTAMP', $query );
- $query = str_replace( 'now()', 'CURRENT_TIMESTAMP', $query );
+ $query = str_ireplace( 'NOW()', 'CURRENT_TIMESTAMP', $query );
$query = str_replace( 'LENGTH(', 'LEN(', $query );
$query = str_replace( 'SUBSTR(', 'SUBSTRING(', $query );
+ $query = str_ireplace( 'UNIX_TIMESTAMP()', 'DATEDIFF(second,{d \'1970-01-01\'},GETDATE())', $query );
$query = self::fixLimitClauseForMSSQL($query);
}