Merge pull request #2221 from owncloud/doctrine

OC6: Implement Doctrine as the backend for OC_DB

diff --cc lib/db.php
index 6662785646113b33d96e43e61f023fca73ded373,d911e14804fd91e54569f3839e28403ae6814cc7..e70d66fc2ba2f8c6403aba9f8bf951ea1e1f1095
--- 1/lib/db.php
--- 2/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);
                }