Skip to content
Snippets Groups Projects
Commit 2f5c94fb authored by Laurent Destailleur's avatar Laurent Destailleur
Browse files

Merge pull request #2357 from KreizIT/fix_mssql 

Fix mssql
parents a05e39f1 7d51ae67
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
htdocs/core/db/mssql.class.php
+ 224
− 77
View file @ 2f5c94fb
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
* Copyright (C) 2004-2008 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2008 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2007 Regis Houssin <regis.houssin@capnetworks.com> * Copyright (C) 2005-2007 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2007 Simon Desee <simon@dedisoft.com> * Copyright (C) 2007 Simon Desee <simon@dedisoft.com>
* Copyright (C) 2015 Cedric GROSS <c.gross@kreiz-it.fr>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
...@@ -146,7 +147,7 @@ class DoliDBMssql extends DoliDB ...@@ -146,7 +147,7 @@ class DoliDBMssql extends DoliDB
*/ */
function select_db($database) function select_db($database)
{ {
return mssql_select_db($database, $this->db); return @mssql_select_db($database, $this->db);
} }
/** /**
...@@ -171,6 +172,15 @@ class DoliDBMssql extends DoliDB ...@@ -171,6 +172,15 @@ class DoliDBMssql extends DoliDB
// les nouvelles version de Dolibarr car force par l'install Dolibarr. // les nouvelles version de Dolibarr car force par l'install Dolibarr.
//$this->query('SET NAMES '.$this->forcecharset); //$this->query('SET NAMES '.$this->forcecharset);
//print "Resultat fonction connect: ".$this->db; //print "Resultat fonction connect: ".$this->db;
$set_options=array('SET ANSI_PADDING ON;',
"SET ANSI_NULLS ON;",
"SET ANSI_WARNINGS ON;",
"SET ARITHABORT ON;",
"SET CONCAT_NULL_YIELDS_NULL ON;",
"SET QUOTED_IDENTIFIER ON;"
);
mssql_query(implode(' ',$set_options),$this->db);
return $this->db; return $this->db;
} }
...@@ -224,19 +234,22 @@ class DoliDBMssql extends DoliDB ...@@ -224,19 +234,22 @@ class DoliDBMssql extends DoliDB
*/ */
function begin() function begin()
{ {
if (! $this->transaction_opened)
$res=mssql_query('select @@TRANCOUNT');
$this->transaction_opened=mssql_result($res, 0, 0);
if ($this->transaction_opened == 0)
{ {
$ret=$this->query("BEGIN TRANSACTION"); //return 1; //There is a mess with auto_commit and 'SET IMPLICIT_TRANSACTIONS ON' generate also a mess
$ret=mssql_query("SET IMPLICIT_TRANSACTIONS OFF;BEGIN TRANSACTION;",$this->db);
if ($ret) if ($ret)
{ {
$this->transaction_opened++;
dol_syslog("BEGIN Transaction",LOG_DEBUG); dol_syslog("BEGIN Transaction",LOG_DEBUG);
} }
return $ret; return $ret;
} }
else else
{ {
$this->transaction_opened++;
return 1; return 1;
} }
} }
...@@ -249,12 +262,15 @@ class DoliDBMssql extends DoliDB ...@@ -249,12 +262,15 @@ class DoliDBMssql extends DoliDB
*/ */
function commit($log='') function commit($log='')
{ {
if ($this->transaction_opened <= 1) $res=mssql_query('select @@TRANCOUNT');
$this->transaction_opened=mssql_result($res, 0, 0);
if ($this->transaction_opened == 1)
{ {
$ret=$this->query("COMMIT TRANSACTION"); //return 1; //There is a mess with auto_commit and 'SET IMPLICIT_TRANSACTION ON' generate also a mess
$ret=mssql_query("COMMIT TRANSACTION",$this->db);
if ($ret) if ($ret)
{ {
$this->transaction_opened=0;
dol_syslog("COMMIT Transaction",LOG_DEBUG); dol_syslog("COMMIT Transaction",LOG_DEBUG);
return 1; return 1;
} }
...@@ -263,11 +279,11 @@ class DoliDBMssql extends DoliDB ...@@ -263,11 +279,11 @@ class DoliDBMssql extends DoliDB
return 0; return 0;
} }
} }
else elseif ($this->transaction_opened > 1)
{ {
$this->transaction_opened--;
return 1; return 1;
} } else
trigger_error("Commit requested but no transaction remain");
} }
/** /**
...@@ -278,18 +294,20 @@ class DoliDBMssql extends DoliDB ...@@ -278,18 +294,20 @@ class DoliDBMssql extends DoliDB
*/ */
function rollback($log='') function rollback($log='')
{ {
if ($this->transaction_opened<=1) $res=mssql_query('select @@TRANCOUNT');
$this->transaction_opened=mssql_result($res, 0, 0);
if ($this->transaction_opened == 1)
{ {
$ret=$this->query("ROLLBACK TRANSACTION"); $ret=mssql_query("ROLLBACK TRANSACTION",$this->db);
$this->transaction_opened=0;
dol_syslog("ROLLBACK Transaction".($log?' '.$log:''),LOG_DEBUG); dol_syslog("ROLLBACK Transaction".($log?' '.$log:''),LOG_DEBUG);
return $ret; return $ret;
} }
else elseif ($this->transaction_opened > 1)
{ {
$this->transaction_opened--;
return 1; return 1;
} } else
trigger_error("Rollback requested but no transaction remain");
} }
/** /**
...@@ -304,54 +322,98 @@ class DoliDBMssql extends DoliDB ...@@ -304,54 +322,98 @@ class DoliDBMssql extends DoliDB
function query($query,$usesavepoint=0,$type='auto') function query($query,$usesavepoint=0,$type='auto')
{ {
$query = trim($query); $query = trim($query);
if (preg_match('/^--/',$query)) return true;
// Conversion syntaxe MySql vers MSDE. // Conversion syntaxe MySql vers MSDE.
$query = str_ireplace("now()", "getdate()", $query); $query = str_ireplace("now()", "getdate()", $query);
// Erreur SQL: cannot update timestamp field // Erreur SQL: cannot update timestamp field
$query = str_ireplace(", tms = tms", "", $query); $query = str_ireplace(", tms = tms", "", $query);
// Voir si l'on peut directement utiliser $query = str_ireplace("file", "[file]", $query);
// au lieu des 3 lignes ci-dessous
$query = str_ireplace(".file", ".[file]", $query);
$query = str_ireplace(" file ", " [file] ", $query);
$query = str_ireplace(" file,", " [file],", $query);
// Idem file
$query = str_ireplace(".percent", ".[percent]", $query);
$query = str_ireplace(" percent ", " [percent] ", $query);
$query = str_ireplace("percent,", "[percent],", $query);
$query = str_ireplace("percent=", "[percent]=", $query);
$query = str_ireplace("\'", "''", $query);
$itemfound = stripos($query, " limit ");
if ($itemfound !== false) {
// Extraire le nombre limite
$number = stristr($query, " limit ");
$number = substr($number, 7);
// Inserer l'instruction TOP et le nombre limite
$query = str_ireplace("select ", "select top ".$number." ", $query);
// Supprimer l'instruction MySql
$query = str_ireplace(" limit ".$number, "", $query);
}
$itemfound = stripos($query, " week("); $query=preg_replace("/([. ,\t(])(percent|file|public)([. ,=\t)])/","$1[$2]$3",$query);
if ($itemfound !== false) {
// Recreer une requete sans instruction Mysql if ($type=="auto" || $type='dml')
$positionMySql = stripos($query, " week("); {
$newquery = substr($query, 0, $positionMySql); $query=preg_replace('/AUTO_INCREMENT/i','IDENTITY',$query);
$query=preg_replace('/double/i','float',$query);
// Recuperer la date passee en parametre $query=preg_replace('/float\((.*)\)/','numeric($1)',$query);
$extractvalue = stristr($query, " week("); $query=preg_replace('/([ \t])unsigned|IF NOT EXISTS[ \t]/i','$1',$query);
$extractvalue = substr($extractvalue, 6); $query=preg_replace('/([ \t])(MEDIUM|TINY|LONG){0,1}TEXT([ \t,])/i',"$1VARCHAR(MAX)$3",$query);
$positionMySql = stripos($extractvalue, ")");
// Conserver la fin de la requete $matches=array();
$endofquery = substr($extractvalue, $positionMySql); $original_query='';
$extractvalue = substr($extractvalue, 0, $positionMySql); if (preg_match('/ALTER TABLE\h+(\w+?)\h+ADD\h+(?:(UNIQUE)|INDEX)\h+(?:INDEX)?\h*(\w+?)\h*\((.+)\)/is', $query,$matches))
{
// Remplacer l'instruction MySql en Sql Server $original_query=$query;
// Inserer la date en parametre et le reste de la requete $query="CREATE ".trim($matches[2])." INDEX [".trim($matches[3])."] ON [".trim($matches[1])."] (".trim($matches[4]).")";
$query = $newquery." DATEPART(week, ".$extractvalue.$endofquery; if ($matches[2]) {
//check if columun is nullable cause Sql server only allow 1 null value if unique index.
$fields=explode(",",trim($matches[4]));
$fields_clear=array_map('trim',$fields);
$infos=$this->GetFieldInformation(trim($matches[1]), $fields_clear);
$query_comp=array();
foreach($infos as $fld) {
if ($fld->IS_NULLABLE == 'YES') {
$query_comp[]=$fld->COLUMN_NAME." IS NOT NULL";
}
}
if ($query_comp)
$query.=" WHERE ".implode(" AND ",$query_comp);
}
}
else
{
if (preg_match('/ALTER TABLE\h+(\w+?)\h+ADD\h+PRIMARY\h+KEY\h+(\w+?)\h*\((.+)\)/is', $query, $matches))
{
$original_query=$query;
$query="ALTER TABLE [".$matches[1]."] ADD CONSTRAINT [".$matches[2]."] PRIMARY KEY CLUSTERED (".$matches[3].")";
}
}
} }
if ($type=="auto" || $type='ddl')
{
$itemfound = stripos($query, " limit ");
if ($itemfound !== false) {
// Extraire le nombre limite
$number = stristr($query, " limit ");
$number = substr($number, 7);
// Inserer l'instruction TOP et le nombre limite
$query = str_ireplace("select ", "select top ".$number." ", $query);
// Supprimer l'instruction MySql
$query = str_ireplace(" limit ".$number, "", $query);
}
$itemfound = stripos($query, " week(");
if ($itemfound !== false) {
// Recreer une requete sans instruction Mysql
$positionMySql = stripos($query, " week(");
$newquery = substr($query, 0, $positionMySql);
// Recuperer la date passee en parametre
$extractvalue = stristr($query, " week(");
$extractvalue = substr($extractvalue, 6);
$positionMySql = stripos($extractvalue, ")");
// Conserver la fin de la requete
$endofquery = substr($extractvalue, $positionMySql);
$extractvalue = substr($extractvalue, 0, $positionMySql);
// Remplacer l'instruction MySql en Sql Server
// Inserer la date en parametre et le reste de la requete
$query = $newquery." DATEPART(week, ".$extractvalue.$endofquery;
}
if (preg_match('/^insert\h+(?:INTO)?\h*(\w+?)\h*\(.*\b(?:row)?id\b.*\)\h+VALUES/i',$query,$matches))
{
//var_dump($query);
//var_dump($matches);
if (stripos($query,'llx_c_departements') !== false) var_dump($query);
$sql='SET IDENTITY_INSERT ['.trim($matches[1]).'] ON;';
@mssql_query($sql, $this->db);
$post_query='SET IDENTITY_INSERT ['.trim($matches[1]).'] OFF;';
}
}
//print "<!--".$query."-->"; //print "<!--".$query."-->";
if (! in_array($query,array('BEGIN','COMMIT','ROLLBACK'))) dol_syslog('sql='.$query, LOG_DEBUG); if (! in_array($query,array('BEGIN','COMMIT','ROLLBACK'))) dol_syslog('sql='.$query, LOG_DEBUG);
...@@ -365,6 +427,11 @@ class DoliDBMssql extends DoliDB ...@@ -365,6 +427,11 @@ class DoliDBMssql extends DoliDB
{ {
$ret = mssql_query($query, $this->db); $ret = mssql_query($query, $this->db);
} }
if (!empty($post_query))
{
@mssql_query($post_query, $this->db);
}
if (! preg_match("/^COMMIT/i",$query) && ! preg_match("/^ROLLBACK/i",$query)) if (! preg_match("/^COMMIT/i",$query) && ! preg_match("/^ROLLBACK/i",$query))
{ {
...@@ -379,6 +446,7 @@ class DoliDBMssql extends DoliDB ...@@ -379,6 +446,7 @@ class DoliDBMssql extends DoliDB
$this->lasterrno = $row["code"]; $this->lasterrno = $row["code"];
dol_syslog(get_class($this)."::query SQL Error query: ".$query, LOG_ERR); dol_syslog(get_class($this)."::query SQL Error query: ".$query, LOG_ERR);
if ($original_query) dol_syslog(get_class($this)."::query SQL Original query: ".$original_query, LOG_ERR);
dol_syslog(get_class($this)."::query SQL Error message: ".$this->lasterror." (".$this->lasterrno.")", LOG_ERR); dol_syslog(get_class($this)."::query SQL Error message: ".$this->lasterror." (".$this->lasterrno.")", LOG_ERR);
} }
$this->lastquery=$query; $this->lastquery=$query;
...@@ -539,7 +607,8 @@ class DoliDBMssql extends DoliDB ...@@ -539,7 +607,8 @@ class DoliDBMssql extends DoliDB
1146 => 'DB_ERROR_NOSUCHTABLE', 1146 => 'DB_ERROR_NOSUCHTABLE',
1216 => 'DB_ERROR_NO_PARENT', 1216 => 'DB_ERROR_NO_PARENT',
1217 => 'DB_ERROR_CHILD_EXISTS', 1217 => 'DB_ERROR_CHILD_EXISTS',
1451 => 'DB_ERROR_CHILD_EXISTS' 1451 => 'DB_ERROR_CHILD_EXISTS',
1913 => 'DB_ERROR_KEY_NAME_ALREADY_EXISTS'
); );
if (isset($errorcode_map[$this->lasterrno])) if (isset($errorcode_map[$this->lasterrno]))
...@@ -563,7 +632,7 @@ class DoliDBMssql extends DoliDB ...@@ -563,7 +632,7 @@ class DoliDBMssql extends DoliDB
return 'Not connected. Check setup parameters in conf/conf.php file and your mssql client and server versions'; return 'Not connected. Check setup parameters in conf/conf.php file and your mssql client and server versions';
} }
else { else {
return mssql_get_last_message($this->db); return mssql_get_last_message();
} }
} }
...@@ -655,21 +724,27 @@ class DoliDBMssql extends DoliDB ...@@ -655,21 +724,27 @@ class DoliDBMssql extends DoliDB
*/ */
function DDLCreateDb($database,$charset='',$collation='',$owner='') function DDLCreateDb($database,$charset='',$collation='',$owner='')
{ {
if (empty($charset)) $charset=$this->forcecharset; /*if (empty($charset)) $charset=$this->forcecharset;
if (empty($collation)) $collation=$this->forcecollate; if (empty($collation)) $collation=$this->forcecollate;
*/
// ALTER DATABASE dolibarr_db DEFAULT CHARACTER SET latin DEFAULT COLLATE latin1_swedish_ci $sql = 'CREATE DATABASE '.$this->EscapeFieldName($database);
$sql = 'CREATE DATABASE '.$database; //TODO: Check if we need to force a charset
$sql.= ' DEFAULT CHARACTER SET '.$charset.' DEFAULT COLLATE '.$collation; //$sql.= ' DEFAULT CHARACTER SET '.$charset.' DEFAULT COLLATE '.$collation;
$ret=$this->query($sql); $ret=$this->query($sql);
if (! $ret)
{ $this->select_db($database);
// On reessaie pour compatibilite avec mssql < 5.0 $sql="CREATE USER [$owner] FOR LOGIN [$owner]";
$sql = 'CREATE DATABASE '.$database; mssql_query($sql,$this->db);
$ret=$this->query($sql); $sql="ALTER ROLE [db_owner] ADD MEMBER [$owner]";
} mssql_query($sql,$this->db);
return $ret; $sql="ALTER DATABASE [$database] SET ANSI_NULL_DEFAULT ON;";
@mssql_query($sql,$this->db);
$sql="ALTER DATABASE [$database] SET ANSI_NULL ON;";
@mssql_query($sql,$this->db);
return $ret;
} }
/** /**
...@@ -884,12 +959,40 @@ class DoliDBMssql extends DoliDB ...@@ -884,12 +959,40 @@ class DoliDBMssql extends DoliDB
*/ */
function DDLCreateUser($dolibarr_main_db_host,$dolibarr_main_db_user,$dolibarr_main_db_pass,$dolibarr_main_db_name) function DDLCreateUser($dolibarr_main_db_host,$dolibarr_main_db_user,$dolibarr_main_db_pass,$dolibarr_main_db_name)
{ {
// FIXME: Dummy method $sql = "CREATE LOGIN ".$this->EscapeFieldName($dolibarr_main_db_user)." WITH PASSWORD='$dolibarr_main_db_pass'";
// TODO: Implement dol_syslog(get_class($this)."::DDLCreateUser", LOG_DEBUG); // No sql to avoid password in log
// May help: http://msdn.microsoft.com/fr-fr/library/ms173463.aspx $resql=$this->query($sql);
if (! $resql)
// Always fail for now {
return -1; if ($this->lasterrno != '15025')
{
return -1;
}
else
{
// If user already exists, we continue to set permissions
dol_syslog(get_class($this)."::DDLCreateUser sql=".$sql, LOG_WARNING);
}
}
$sql="SELECT name from sys.databases where name='".$dolibarr_main_db_name."'";
$ressql=$this->query($sql);
if (! $ressql)
{
dol_syslog(get_class($this)."::DDLCreateUser sql=".$sql, LOG_WARNING);
return -1;
}
else
{
if ($num)
{
$this->select_db($dolibarr_main_db_name);
$sql="CREATE USER [$dolibarr_main_db_user] FOR LOGIN [$dolibarr_main_db_user]";
$this->query($sql);
$sql="ALTER ROLE [db_owner] ADD MEMBER [$dolibarr_main_db_user]";
$this->query($sql);
}
}
return 1;
} }
/** /**
...@@ -1003,5 +1106,49 @@ class DoliDBMssql extends DoliDB ...@@ -1003,5 +1106,49 @@ class DoliDBMssql extends DoliDB
return array(); return array();
} }
/**
* Escape a field name according to escape's syntax
*
* @param string $fieldname Field's name to escape
* @return string field's name escaped
*/
function EscapeFieldName($fieldname) {
return "[".$fieldname."]";
}
/**
* Get information on field
*
* @param string $table Table name which contains fields
* @param mixed $fields String for one field or array of string for multiple field
* @return boolean|multitype:object
*/
function GetFieldInformation($table,$fields) {
$sql="SELECT * from INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME='".$this->escape($table)."' AND COLUMN_NAME";
if (is_array($fields))
{
$where=" IN ('".implode("','",$fields)."')";
}
else
{
$where="='".$this->escape($fields)."'";
}
$result=array();
$ret=mssql_query($sql.$where,$this->db);
if ($ret)
{
while($obj=mssql_fetch_object($ret))
{
$result[]=$obj;
}
}
else
return false;
return $result;
}
} }
htdocs/install/etape1.php
+ 2
− 2
View file @ 2f5c94fb
...@@ -175,7 +175,7 @@ if (! $error) ...@@ -175,7 +175,7 @@ if (! $error)
} }
else else
{ {
$databasefortest='mssql'; $databasefortest='master';
} }
} }
//print $_POST["db_type"].",".$_POST["db_host"].",$userroot,$passroot,$databasefortest,".$_POST["db_port"]; //print $_POST["db_type"].",".$_POST["db_host"].",$userroot,$passroot,$databasefortest,".$_POST["db_port"];
...@@ -486,7 +486,7 @@ if (! $error && $db->connected && $action == "set") ...@@ -486,7 +486,7 @@ if (! $error && $db->connected && $action == "set")
} }
else if ($conf->db->type == 'mssql') else if ($conf->db->type == 'mssql')
{ {
$databasefortest='mssql'; $databasefortest='master';
} }
// Creation handler de base, verification du support et connexion // Creation handler de base, verification du support et connexion
......
htdocs/install/etape2.php
+ 7
− 1
View file @ 2f5c94fb
<?php <?php
/* Copyright (C) 2004 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2010 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2010 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2015 Cedric GROSS <c.gross@kreiz-it.fr>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
...@@ -192,6 +193,11 @@ if ($action == "set") ...@@ -192,6 +193,11 @@ if ($action == "set")
{ {
$buffer=preg_replace('/type=innodb/i','ENGINE=innodb',$buffer); $buffer=preg_replace('/type=innodb/i','ENGINE=innodb',$buffer);
} }
else if ($conf->db->type == 'mssql')
{
$buffer=preg_replace('/type=innodb/i','',$buffer);
$buffer=preg_replace('/ENGINE=innodb/i','',$buffer);
}
// Replace the prefix tables // Replace the prefix tables
if ($dolibarr_main_db_prefix != 'llx_') if ($dolibarr_main_db_prefix != 'llx_')
...@@ -219,7 +225,7 @@ if ($action == "set") ...@@ -219,7 +225,7 @@ if ($action == "set")
else else
{ {
print "<tr><td>".$langs->trans("CreateTableAndPrimaryKey",$name); print "<tr><td>".$langs->trans("CreateTableAndPrimaryKey",$name);
print "<br>\n".$langs->trans("Request").' '.$requestnb.' : '.$buffer; print "<br>\n".$langs->trans("Request").' '.$requestnb.' : '.$buffer.' <br>Executed query : '.$db->lastquery;
print "\n</td>"; print "\n</td>";
print '<td><font class="error">'.$langs->trans("ErrorSQL")." ".$db->errno()." ".$db->error().'</font></td></tr>'; print '<td><font class="error">'.$langs->trans("ErrorSQL")." ".$db->errno()." ".$db->error().'</font></td></tr>';
$error++; $error++;
......
htdocs/install/mssql/functions/functions.sql deleted 100644 → 0
NaN GiB (NaN%)
View file @ a05e39f1
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment