Merge pull request #1706 from owncloud/master-sqlserver
Microsoft SQL-Server support for ownCloud!
This commit is contained in:
commit
6dd1d479da
47
autotest.cmd
47
autotest.cmd
|
@ -4,14 +4,14 @@
|
||||||
:: @author Thomas Müller
|
:: @author Thomas Müller
|
||||||
:: @author Tobias Ramforth (translated into Windows batch file)
|
:: @author Tobias Ramforth (translated into Windows batch file)
|
||||||
::
|
::
|
||||||
:: @copyright 2012 Thomas Müller thomas.mueller@tmit.eu
|
:: @copyright 2012, 2013 Thomas Müller thomas.mueller@tmit.eu
|
||||||
::
|
::
|
||||||
@echo off
|
@echo off
|
||||||
|
|
||||||
set DATADIR=data-autotest
|
set DATADIR=data-autotest
|
||||||
set BASEDIR=%~dp0
|
set BASEDIR=%~dp0
|
||||||
|
|
||||||
:: create autoconfig for sqlite, mysql and postgresql
|
:: create autoconfig for sqlite, mysql, postgresql and mssql
|
||||||
echo ^<?php > .\tests\autoconfig-sqlite.php
|
echo ^<?php > .\tests\autoconfig-sqlite.php
|
||||||
echo $AUTOCONFIG ^= array ^( >> .\tests\autoconfig-sqlite.php
|
echo $AUTOCONFIG ^= array ^( >> .\tests\autoconfig-sqlite.php
|
||||||
echo 'installed' ^=^> false^, >> .\tests\autoconfig-sqlite.php
|
echo 'installed' ^=^> false^, >> .\tests\autoconfig-sqlite.php
|
||||||
|
@ -50,16 +50,35 @@ echo 'dbhost' ^=^> 'localhost'^, >> .\tests\autoconfig-pgsql.php
|
||||||
echo 'dbpass' ^=^> 'owncloud'^, >> .\tests\autoconfig-pgsql.php
|
echo 'dbpass' ^=^> 'owncloud'^, >> .\tests\autoconfig-pgsql.php
|
||||||
echo ^)^; >> .\tests\autoconfig-pgsql.php
|
echo ^)^; >> .\tests\autoconfig-pgsql.php
|
||||||
|
|
||||||
|
echo ^<?php > .\tests\autoconfig-mssql.php
|
||||||
|
echo $AUTOCONFIG ^= array ^( >> .\tests\autoconfig-mssql.php
|
||||||
|
echo 'installed' ^=^> false^, >> .\tests\autoconfig-mssql.php
|
||||||
|
echo 'dbtype' ^=^> 'mssql'^, >> .\tests\autoconfig-mssql.php
|
||||||
|
echo 'dbtableprefix' ^=^> 'oc_'^, >> .\tests\autoconfig-mssql.php
|
||||||
|
echo 'adminlogin' ^=^> 'admin'^, >> .\tests\autoconfig-mssql.php
|
||||||
|
echo 'adminpass' ^=^> 'admin'^, >> .\tests\autoconfig-mssql.php
|
||||||
|
echo 'directory' ^=^> '%BASEDIR%%DATADIR%'^, >> .\tests\autoconfig-mssql.php
|
||||||
|
echo 'dbuser' ^=^> 'oc_autotest'^, >> .\tests\autoconfig-mssql.php
|
||||||
|
echo 'dbname' ^=^> 'oc_autotest'^, >> .\tests\autoconfig-mssql.php
|
||||||
|
echo 'dbhost' ^=^> 'localhost\sqlexpress'^, >> .\tests\autoconfig-mssql.php
|
||||||
|
echo 'dbpass' ^=^> 'owncloud'^, >> .\tests\autoconfig-mssql.php
|
||||||
|
echo ^)^; >> .\tests\autoconfig-mssql.php
|
||||||
|
|
||||||
echo localhost:5432:*:oc_autotest:owncloud > %APPDATA%\postgresql\pgpass.conf
|
echo localhost:5432:*:oc_autotest:owncloud > %APPDATA%\postgresql\pgpass.conf
|
||||||
|
|
||||||
::
|
::
|
||||||
:: start test execution
|
:: start test execution
|
||||||
::
|
::
|
||||||
::call:execute_tests "sqlite"
|
if [%1] == [] (
|
||||||
call:execute_tests "mysql"
|
echo "Running on all database backends"
|
||||||
::call:execute_tests "mssql"
|
call:execute_tests "sqlite"
|
||||||
::call:execute_tests "ora"
|
call:execute_tests "mysql"
|
||||||
::call:execute_tests "pgsql"
|
call:execute_tests "mssql"
|
||||||
|
::call:execute_tests "ora"
|
||||||
|
call:execute_tests "pgsql"
|
||||||
|
) else (
|
||||||
|
call:execute_tests "%1"
|
||||||
|
)
|
||||||
|
|
||||||
goto:eof
|
goto:eof
|
||||||
|
|
||||||
|
@ -84,6 +103,9 @@ goto:eof
|
||||||
|
|
||||||
if "%~1" == "pgsql" dropdb -h localhost -p 5432 -U oc_autotest -w oc_autotest
|
if "%~1" == "pgsql" dropdb -h localhost -p 5432 -U oc_autotest -w oc_autotest
|
||||||
|
|
||||||
|
:: we assume a sqlexpress installation
|
||||||
|
if "%~1" == "mssql" sqlcmd -S localhost\sqlexpress -U oc_autotest -P owncloud -Q "IF EXISTS (SELECT name FROM sys.databases WHERE name=N'oc_autotest') DROP DATABASE [oc_autotest]"
|
||||||
|
|
||||||
:: copy autoconfig
|
:: copy autoconfig
|
||||||
copy /y %BASEDIR%\tests\autoconfig-%~1.php %BASEDIR%\config\autoconfig.php
|
copy /y %BASEDIR%\tests\autoconfig-%~1.php %BASEDIR%\config\autoconfig.php
|
||||||
|
|
||||||
|
@ -96,9 +118,8 @@ goto:eof
|
||||||
rmdir /s /q coverage-html-%~1
|
rmdir /s /q coverage-html-%~1
|
||||||
md coverage-html-%~1
|
md coverage-html-%~1
|
||||||
php -f enable_all.php
|
php -f enable_all.php
|
||||||
::phpunit --log-junit autotest-results-%~1.xml --coverage-clover autotest-clover-%~1.xml --coverage-html coverage-html-%~1
|
|
||||||
::phpunit --bootstrap bootstrap.php --configuration phpunit.xml
|
php win32-phpunit.php --bootstrap bootstrap.php --configuration phpunit-autotest.xml --log-junit autotest-results-%~1.xml --coverage-clover autotest-clover-%~1.xml --coverage-html coverage-html-%~1
|
||||||
php win32-phpunit.php --bootstrap bootstrap.php --configuration phpunit.xml --log-junit autotest-results-%~1.xml --coverage-clover autotest-clover-%~1.xml --coverage-html coverage-html-%~1
|
|
||||||
echo "Done with testing %~1 ..."
|
echo "Done with testing %~1 ..."
|
||||||
cd %BASEDIR%
|
cd %BASEDIR%
|
||||||
goto:eof
|
goto:eof
|
||||||
|
@ -114,4 +135,10 @@ goto:eof
|
||||||
:: - to enable dropdb I decided to add following line to pg_hba.conf (this is not the safest way but I don't care for the testing machine):
|
:: - to enable dropdb I decided to add following line to pg_hba.conf (this is not the safest way but I don't care for the testing machine):
|
||||||
:: local all all trust
|
:: local all all trust
|
||||||
::
|
::
|
||||||
|
:: NOTES on mssql:
|
||||||
|
:: we assume the usage of a local installed sqlexpress
|
||||||
|
:: create a user 'oc_autotest' with password 'owncloud' and assign the server role 'dbcreator'
|
||||||
|
:: make sure the sqlserver is configured to allow sql authentication
|
||||||
|
::
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -5,6 +5,7 @@ $(document).ready(function() {
|
||||||
mysql:!!$('#hasMySQL').val(),
|
mysql:!!$('#hasMySQL').val(),
|
||||||
postgresql:!!$('#hasPostgreSQL').val(),
|
postgresql:!!$('#hasPostgreSQL').val(),
|
||||||
oracle:!!$('#hasOracle').val(),
|
oracle:!!$('#hasOracle').val(),
|
||||||
|
mssql:!!$('#hasMSSQL').val()
|
||||||
};
|
};
|
||||||
|
|
||||||
$('#selectDbType').buttonset();
|
$('#selectDbType').buttonset();
|
||||||
|
@ -42,6 +43,12 @@ $(document).ready(function() {
|
||||||
$('#dbhostlabel').show(250);
|
$('#dbhostlabel').show(250);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
$('#mssql').click(function() {
|
||||||
|
$('#use_other_db').slideDown(250);
|
||||||
|
$('#dbhost').show(250);
|
||||||
|
$('#dbhostlabel').show(250);
|
||||||
|
});
|
||||||
|
|
||||||
$('input[checked]').trigger('click');
|
$('input[checked]').trigger('click');
|
||||||
|
|
||||||
$('#showAdvanced').click(function() {
|
$('#showAdvanced').click(function() {
|
||||||
|
|
|
@ -16,6 +16,7 @@ $hasSQLite = class_exists('SQLite3');
|
||||||
$hasMySQL = is_callable('mysql_connect');
|
$hasMySQL = is_callable('mysql_connect');
|
||||||
$hasPostgreSQL = is_callable('pg_connect');
|
$hasPostgreSQL = is_callable('pg_connect');
|
||||||
$hasOracle = is_callable('oci_connect');
|
$hasOracle = is_callable('oci_connect');
|
||||||
|
$hasMSSQL = is_callable('sqlsrv_connect');
|
||||||
$datadir = OC_Config::getValue('datadirectory', OC::$SERVERROOT.'/data');
|
$datadir = OC_Config::getValue('datadirectory', OC::$SERVERROOT.'/data');
|
||||||
|
|
||||||
// Protect data directory here, so we can test if the protection is working
|
// Protect data directory here, so we can test if the protection is working
|
||||||
|
@ -26,6 +27,7 @@ $opts = array(
|
||||||
'hasMySQL' => $hasMySQL,
|
'hasMySQL' => $hasMySQL,
|
||||||
'hasPostgreSQL' => $hasPostgreSQL,
|
'hasPostgreSQL' => $hasPostgreSQL,
|
||||||
'hasOracle' => $hasOracle,
|
'hasOracle' => $hasOracle,
|
||||||
|
'hasMSSQL' => $hasMSSQL,
|
||||||
'directory' => $datadir,
|
'directory' => $datadir,
|
||||||
'secureRNG' => OC_Util::secureRNG_available(),
|
'secureRNG' => OC_Util::secureRNG_available(),
|
||||||
'htaccessWorking' => OC_Util::ishtaccessworking(),
|
'htaccessWorking' => OC_Util::ishtaccessworking(),
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
<input type='hidden' id='hasSQLite' value='<?php echo $_['hasSQLite'] ?>'>
|
<input type='hidden' id='hasSQLite' value='<?php echo $_['hasSQLite'] ?>'>
|
||||||
<input type='hidden' id='hasPostgreSQL' value='<?php echo $_['hasPostgreSQL'] ?>'>
|
<input type='hidden' id='hasPostgreSQL' value='<?php echo $_['hasPostgreSQL'] ?>'>
|
||||||
<input type='hidden' id='hasOracle' value='<?php echo $_['hasOracle'] ?>'>
|
<input type='hidden' id='hasOracle' value='<?php echo $_['hasOracle'] ?>'>
|
||||||
|
<input type='hidden' id='hasMSSQL' value='<?php echo $_['hasMSSQL'] ?>'>
|
||||||
<form action="index.php" method="post">
|
<form action="index.php" method="post">
|
||||||
<input type="hidden" name="install" value="true" />
|
<input type="hidden" name="install" value="true" />
|
||||||
<?php if(count($_['errors']) > 0): ?>
|
<?php if(count($_['errors']) > 0): ?>
|
||||||
|
@ -60,7 +61,7 @@
|
||||||
</fieldset>
|
</fieldset>
|
||||||
|
|
||||||
<fieldset id='databaseField'>
|
<fieldset id='databaseField'>
|
||||||
<?php if($_['hasMySQL'] or $_['hasPostgreSQL'] or $_['hasOracle'])
|
<?php if($_['hasMySQL'] or $_['hasPostgreSQL'] or $_['hasOracle'] or $_['hasMSSQL'])
|
||||||
$hasOtherDB = true; else $hasOtherDB =false; //other than SQLite ?>
|
$hasOtherDB = true; else $hasOtherDB =false; //other than SQLite ?>
|
||||||
<legend><?php echo $l->t( 'Configure the database' ); ?></legend>
|
<legend><?php echo $l->t( 'Configure the database' ); ?></legend>
|
||||||
<div id="selectDbType">
|
<div id="selectDbType">
|
||||||
|
@ -78,7 +79,7 @@
|
||||||
|
|
||||||
<?php if($_['hasMySQL']): ?>
|
<?php if($_['hasMySQL']): ?>
|
||||||
<input type='hidden' id='hasMySQL' value='true'/>
|
<input type='hidden' id='hasMySQL' value='true'/>
|
||||||
<?php if(!$_['hasSQLite'] and !$_['hasPostgreSQL'] and !$_['hasOracle']): ?>
|
<?php if(!$_['hasSQLite'] and !$_['hasPostgreSQL'] and !$_['hasOracle'] and !$_['hasMSSQL']): ?>
|
||||||
<p>MySQL <?php echo $l->t( 'will be used' ); ?>.</p>
|
<p>MySQL <?php echo $l->t( 'will be used' ); ?>.</p>
|
||||||
<input type="hidden" id="dbtype" name="dbtype" value="mysql" />
|
<input type="hidden" id="dbtype" name="dbtype" value="mysql" />
|
||||||
<?php else: ?>
|
<?php else: ?>
|
||||||
|
@ -89,7 +90,7 @@
|
||||||
<?php endif; ?>
|
<?php endif; ?>
|
||||||
|
|
||||||
<?php if($_['hasPostgreSQL']): ?>
|
<?php if($_['hasPostgreSQL']): ?>
|
||||||
<?php if(!$_['hasSQLite'] and !$_['hasMySQL'] and !$_['hasOracle']): ?>
|
<?php if(!$_['hasSQLite'] and !$_['hasMySQL'] and !$_['hasOracle'] and !$_['hasMSSQL']): ?>
|
||||||
<p>PostgreSQL <?php echo $l->t( 'will be used' ); ?>.</p>
|
<p>PostgreSQL <?php echo $l->t( 'will be used' ); ?>.</p>
|
||||||
<input type="hidden" id="dbtype" name="dbtype" value="pgsql" />
|
<input type="hidden" id="dbtype" name="dbtype" value="pgsql" />
|
||||||
<?php else: ?>
|
<?php else: ?>
|
||||||
|
@ -100,7 +101,7 @@
|
||||||
<?php endif; ?>
|
<?php endif; ?>
|
||||||
|
|
||||||
<?php if($_['hasOracle']): ?>
|
<?php if($_['hasOracle']): ?>
|
||||||
<?php if(!$_['hasSQLite'] and !$_['hasMySQL'] and !$_['hasPostgreSQL']): ?>
|
<?php if(!$_['hasSQLite'] and !$_['hasMySQL'] and !$_['hasPostgreSQL'] and !$_['hasMSSQL']): ?>
|
||||||
<p>Oracle <?php echo $l->t( 'will be used' ); ?>.</p>
|
<p>Oracle <?php echo $l->t( 'will be used' ); ?>.</p>
|
||||||
<input type="hidden" id="dbtype" name="dbtype" value="oci" />
|
<input type="hidden" id="dbtype" name="dbtype" value="oci" />
|
||||||
<?php else: ?>
|
<?php else: ?>
|
||||||
|
@ -109,6 +110,17 @@
|
||||||
<?php OC_Helper::init_radio('dbtype', 'oci', 'sqlite'); ?>/>
|
<?php OC_Helper::init_radio('dbtype', 'oci', 'sqlite'); ?>/>
|
||||||
<?php endif; ?>
|
<?php endif; ?>
|
||||||
<?php endif; ?>
|
<?php endif; ?>
|
||||||
|
|
||||||
|
<?php if($_['hasMSSQL']): ?>
|
||||||
|
<input type='hidden' id='hasMSSQL' value='true'/>
|
||||||
|
<?php if(!$_['hasSQLite'] and !$_['hasMySQL'] and !$_['hasPostgreSQL'] and !$_['hasOracle']): ?>
|
||||||
|
<p>MS SQL <?php echo $l->t( 'will be used' ); ?>.</p>
|
||||||
|
<input type="hidden" id="dbtype" name="dbtype" value="mssql" />
|
||||||
|
<?php else: ?>
|
||||||
|
<label class="mssql" for="mssql">MS SQL</label>
|
||||||
|
<input type="radio" name="dbtype" value='mssql' id="mssql" <?php OC_Helper::init_radio('dbtype', 'mssql', 'sqlite'); ?>/>
|
||||||
|
<?php endif; ?>
|
||||||
|
<?php endif; ?>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<?php if($hasOtherDB): ?>
|
<?php if($hasOtherDB): ?>
|
||||||
|
|
199
lib/db.php
199
lib/db.php
|
@ -178,6 +178,13 @@ class OC_DB {
|
||||||
$dsn = 'oci:dbname=//' . $host . '/' . $name;
|
$dsn = 'oci:dbname=//' . $host . '/' . $name;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
case 'mssql':
|
||||||
|
if ($port) {
|
||||||
|
$dsn='sqlsrv:Server='.$host.','.$port.';Database='.$name;
|
||||||
|
} else {
|
||||||
|
$dsn='sqlsrv:Server='.$host.';Database='.$name;
|
||||||
|
}
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
@ -278,6 +285,15 @@ class OC_DB {
|
||||||
$dsn['database'] = $user;
|
$dsn['database'] = $user;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
case 'mssql':
|
||||||
|
$dsn = array(
|
||||||
|
'phptype' => 'sqlsrv',
|
||||||
|
'username' => $user,
|
||||||
|
'password' => $pass,
|
||||||
|
'hostspec' => $host,
|
||||||
|
'database' => $name
|
||||||
|
);
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
@ -389,6 +405,13 @@ class OC_DB {
|
||||||
$query = self::prepare('SELECT lastval() AS id');
|
$query = self::prepare('SELECT lastval() AS id');
|
||||||
$row = $query->execute()->fetchRow();
|
$row = $query->execute()->fetchRow();
|
||||||
return $row['id'];
|
return $row['id'];
|
||||||
|
}
|
||||||
|
if( $type == 'mssql' ) {
|
||||||
|
if($table !== null) {
|
||||||
|
$prefix = OC_Config::getValue( "dbtableprefix", "oc_" );
|
||||||
|
$table = str_replace( '*PREFIX*', $prefix, $table );
|
||||||
|
}
|
||||||
|
return self::$connection->lastInsertId($table);
|
||||||
}else{
|
}else{
|
||||||
if($table !== null) {
|
if($table !== null) {
|
||||||
$prefix = OC_Config::getValue( "dbtableprefix", "oc_" );
|
$prefix = OC_Config::getValue( "dbtableprefix", "oc_" );
|
||||||
|
@ -631,7 +654,7 @@ class OC_DB {
|
||||||
} else {
|
} else {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
} elseif( $type == 'pgsql' || $type == 'oci' || $type == 'mysql') {
|
} elseif( $type == 'pgsql' || $type == 'oci' || $type == 'mysql' || $type == 'mssql') {
|
||||||
$query = 'INSERT INTO `' .$table . '` ('
|
$query = 'INSERT INTO `' .$table . '` ('
|
||||||
. implode(',', array_keys($input)) . ') SELECT \''
|
. implode(',', array_keys($input)) . ') SELECT \''
|
||||||
. implode('\',\'', array_values($input)) . '\' FROM ' . $table . ' WHERE ';
|
. implode('\',\'', array_values($input)) . '\' FROM ' . $table . ' WHERE ';
|
||||||
|
@ -691,7 +714,15 @@ class OC_DB {
|
||||||
}elseif( $type == 'oci' ) {
|
}elseif( $type == 'oci' ) {
|
||||||
$query = str_replace( '`', '"', $query );
|
$query = str_replace( '`', '"', $query );
|
||||||
$query = str_ireplace( 'NOW()', 'CURRENT_TIMESTAMP', $query );
|
$query = str_ireplace( 'NOW()', 'CURRENT_TIMESTAMP', $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_replace( 'LENGTH(', 'LEN(', $query );
|
||||||
|
$query = str_replace( 'SUBSTR(', 'SUBSTRING(', $query );
|
||||||
|
|
||||||
|
$query = self::fixLimitClauseForMSSQL($query);
|
||||||
|
}
|
||||||
|
|
||||||
// replace table name prefix
|
// replace table name prefix
|
||||||
$query = str_replace( '*PREFIX*', $prefix, $query );
|
$query = str_replace( '*PREFIX*', $prefix, $query );
|
||||||
|
@ -699,6 +730,60 @@ class OC_DB {
|
||||||
return $query;
|
return $query;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static function fixLimitClauseForMSSQL($query) {
|
||||||
|
$limitLocation = stripos ($query, "LIMIT");
|
||||||
|
|
||||||
|
if ( $limitLocation === false ) {
|
||||||
|
return $query;
|
||||||
|
}
|
||||||
|
|
||||||
|
// total == 0 means all results - not zero results
|
||||||
|
//
|
||||||
|
// First number is either total or offset, locate it by first space
|
||||||
|
//
|
||||||
|
$offset = substr ($query, $limitLocation + 5);
|
||||||
|
$offset = substr ($offset, 0, stripos ($offset, ' '));
|
||||||
|
$offset = trim ($offset);
|
||||||
|
|
||||||
|
// check for another parameter
|
||||||
|
if (stripos ($offset, ',') === false) {
|
||||||
|
// no more parameters
|
||||||
|
$offset = 0;
|
||||||
|
$total = intval ($offset);
|
||||||
|
} else {
|
||||||
|
// found another parameter
|
||||||
|
$offset = intval ($offset);
|
||||||
|
|
||||||
|
$total = substr ($query, $limitLocation + 5);
|
||||||
|
$total = substr ($total, stripos ($total, ','));
|
||||||
|
|
||||||
|
$total = substr ($total, 0, stripos ($total, ' '));
|
||||||
|
$total = intval ($total);
|
||||||
|
}
|
||||||
|
|
||||||
|
$query = trim (substr ($query, 0, $limitLocation));
|
||||||
|
|
||||||
|
if ($offset == 0 && $total !== 0) {
|
||||||
|
if (strpos($query, "SELECT") === false) {
|
||||||
|
$query = "TOP {$total} " . $query;
|
||||||
|
} else {
|
||||||
|
$query = preg_replace('/SELECT(\s*DISTINCT)?/Dsi', 'SELECT$1 TOP '.$total, $query);
|
||||||
|
}
|
||||||
|
} else if ($offset > 0) {
|
||||||
|
$query = preg_replace('/SELECT(\s*DISTINCT)?/Dsi', 'SELECT$1 TOP(10000000) ', $query);
|
||||||
|
$query = 'SELECT *
|
||||||
|
FROM (SELECT sub2.*, ROW_NUMBER() OVER(ORDER BY sub2.line2) AS line3
|
||||||
|
FROM (SELECT 1 AS line2, sub1.* FROM (' . $query . ') AS sub1) as sub2) AS sub3';
|
||||||
|
|
||||||
|
if ($total > 0) {
|
||||||
|
$query .= ' WHERE line3 BETWEEN ' . ($offset + 1) . ' AND ' . ($offset + $total);
|
||||||
|
} else {
|
||||||
|
$query .= ' WHERE line3 > ' . $offset;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return $query;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief drop a table
|
* @brief drop a table
|
||||||
* @param string $tableName the table to drop
|
* @param string $tableName the table to drop
|
||||||
|
@ -850,19 +935,119 @@ class PDOStatementWrapper{
|
||||||
* make execute return the result instead of a bool
|
* make execute return the result instead of a bool
|
||||||
*/
|
*/
|
||||||
public function execute($input=array()) {
|
public function execute($input=array()) {
|
||||||
$this->lastArguments=$input;
|
$this->lastArguments = $input;
|
||||||
if(count($input)>0) {
|
if (count($input) > 0) {
|
||||||
|
|
||||||
|
if (!isset($type)) {
|
||||||
|
$type = OC_Config::getValue( "dbtype", "sqlite" );
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($type == 'mssql') {
|
||||||
|
$input = $this->tryFixSubstringLastArgumentDataForMSSQL($input);
|
||||||
|
}
|
||||||
|
|
||||||
$result=$this->statement->execute($input);
|
$result=$this->statement->execute($input);
|
||||||
}else{
|
} else {
|
||||||
$result=$this->statement->execute();
|
$result=$this->statement->execute();
|
||||||
}
|
}
|
||||||
if($result) {
|
|
||||||
|
if ($result) {
|
||||||
return $this;
|
return $this;
|
||||||
}else{
|
} else {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private function tryFixSubstringLastArgumentDataForMSSQL($input) {
|
||||||
|
$query = $this->statement->queryString;
|
||||||
|
$pos = stripos ($query, 'SUBSTRING');
|
||||||
|
|
||||||
|
if ( $pos === false) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
$newQuery = '';
|
||||||
|
|
||||||
|
$cArg = 0;
|
||||||
|
|
||||||
|
$inSubstring = false;
|
||||||
|
|
||||||
|
// Create new query
|
||||||
|
for ($i = 0; $i < strlen ($query); $i++) {
|
||||||
|
if ($inSubstring == false) {
|
||||||
|
// Defines when we should start inserting values
|
||||||
|
if (substr ($query, $i, 9) == 'SUBSTRING') {
|
||||||
|
$inSubstring = true;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// Defines when we should stop inserting values
|
||||||
|
if (substr ($query, $i, 1) == ')') {
|
||||||
|
$inSubstring = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (substr ($query, $i, 1) == '?') {
|
||||||
|
// We found a question mark
|
||||||
|
if ($inSubstring) {
|
||||||
|
$newQuery .= $input[$cArg];
|
||||||
|
|
||||||
|
//
|
||||||
|
// Remove from input array
|
||||||
|
//
|
||||||
|
array_splice ($input, $cArg, 1);
|
||||||
|
} else {
|
||||||
|
$newQuery .= substr ($query, $i, 1);
|
||||||
|
$cArg++;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
$newQuery .= substr ($query, $i, 1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// The global data we need
|
||||||
|
$name = OC_Config::getValue( "dbname", "owncloud" );
|
||||||
|
$host = OC_Config::getValue( "dbhost", "" );
|
||||||
|
$user = OC_Config::getValue( "dbuser", "" );
|
||||||
|
$pass = OC_Config::getValue( "dbpassword", "" );
|
||||||
|
if (strpos($host,':')) {
|
||||||
|
list($host, $port) = explode(':', $host, 2);
|
||||||
|
} else {
|
||||||
|
$port = false;
|
||||||
|
}
|
||||||
|
$opts = array();
|
||||||
|
|
||||||
|
if ($port) {
|
||||||
|
$dsn = 'sqlsrv:Server='.$host.','.$port.';Database='.$name;
|
||||||
|
} else {
|
||||||
|
$dsn = 'sqlsrv:Server='.$host.';Database='.$name;
|
||||||
|
}
|
||||||
|
|
||||||
|
$PDO = new PDO($dsn, $user, $pass, $opts);
|
||||||
|
$PDO->setAttribute(PDO::ATTR_DEFAULT_FETCH_MODE, PDO::FETCH_ASSOC);
|
||||||
|
$PDO->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
|
||||||
|
|
||||||
|
$this->statement = $PDO->prepare($newQuery);
|
||||||
|
|
||||||
|
$this->lastArguments = $input;
|
||||||
|
|
||||||
|
return $input;
|
||||||
|
} catch (PDOException $e){
|
||||||
|
$entry = 'PDO DB Error: "'.$e->getMessage().'"<br />';
|
||||||
|
$entry .= 'Offending command was: '.$this->statement->queryString .'<br />';
|
||||||
|
$entry .= 'Input parameters: ' .print_r($input, true).'<br />';
|
||||||
|
$entry .= 'Stack trace: ' .$e->getTraceAsString().'<br />';
|
||||||
|
OC_Log::write('core', $entry, OC_Log::FATAL);
|
||||||
|
OC_User::setUserId(null);
|
||||||
|
|
||||||
|
// send http status 503
|
||||||
|
header('HTTP/1.1 503 Service Temporarily Unavailable');
|
||||||
|
header('Status: 503 Service Temporarily Unavailable');
|
||||||
|
OC_Template::printErrorPage('Failed to connect to database');
|
||||||
|
die ($entry);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* provide numRows
|
* provide numRows
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -500,8 +500,8 @@ class Cache {
|
||||||
public function getIncomplete() {
|
public function getIncomplete() {
|
||||||
$query = \OC_DB::prepare('SELECT `path` FROM `*PREFIX*filecache`'
|
$query = \OC_DB::prepare('SELECT `path` FROM `*PREFIX*filecache`'
|
||||||
. ' WHERE `storage` = ? AND `size` = -1 ORDER BY `fileid` DESC LIMIT 1');
|
. ' WHERE `storage` = ? AND `size` = -1 ORDER BY `fileid` DESC LIMIT 1');
|
||||||
$query->execute(array($this->numericId));
|
$result = $query->execute(array($this->numericId));
|
||||||
if ($row = $query->fetchRow()) {
|
if ($row = $result->fetchRow()) {
|
||||||
return $row['path'];
|
return $row['path'];
|
||||||
} else {
|
} else {
|
||||||
return false;
|
return false;
|
||||||
|
|
248
lib/setup.php
248
lib/setup.php
|
@ -40,11 +40,13 @@ class OC_Setup {
|
||||||
$error[] = $l->t('Specify a data folder.');
|
$error[] = $l->t('Specify a data folder.');
|
||||||
}
|
}
|
||||||
|
|
||||||
if($dbtype=='mysql' or $dbtype == 'pgsql' or $dbtype == 'oci') { //mysql and postgresql needs more config options
|
if($dbtype == 'mysql' or $dbtype == 'pgsql' or $dbtype == 'oci' or $dbtype == 'mssql') { //mysql and postgresql needs more config options
|
||||||
if($dbtype=='mysql')
|
if($dbtype == 'mysql')
|
||||||
$dbprettyname = 'MySQL';
|
$dbprettyname = 'MySQL';
|
||||||
else if($dbtype=='pgsql')
|
else if($dbtype == 'pgsql')
|
||||||
$dbprettyname = 'PostgreSQL';
|
$dbprettyname = 'PostgreSQL';
|
||||||
|
else if ($dbtype == 'mssql')
|
||||||
|
$dbprettyname = 'MS SQL Server';
|
||||||
else
|
else
|
||||||
$dbprettyname = 'Oracle';
|
$dbprettyname = 'Oracle';
|
||||||
|
|
||||||
|
@ -152,6 +154,29 @@ class OC_Setup {
|
||||||
return $error;
|
return $error;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
elseif ($dbtype == 'mssql') {
|
||||||
|
$dbuser = $options['dbuser'];
|
||||||
|
$dbpass = $options['dbpass'];
|
||||||
|
$dbname = $options['dbname'];
|
||||||
|
$dbhost = $options['dbhost'];
|
||||||
|
$dbtableprefix = isset($options['dbtableprefix']) ? $options['dbtableprefix'] : 'oc_';
|
||||||
|
|
||||||
|
OC_Config::setValue('dbname', $dbname);
|
||||||
|
OC_Config::setValue('dbhost', $dbhost);
|
||||||
|
OC_Config::setValue('dbuser', $dbuser);
|
||||||
|
OC_Config::setValue('dbpassword', $dbpass);
|
||||||
|
OC_Config::setValue('dbtableprefix', $dbtableprefix);
|
||||||
|
|
||||||
|
try {
|
||||||
|
self::setupMSSQLDatabase($dbhost, $dbuser, $dbpass, $dbname, $dbtableprefix);
|
||||||
|
} catch (Exception $e) {
|
||||||
|
$error[] = array(
|
||||||
|
'error' => 'MS SQL username and/or password not valid',
|
||||||
|
'hint' => 'You need to enter either an existing account or the administrator.'
|
||||||
|
);
|
||||||
|
return $error;
|
||||||
|
}
|
||||||
|
}
|
||||||
else {
|
else {
|
||||||
//delete the old sqlite database first, might cause infinte loops otherwise
|
//delete the old sqlite database first, might cause infinte loops otherwise
|
||||||
if(file_exists("$datadir/owncloud.db")) {
|
if(file_exists("$datadir/owncloud.db")) {
|
||||||
|
@ -256,11 +281,12 @@ class OC_Setup {
|
||||||
if(!$result) {
|
if(!$result) {
|
||||||
$entry = $l->t('DB Error: "%s"', array(mysql_error($connection))) . '<br />';
|
$entry = $l->t('DB Error: "%s"', array(mysql_error($connection))) . '<br />';
|
||||||
$entry .= $l->t('Offending command was: "%s"', array($query)) . '<br />';
|
$entry .= $l->t('Offending command was: "%s"', array($query)) . '<br />';
|
||||||
echo($entry);
|
\OC_Log::write('setup.mssql', $entry, \OC_Log::WARN);
|
||||||
}
|
}
|
||||||
$query="GRANT ALL PRIVILEGES ON `$name` . * TO '$user'";
|
$query="GRANT ALL PRIVILEGES ON `$name` . * TO '$user'";
|
||||||
//this query will fail if there aren't the right permissons, ignore the error
|
|
||||||
$result = mysql_query($query, $connection);
|
//this query will fail if there aren't the right permissions, ignore the error
|
||||||
|
mysql_query($query, $connection);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static function createDBUser($name, $password, $connection) {
|
private static function createDBUser($name, $password, $connection) {
|
||||||
|
@ -359,7 +385,7 @@ class OC_Setup {
|
||||||
if(!$result) {
|
if(!$result) {
|
||||||
$entry = $l->t('DB Error: "%s"', array(pg_last_error($connection))) . '<br />';
|
$entry = $l->t('DB Error: "%s"', array(pg_last_error($connection))) . '<br />';
|
||||||
$entry .= $l->t('Offending command was: "%s"', array($query)) . '<br />';
|
$entry .= $l->t('Offending command was: "%s"', array($query)) . '<br />';
|
||||||
echo($entry);
|
\OC_Log::write('setup.pg', $entry, \OC_Log::WARN);
|
||||||
}
|
}
|
||||||
if(! pg_fetch_row($result)) {
|
if(! pg_fetch_row($result)) {
|
||||||
//The database does not exists... let's create it
|
//The database does not exists... let's create it
|
||||||
|
@ -368,11 +394,11 @@ class OC_Setup {
|
||||||
if(!$result) {
|
if(!$result) {
|
||||||
$entry = $l->t('DB Error: "%s"', array(pg_last_error($connection))) . '<br />';
|
$entry = $l->t('DB Error: "%s"', array(pg_last_error($connection))) . '<br />';
|
||||||
$entry .= $l->t('Offending command was: "%s"', array($query)) . '<br />';
|
$entry .= $l->t('Offending command was: "%s"', array($query)) . '<br />';
|
||||||
echo($entry);
|
\OC_Log::write('setup.pg', $entry, \OC_Log::WARN);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
$query = "REVOKE ALL PRIVILEGES ON DATABASE \"$e_name\" FROM PUBLIC";
|
$query = "REVOKE ALL PRIVILEGES ON DATABASE \"$e_name\" FROM PUBLIC";
|
||||||
$result = pg_query($connection, $query);
|
pg_query($connection, $query);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -386,7 +412,7 @@ class OC_Setup {
|
||||||
if(!$result) {
|
if(!$result) {
|
||||||
$entry = $l->t('DB Error: "%s"', array(pg_last_error($connection))) . '<br />';
|
$entry = $l->t('DB Error: "%s"', array(pg_last_error($connection))) . '<br />';
|
||||||
$entry .= $l->t('Offending command was: "%s"', array($query)) . '<br />';
|
$entry .= $l->t('Offending command was: "%s"', array($query)) . '<br />';
|
||||||
echo($entry);
|
\OC_Log::write('setup.pg', $entry, \OC_Log::WARN);
|
||||||
}
|
}
|
||||||
|
|
||||||
if(! pg_fetch_row($result)) {
|
if(! pg_fetch_row($result)) {
|
||||||
|
@ -396,7 +422,7 @@ class OC_Setup {
|
||||||
if(!$result) {
|
if(!$result) {
|
||||||
$entry = $l->t('DB Error: "%s"', array(pg_last_error($connection))) . '<br />';
|
$entry = $l->t('DB Error: "%s"', array(pg_last_error($connection))) . '<br />';
|
||||||
$entry .= $l->t('Offending command was: "%s"', array($query)) . '<br />';
|
$entry .= $l->t('Offending command was: "%s"', array($query)) . '<br />';
|
||||||
echo($entry);
|
\OC_Log::write('setup.pg', $entry, \OC_Log::WARN);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else { // change password of the existing role
|
else { // change password of the existing role
|
||||||
|
@ -405,7 +431,7 @@ class OC_Setup {
|
||||||
if(!$result) {
|
if(!$result) {
|
||||||
$entry = $l->t('DB Error: "%s"', array(pg_last_error($connection))) . '<br />';
|
$entry = $l->t('DB Error: "%s"', array(pg_last_error($connection))) . '<br />';
|
||||||
$entry .= $l->t('Offending command was: "%s"', array($query)) . '<br />';
|
$entry .= $l->t('Offending command was: "%s"', array($query)) . '<br />';
|
||||||
echo($entry);
|
\OC_Log::write('setup.pg', $entry, \OC_Log::WARN);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -434,7 +460,7 @@ class OC_Setup {
|
||||||
if (!$stmt) {
|
if (!$stmt) {
|
||||||
$entry = $l->t('DB Error: "%s"', array(oci_last_error($connection))) . '<br />';
|
$entry = $l->t('DB Error: "%s"', array(oci_last_error($connection))) . '<br />';
|
||||||
$entry .= $l->t('Offending command was: "%s"', array($query)) . '<br />';
|
$entry .= $l->t('Offending command was: "%s"', array($query)) . '<br />';
|
||||||
echo($entry);
|
\OC_Log::write('setup.oci', $entry, \OC_Log::WARN);
|
||||||
}
|
}
|
||||||
$result = oci_execute($stmt);
|
$result = oci_execute($stmt);
|
||||||
if($result) {
|
if($result) {
|
||||||
|
@ -498,9 +524,9 @@ class OC_Setup {
|
||||||
$un = $dbtableprefix.'users';
|
$un = $dbtableprefix.'users';
|
||||||
oci_bind_by_name($stmt, ':un', $un);
|
oci_bind_by_name($stmt, ':un', $un);
|
||||||
if (!$stmt) {
|
if (!$stmt) {
|
||||||
$entry = $l->t('DB Error: "%s"', array(oci_last_error($connection))) . '<br />';
|
$entry = $l->t('DB Error: "%s"', array(oci_error($connection))) . '<br />';
|
||||||
$entry .= $l->t('Offending command was: "%s"', array($query)) . '<br />';
|
$entry .= $l->t('Offending command was: "%s"', array($query)) . '<br />';
|
||||||
echo($entry);
|
\OC_Log::write('setup.oci', $entry, \OC_Log::WARN);
|
||||||
}
|
}
|
||||||
$result = oci_execute($stmt);
|
$result = oci_execute($stmt);
|
||||||
|
|
||||||
|
@ -526,14 +552,14 @@ class OC_Setup {
|
||||||
if (!$stmt) {
|
if (!$stmt) {
|
||||||
$entry = $l->t('DB Error: "%s"', array(oci_error($connection))) . '<br />';
|
$entry = $l->t('DB Error: "%s"', array(oci_error($connection))) . '<br />';
|
||||||
$entry .= $l->t('Offending command was: "%s"', array($query)) . '<br />';
|
$entry .= $l->t('Offending command was: "%s"', array($query)) . '<br />';
|
||||||
echo($entry);
|
\OC_Log::write('setup.oci', $entry, \OC_Log::WARN);
|
||||||
}
|
}
|
||||||
oci_bind_by_name($stmt, ':un', $name);
|
oci_bind_by_name($stmt, ':un', $name);
|
||||||
$result = oci_execute($stmt);
|
$result = oci_execute($stmt);
|
||||||
if(!$result) {
|
if(!$result) {
|
||||||
$entry = $l->t('DB Error: "%s"', array(oci_error($connection))) . '<br />';
|
$entry = $l->t('DB Error: "%s"', array(oci_error($connection))) . '<br />';
|
||||||
$entry .= $l->t('Offending command was: "%s"', array($query)) . '<br />';
|
$entry .= $l->t('Offending command was: "%s"', array($query)) . '<br />';
|
||||||
echo($entry);
|
\OC_Log::write('setup.oci', $entry, \OC_Log::WARN);
|
||||||
}
|
}
|
||||||
|
|
||||||
if(! oci_fetch_row($stmt)) {
|
if(! oci_fetch_row($stmt)) {
|
||||||
|
@ -544,7 +570,7 @@ class OC_Setup {
|
||||||
if (!$stmt) {
|
if (!$stmt) {
|
||||||
$entry = $l->t('DB Error: "%s"', array(oci_error($connection))) . '<br />';
|
$entry = $l->t('DB Error: "%s"', array(oci_error($connection))) . '<br />';
|
||||||
$entry .= $l->t('Offending command was: "%s"', array($query)) . '<br />';
|
$entry .= $l->t('Offending command was: "%s"', array($query)) . '<br />';
|
||||||
echo($entry);
|
\OC_Log::write('setup.oci', $entry, \OC_Log::WARN);
|
||||||
}
|
}
|
||||||
//oci_bind_by_name($stmt, ':un', $name);
|
//oci_bind_by_name($stmt, ':un', $name);
|
||||||
$result = oci_execute($stmt);
|
$result = oci_execute($stmt);
|
||||||
|
@ -552,7 +578,7 @@ class OC_Setup {
|
||||||
$entry = $l->t('DB Error: "%s"', array(oci_error($connection))) . '<br />';
|
$entry = $l->t('DB Error: "%s"', array(oci_error($connection))) . '<br />';
|
||||||
$entry .= $l->t('Offending command was: "%s", name: %s, password: %s',
|
$entry .= $l->t('Offending command was: "%s", name: %s, password: %s',
|
||||||
array($query, $name, $password)) . '<br />';
|
array($query, $name, $password)) . '<br />';
|
||||||
echo($entry);
|
\OC_Log::write('setup.oci', $entry, \OC_Log::WARN);
|
||||||
}
|
}
|
||||||
} else { // change password of the existing role
|
} else { // change password of the existing role
|
||||||
$query = "ALTER USER :un IDENTIFIED BY :pw";
|
$query = "ALTER USER :un IDENTIFIED BY :pw";
|
||||||
|
@ -560,7 +586,7 @@ class OC_Setup {
|
||||||
if (!$stmt) {
|
if (!$stmt) {
|
||||||
$entry = $l->t('DB Error: "%s"', array(oci_error($connection))) . '<br />';
|
$entry = $l->t('DB Error: "%s"', array(oci_error($connection))) . '<br />';
|
||||||
$entry .= $l->t('Offending command was: "%s"', array($query)) . '<br />';
|
$entry .= $l->t('Offending command was: "%s"', array($query)) . '<br />';
|
||||||
echo($entry);
|
\OC_Log::write('setup.oci', $entry, \OC_Log::WARN);
|
||||||
}
|
}
|
||||||
oci_bind_by_name($stmt, ':un', $name);
|
oci_bind_by_name($stmt, ':un', $name);
|
||||||
oci_bind_by_name($stmt, ':pw', $password);
|
oci_bind_by_name($stmt, ':pw', $password);
|
||||||
|
@ -568,26 +594,200 @@ class OC_Setup {
|
||||||
if(!$result) {
|
if(!$result) {
|
||||||
$entry = $l->t('DB Error: "%s"', array(oci_error($connection))) . '<br />';
|
$entry = $l->t('DB Error: "%s"', array(oci_error($connection))) . '<br />';
|
||||||
$entry .= $l->t('Offending command was: "%s"', array($query)) . '<br />';
|
$entry .= $l->t('Offending command was: "%s"', array($query)) . '<br />';
|
||||||
echo($entry);
|
\OC_Log::write('setup.oci', $entry, \OC_Log::WARN);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// grant neccessary roles
|
// grant necessary roles
|
||||||
$query = 'GRANT CREATE SESSION, CREATE TABLE, CREATE SEQUENCE, CREATE TRIGGER, UNLIMITED TABLESPACE TO '.$name;
|
$query = 'GRANT CREATE SESSION, CREATE TABLE, CREATE SEQUENCE, CREATE TRIGGER, UNLIMITED TABLESPACE TO '.$name;
|
||||||
$stmt = oci_parse($connection, $query);
|
$stmt = oci_parse($connection, $query);
|
||||||
if (!$stmt) {
|
if (!$stmt) {
|
||||||
$entry = $l->t('DB Error: "%s"', array(oci_error($connection))) . '<br />';
|
$entry = $l->t('DB Error: "%s"', array(oci_error($connection))) . '<br />';
|
||||||
$entry .= $l->t('Offending command was: "%s"', array($query)) . '<br />';
|
$entry .= $l->t('Offending command was: "%s"', array($query)) . '<br />';
|
||||||
echo($entry);
|
\OC_Log::write('setup.oci', $entry, \OC_Log::WARN);
|
||||||
}
|
}
|
||||||
$result = oci_execute($stmt);
|
$result = oci_execute($stmt);
|
||||||
if(!$result) {
|
if(!$result) {
|
||||||
$entry = $l->t('DB Error: "%s"', array(oci_error($connection))) . '<br />';
|
$entry = $l->t('DB Error: "%s"', array(oci_error($connection))) . '<br />';
|
||||||
$entry .= $l->t('Offending command was: "%s", name: %s, password: %s',
|
$entry .= $l->t('Offending command was: "%s", name: %s, password: %s',
|
||||||
array($query, $name, $password)) . '<br />';
|
array($query, $name, $password)) . '<br />';
|
||||||
echo($entry);
|
\OC_Log::write('setup.oci', $entry, \OC_Log::WARN);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static function setupMSSQLDatabase($dbhost, $dbuser, $dbpass, $dbname, $dbtableprefix) {
|
||||||
|
$l = self::getTrans();
|
||||||
|
|
||||||
|
//check if the database user has admin right
|
||||||
|
$masterConnectionInfo = array( "Database" => "master", "UID" => $dbuser, "PWD" => $dbpass);
|
||||||
|
|
||||||
|
$masterConnection = @sqlsrv_connect($dbhost, $masterConnectionInfo);
|
||||||
|
if(!$masterConnection) {
|
||||||
|
$entry = null;
|
||||||
|
if( ($errors = sqlsrv_errors() ) != null) {
|
||||||
|
$entry='DB Error: "'.print_r(sqlsrv_errors()).'"<br />';
|
||||||
|
} else {
|
||||||
|
$entry = '';
|
||||||
|
}
|
||||||
|
throw new Exception($l->t('MS SQL username and/or password not valid: $s', array($entry)));
|
||||||
|
}
|
||||||
|
|
||||||
|
OC_Config::setValue('dbuser', $dbuser);
|
||||||
|
OC_Config::setValue('dbpassword', $dbpass);
|
||||||
|
|
||||||
|
self::mssql_createDBLogin($dbuser, $dbpass, $masterConnection);
|
||||||
|
|
||||||
|
self::mssql_createDatabase($dbname, $masterConnection);
|
||||||
|
|
||||||
|
self::mssql_createDBUser($dbuser, $dbname, $masterConnection);
|
||||||
|
|
||||||
|
sqlsrv_close($masterConnection);
|
||||||
|
|
||||||
|
self::mssql_createDatabaseStructure($dbhost, $dbname, $dbuser, $dbpass, $dbtableprefix);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static function mssql_createDBLogin($name, $password, $connection) {
|
||||||
|
$query = "SELECT * FROM master.sys.server_principals WHERE name = '".$name."';";
|
||||||
|
$result = sqlsrv_query($connection, $query);
|
||||||
|
if ($result === false) {
|
||||||
|
if ( ($errors = sqlsrv_errors() ) != null) {
|
||||||
|
$entry='DB Error: "'.print_r(sqlsrv_errors()).'"<br />';
|
||||||
|
} else {
|
||||||
|
$entry = '';
|
||||||
|
}
|
||||||
|
$entry.='Offending command was: '.$query.'<br />';
|
||||||
|
\OC_Log::write('setup.mssql', $entry, \OC_Log::WARN);
|
||||||
|
} else {
|
||||||
|
$row = sqlsrv_fetch_array($result);
|
||||||
|
|
||||||
|
if ($row === false) {
|
||||||
|
if ( ($errors = sqlsrv_errors() ) != null) {
|
||||||
|
$entry='DB Error: "'.print_r(sqlsrv_errors()).'"<br />';
|
||||||
|
} else {
|
||||||
|
$entry = '';
|
||||||
|
}
|
||||||
|
$entry.='Offending command was: '.$query.'<br />';
|
||||||
|
\OC_Log::write('setup.mssql', $entry, \OC_Log::WARN);
|
||||||
|
} else {
|
||||||
|
if ($row == null) {
|
||||||
|
$query = "CREATE LOGIN [".$name."] WITH PASSWORD = '".$password."';";
|
||||||
|
$result = sqlsrv_query($connection, $query);
|
||||||
|
if (!$result or $result === false) {
|
||||||
|
if ( ($errors = sqlsrv_errors() ) != null) {
|
||||||
|
$entry='DB Error: "'.print_r(sqlsrv_errors()).'"<br />';
|
||||||
|
} else {
|
||||||
|
$entry = '';
|
||||||
|
}
|
||||||
|
$entry.='Offending command was: '.$query.'<br />';
|
||||||
|
\OC_Log::write('setup.mssql', $entry, \OC_Log::WARN);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static function mssql_createDBUser($name, $dbname, $connection) {
|
||||||
|
$query = "SELECT * FROM [".$dbname."].sys.database_principals WHERE name = '".$name."';";
|
||||||
|
$result = sqlsrv_query($connection, $query);
|
||||||
|
if ($result === false) {
|
||||||
|
if ( ($errors = sqlsrv_errors() ) != null) {
|
||||||
|
$entry='DB Error: "'.print_r(sqlsrv_errors()).'"<br />';
|
||||||
|
} else {
|
||||||
|
$entry = '';
|
||||||
|
}
|
||||||
|
$entry.='Offending command was: '.$query.'<br />';
|
||||||
|
\OC_Log::write('setup.mssql', $entry, \OC_Log::WARN);
|
||||||
|
} else {
|
||||||
|
$row = sqlsrv_fetch_array($result);
|
||||||
|
|
||||||
|
if ($row === false) {
|
||||||
|
if ( ($errors = sqlsrv_errors() ) != null) {
|
||||||
|
$entry='DB Error: "'.print_r(sqlsrv_errors()).'"<br />';
|
||||||
|
} else {
|
||||||
|
$entry = '';
|
||||||
|
}
|
||||||
|
$entry.='Offending command was: '.$query.'<br />';
|
||||||
|
\OC_Log::write('setup.mssql', $entry, \OC_Log::WARN);
|
||||||
|
} else {
|
||||||
|
if ($row == null) {
|
||||||
|
$query = "USE [".$dbname."]; CREATE USER [".$name."] FOR LOGIN [".$name."];";
|
||||||
|
$result = sqlsrv_query($connection, $query);
|
||||||
|
if (!$result || $result === false) {
|
||||||
|
if ( ($errors = sqlsrv_errors() ) != null) {
|
||||||
|
$entry = 'DB Error: "'.print_r(sqlsrv_errors()).'"<br />';
|
||||||
|
} else {
|
||||||
|
$entry = '';
|
||||||
|
}
|
||||||
|
$entry.='Offending command was: '.$query.'<br />';
|
||||||
|
\OC_Log::write('setup.mssql', $entry, \OC_Log::WARN);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$query = "USE [".$dbname."]; EXEC sp_addrolemember 'db_owner', '".$name."';";
|
||||||
|
$result = sqlsrv_query($connection, $query);
|
||||||
|
if (!$result || $result === false) {
|
||||||
|
if ( ($errors = sqlsrv_errors() ) != null) {
|
||||||
|
$entry='DB Error: "'.print_r(sqlsrv_errors()).'"<br />';
|
||||||
|
} else {
|
||||||
|
$entry = '';
|
||||||
|
}
|
||||||
|
$entry.='Offending command was: '.$query.'<br />';
|
||||||
|
\OC_Log::write('setup.mssql', $entry, \OC_Log::WARN);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static function mssql_createDatabase($dbname, $connection) {
|
||||||
|
$query = "CREATE DATABASE [".$dbname."];";
|
||||||
|
$result = sqlsrv_query($connection, $query);
|
||||||
|
if (!$result || $result === false) {
|
||||||
|
if ( ($errors = sqlsrv_errors() ) != null) {
|
||||||
|
$entry='DB Error: "'.print_r(sqlsrv_errors()).'"<br />';
|
||||||
|
} else {
|
||||||
|
$entry = '';
|
||||||
|
}
|
||||||
|
$entry.='Offending command was: '.$query.'<br />';
|
||||||
|
\OC_Log::write('setup.mssql', $entry, \OC_Log::WARN);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static function mssql_createDatabaseStructure($dbhost, $dbname, $dbuser, $dbpass, $dbtableprefix) {
|
||||||
|
$connectionInfo = array( "Database" => $dbname, "UID" => $dbuser, "PWD" => $dbpass);
|
||||||
|
|
||||||
|
$connection = @sqlsrv_connect($dbhost, $connectionInfo);
|
||||||
|
|
||||||
|
//fill the database if needed
|
||||||
|
$query = "SELECT * FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA = '{$dbname}' AND TABLE_NAME = '{$dbtableprefix}users'";
|
||||||
|
$result = sqlsrv_query($connection, $query);
|
||||||
|
if ($result === false) {
|
||||||
|
if ( ($errors = sqlsrv_errors() ) != null) {
|
||||||
|
$entry='DB Error: "'.print_r(sqlsrv_errors()).'"<br />';
|
||||||
|
} else {
|
||||||
|
$entry = '';
|
||||||
|
}
|
||||||
|
$entry.='Offending command was: '.$query.'<br />';
|
||||||
|
\OC_Log::write('setup.mssql', $entry, \OC_Log::WARN);
|
||||||
|
} else {
|
||||||
|
$row = sqlsrv_fetch_array($result);
|
||||||
|
|
||||||
|
if ($row === false) {
|
||||||
|
if ( ($errors = sqlsrv_errors() ) != null) {
|
||||||
|
$entry='DB Error: "'.print_r(sqlsrv_errors()).'"<br />';
|
||||||
|
} else {
|
||||||
|
$entry = '';
|
||||||
|
}
|
||||||
|
$entry.='Offending command was: '.$query.'<br />';
|
||||||
|
\OC_Log::write('setup.mssql', $entry, \OC_Log::WARN);
|
||||||
|
} else {
|
||||||
|
if ($row == null) {
|
||||||
|
OC_DB::createDbFromStructure('db_structure.xml');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
sqlsrv_close($connection);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* create .htaccess files for apache hosts
|
* create .htaccess files for apache hosts
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -91,9 +91,15 @@ class Test_DBSchema extends PHPUnit_Framework_TestCase {
|
||||||
break;
|
break;
|
||||||
case 'pgsql':
|
case 'pgsql':
|
||||||
$sql = "SELECT tablename AS table_name, schemaname AS schema_name "
|
$sql = "SELECT tablename AS table_name, schemaname AS schema_name "
|
||||||
. "FROM pg_tables WHERE schemaname NOT LIKE 'pg_%' "
|
. "FROM pg_tables WHERE schemaname NOT LIKE 'pg_%' "
|
||||||
. "AND schemaname != 'information_schema' "
|
. "AND schemaname != 'information_schema' "
|
||||||
. "AND tablename = '".$table."'";
|
. "AND tablename = '".$table."'";
|
||||||
|
$query = OC_DB::prepare($sql);
|
||||||
|
$result = $query->execute(array());
|
||||||
|
$exists = $result && $result->fetchOne();
|
||||||
|
break;
|
||||||
|
case 'mssql':
|
||||||
|
$sql = "SELECT * FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = '{$table}'";
|
||||||
$query = OC_DB::prepare($sql);
|
$query = OC_DB::prepare($sql);
|
||||||
$result = $query->execute(array());
|
$result = $query->execute(array());
|
||||||
$exists = $result && $result->fetchOne();
|
$exists = $result && $result->fetchOne();
|
||||||
|
|
Loading…
Reference in New Issue