From: Bart Visscher <bartv@thisnet.nl>
Date: Thu, 18 Jul 2013 21:24:27 +0000 (-0700)
Subject: Merge pull request #2221 from owncloud/doctrine
X-Git-Tag: v6.0.0alpha2~444
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=084cf0c202c2430938f5c061d8e8616dda10e2df;p=nextcloud-server.git

Merge pull request #2221 from owncloud/doctrine

OC6: Implement Doctrine as the backend for OC_DB
---

084cf0c202c2430938f5c061d8e8616dda10e2df
diff --cc lib/db.php
index 66627856461,d911e14804f..e70d66fc2ba
--- a/lib/db.php
+++ b/lib/db.php
@@@ -769,16 -521,16 +521,16 @@@ class OC_DB 
  			$query = str_replace( '`', '"', $query );
  			$query = str_ireplace( 'UNIX_TIMESTAMP()', 'cast(extract(epoch from current_timestamp) as integer)',
  				$query );
- 		}elseif( $type == 'oci'  ) {
+ 		} elseif( $type == 'oci'  ) {
  			$query = str_replace( '`', '"', $query );
  			$query = str_ireplace( 'NOW()', 'CURRENT_TIMESTAMP', $query );
- 			$query = str_ireplace( 'UNIX_TIMESTAMP()', '((CAST(SYS_EXTRACT_UTC(systimestamp) AS DATE))-TO_DATE(\'1970101000000\',\'YYYYMMDDHH24MiSS\'))*24*3600', $query );
+ 			$query = str_ireplace( 'UNIX_TIMESTAMP()', "(cast(sys_extract_utc(systimestamp) as date) - date'1970-01-01') * 86400", $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);
  		}