upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-28 04:32:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 26

Merge pull request #5673 from owncloud/oc6-windows-server-mssql-master

Browse source 
Oc6 windows server mssql master
This commit is contained in:
Thomas Müller 2013-11-05 00:41:11 -08:00
commit f91fe8d595
4 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -90,3 +90,5 @@ nbproject
/tests/coverage*
/tests/autoconfig*
/tests/autotest*
/tests/data/lorem-copy.txt
/tests/data/testimage-copy.png

7
lib/private/db/adaptersqlsrv.php
View file

@ -10,13 +10,6 @@
namespace OC\DB;
class AdapterSQLSrv extends Adapter {
public function lastInsertId($table) {
if($table !== null) {
$table = $this->conn->replaceTablePrefix( $table );
}
return $this->conn->lastInsertId($table);
}
public function fixupStatement($statement) {
$statement = preg_replace( "/\`(.*?)`/", "[$1]", $statement );
$statement = str_ireplace( 'NOW()', 'CURRENT_TIMESTAMP', $statement );

7
lib/private/files/storage/home.php
View file

@ -19,10 +19,9 @@ class Home extends Local {
public function __construct($arguments) {
$this->user = $arguments['user'];
$this->datadir = $this->user->getHome();
if (substr($this->datadir, -1) !== '/') {
$this->datadir .= '/';
}
$datadir = $this->user->getHome();
parent::__construct(array('datadir' => $datadir));
}
public function getId() {

3
tests/lib/helper.php
View file

@ -239,7 +239,8 @@ class Test_Helper extends PHPUnit_Framework_TestCase {
return array(
array(0, false, false, false),
array(0, false, \OC::$SERVERROOT . '/tests/data/lorem.txt', false),
array(446, true, \OC::$SERVERROOT . '/tests/data/lorem.txt', \OC::$SERVERROOT . '/tests/data/lorem-copy.txt'),
array(filesize(\OC::$SERVERROOT . '/tests/data/lorem.txt'), true, \OC::$SERVERROOT . '/tests/data/lorem.txt', \OC::$SERVERROOT . '/tests/data/lorem-copy.txt'),
array(3670, true, \OC::$SERVERROOT . '/tests/data/testimage.png', \OC::$SERVERROOT . '/tests/data/testimage-copy.png'),
);
}
}