Merge pull request #2819 from GPCsolutions/typehinting
[Qual] Typehinting
This commit is contained in:
Laurent Destailleur
commit
b99d2a8276
@ -4,7 +4,7 @@
|
|||||||
* Copyright (C) 2004-2011 Laurent Destailleur <eldy@users.sourceforge.net>
|
* Copyright (C) 2004-2011 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||||
* Copyright (C) 2006 Andre Cianfarani <acianfa@free.fr>
|
* Copyright (C) 2006 Andre Cianfarani <acianfa@free.fr>
|
||||||
* Copyright (C) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com>
|
* Copyright (C) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com>
|
||||||
* Copyright (C) 2014 Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr>
|
* Copyright (C) 2014-2015 Raphaël Doursenaud <rdoursenaud@gpcsolutions.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
|
||||||
@ -21,7 +21,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Class to manage Dolibarr database access for a Mysql database
|
* Class to manage Dolibarr database access for an SQL database
|
||||||
*/
|
*/
|
||||||
interface Database
|
interface Database
|
||||||
{
|
{
|
||||||
@ -111,13 +111,6 @@ interface Database
|
|||||||
*/
|
*/
|
||||||
function error();
|
function error();
|
||||||
|
|
||||||
/**
|
|
||||||
* Return label of manager
|
|
||||||
*
|
|
||||||
* @return string Label
|
|
||||||
*/
|
|
||||||
function getLabel();
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* List tables into a database
|
* List tables into a database
|
||||||
*
|
*
|
||||||
@ -141,7 +134,7 @@ interface Database
|
|||||||
* @param string $sortorder Sort order
|
* @param string $sortorder Sort order
|
||||||
* @return string String to provide syntax of a sort sql string
|
* @return string String to provide syntax of a sort sql string
|
||||||
*/
|
*/
|
||||||
function order($sortfield = 0, $sortorder = 0);
|
function order($sortfield = null, $sortorder = null);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Decrypt sensitive data in database
|
* Decrypt sensitive data in database
|
||||||
@ -216,7 +209,7 @@ interface Database
|
|||||||
* @param string $login login
|
* @param string $login login
|
||||||
* @param string $passwd password
|
* @param string $passwd password
|
||||||
* @param string $name name of database (not used for mysql, used for pgsql)
|
* @param string $name name of database (not used for mysql, used for pgsql)
|
||||||
* @param string $port Port of database server
|
* @param int $port Port of database server
|
||||||
* @return resource Database access handler
|
* @return resource Database access handler
|
||||||
* @see close
|
* @see close
|
||||||
*/
|
*/
|
||||||
@ -293,10 +286,10 @@ interface Database
|
|||||||
* @param string $type Type de la table
|
* @param string $type Type de la table
|
||||||
* @param array $unique_keys Tableau associatifs Nom de champs qui seront clef unique => valeur
|
* @param array $unique_keys Tableau associatifs Nom de champs qui seront clef unique => valeur
|
||||||
* @param array $fulltext_keys Tableau des Nom de champs qui seront indexes en fulltext
|
* @param array $fulltext_keys Tableau des Nom de champs qui seront indexes en fulltext
|
||||||
* @param string $keys Tableau des champs cles noms => valeur
|
* @param array $keys Tableau des champs cles noms => valeur
|
||||||
* @return int <0 if KO, >=0 if OK
|
* @return int <0 if KO, >=0 if OK
|
||||||
*/
|
*/
|
||||||
function DDLCreateTable($table, $fields, $primary_key, $type, $unique_keys = "", $fulltext_keys = "", $keys = "");
|
function DDLCreateTable($table, $fields, $primary_key, $type, $unique_keys = null, $fulltext_keys = null, $keys = null);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Return list of available charset that can be used to store data in database
|
* Return list of available charset that can be used to store data in database
|
||||||
@ -382,15 +375,15 @@ interface Database
|
|||||||
);
|
);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Convert (by PHP) a PHP server TZ string date into a Timestamps date (GMT if gm=true)
|
* Convert (by PHP) a PHP server TZ string date into a Timestamps date (GMT if gm=true)
|
||||||
* 19700101020000 -> 3600 with TZ+1 and gmt=0
|
* 19700101020000 -> 3600 with TZ+1 and gmt=0
|
||||||
* 19700101020000 -> 7200 whaterver is TZ if gmt=1
|
* 19700101020000 -> 7200 whaterver is TZ if gmt=1
|
||||||
*
|
*
|
||||||
* @param string $string Date in a string (YYYYMMDDHHMMSS, YYYYMMDD, YYYY-MM-DD HH:MM:SS)
|
* @param string $string Date in a string (YYYYMMDDHHMMSS, YYYYMMDD, YYYY-MM-DD HH:MM:SS)
|
||||||
* @param int $gm 1=Input informations are GMT values, otherwise local to server TZ
|
* @param bool $gm 1=Input informations are GMT values, otherwise local to server TZ
|
||||||
* @return int|string Date TMS or ''
|
* @return int|string Date TMS or ''
|
||||||
*/
|
*/
|
||||||
function jdate($string, $gm=false);
|
function jdate($string, $gm=false);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Encrypt sensitive data in database
|
* Encrypt sensitive data in database
|
||||||
@ -424,7 +417,7 @@ interface Database
|
|||||||
* @param resource $resultset Fre cursor
|
* @param resource $resultset Fre cursor
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
function free($resultset = 0);
|
function free($resultset = null);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Close database connexion
|
* Close database connexion
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
<?php
|
<?php
|
||||||
/*
|
/*
|
||||||
* Copyright (C) 2013-2014 Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr>
|
* Copyright (C) 2013-2015 Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr>
|
||||||
* Copyright (C) 2014-2015 Laurent Destailleur <eldy@users.sourceforge.net>
|
* Copyright (C) 2014-2015 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||||
*
|
*
|
||||||
* This program is free software; you can redistribute it and/or modify
|
* This program is free software; you can redistribute it and/or modify
|
||||||
@ -29,41 +29,43 @@ require_once DOL_DOCUMENT_ROOT .'/core/db/Database.interface.php';
|
|||||||
*/
|
*/
|
||||||
abstract class DoliDB implements Database
|
abstract class DoliDB implements Database
|
||||||
{
|
{
|
||||||
//! Database handler
|
/** @var resource Database handler */
|
||||||
public $db;
|
public $db;
|
||||||
//! Database type
|
/** @var string Database type */
|
||||||
public $type;
|
public $type;
|
||||||
//! Charset used to force charset when creating database
|
/** @var string Charset used to force charset when creating database */
|
||||||
public $forcecharset='utf8';
|
public $forcecharset='utf8';
|
||||||
//! Collate used to force collate when creating database
|
/** @var string Collate used to force collate when creating database */
|
||||||
public $forcecollate='utf8_general_ci';
|
public $forcecollate='utf8_general_ci';
|
||||||
//! Resultset of last query
|
/** @var resource Resultset of last query */
|
||||||
private $_results;
|
private $_results;
|
||||||
//! 1 if connected, else 0
|
/** @var bool true if connected, else false */
|
||||||
public $connected;
|
public $connected;
|
||||||
//! 1 if database selected, else 0
|
/** @var bool true if database selected, else false */
|
||||||
public $database_selected;
|
public $database_selected;
|
||||||
//! Selected database name
|
/** @var string Selected database name */
|
||||||
public $database_name;
|
public $database_name;
|
||||||
//! Database username
|
/** @var string Database username */
|
||||||
public $database_user;
|
public $database_user;
|
||||||
//! Database host
|
/** @var string Database host */
|
||||||
public $database_host;
|
public $database_host;
|
||||||
//! Database port
|
/** @var int Database port */
|
||||||
public $database_port;
|
public $database_port;
|
||||||
//! >=1 if a transaction is opened, 0 otherwise
|
/** @var int >=1 if a transaction is opened, 0 otherwise */
|
||||||
public $transaction_opened;
|
public $transaction_opened;
|
||||||
//! Last successful query
|
/** @var string Last successful query */
|
||||||
public $lastquery;
|
public $lastquery;
|
||||||
//! Last failed query
|
/** @ar string Last failed query */
|
||||||
public $lastqueryerror;
|
public $lastqueryerror;
|
||||||
//! Last error message
|
/** @var string Last error message */
|
||||||
public $lasterror;
|
public $lasterror;
|
||||||
//! Last error number
|
/** @var int Last error number */
|
||||||
public $lasterrno;
|
public $lasterrno;
|
||||||
|
|
||||||
public $ok;
|
/** @var bool Status */
|
||||||
public $error;
|
public $ok;
|
||||||
|
/** @var string */
|
||||||
|
public $error;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Format a SQL IF
|
* Format a SQL IF
|
||||||
@ -205,16 +207,6 @@ abstract class DoliDB implements Database
|
|||||||
return preg_split("/[\.,-]/",$this->getVersion());
|
return preg_split("/[\.,-]/",$this->getVersion());
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Return label of manager
|
|
||||||
*
|
|
||||||
* @return string Label
|
|
||||||
*/
|
|
||||||
function getLabel()
|
|
||||||
{
|
|
||||||
return $this->label;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Return last request executed with query()
|
* Return last request executed with query()
|
||||||
*
|
*
|
||||||
@ -232,9 +224,9 @@ abstract class DoliDB implements Database
|
|||||||
* @param string $sortorder Sort order
|
* @param string $sortorder Sort order
|
||||||
* @return string String to provide syntax of a sort sql string
|
* @return string String to provide syntax of a sort sql string
|
||||||
*/
|
*/
|
||||||
function order($sortfield=0,$sortorder=0)
|
function order($sortfield=null,$sortorder=null)
|
||||||
{
|
{
|
||||||
if ($sortfield)
|
if (isset($sortfield))
|
||||||
{
|
{
|
||||||
$return='';
|
$return='';
|
||||||
$fields=explode(',',$sortfield);
|
$fields=explode(',',$sortfield);
|
||||||
@ -244,7 +236,9 @@ abstract class DoliDB implements Database
|
|||||||
else $return.=',';
|
else $return.=',';
|
||||||
|
|
||||||
$return.=preg_replace('/[^0-9a-z_\.]/i','',$val);
|
$return.=preg_replace('/[^0-9a-z_\.]/i','',$val);
|
||||||
if ($sortorder) $return.=' '.preg_replace('/[^0-9a-z]/i','',$sortorder);
|
if (isset($sortorder)) {
|
||||||
|
$return.=' '.preg_replace('/[^0-9a-z]/i','',$sortorder);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return $return;
|
return $return;
|
||||||
}
|
}
|
||||||
@ -270,7 +264,7 @@ abstract class DoliDB implements Database
|
|||||||
* 19700101020000 -> 7200 whaterver is TZ if gmt=1
|
* 19700101020000 -> 7200 whaterver is TZ if gmt=1
|
||||||
*
|
*
|
||||||
* @param string $string Date in a string (YYYYMMDDHHMMSS, YYYYMMDD, YYYY-MM-DD HH:MM:SS)
|
* @param string $string Date in a string (YYYYMMDDHHMMSS, YYYYMMDD, YYYY-MM-DD HH:MM:SS)
|
||||||
* @param int $gm 1=Input informations are GMT values, otherwise local to server TZ
|
* @param bool $gm 1=Input informations are GMT values, otherwise local to server TZ
|
||||||
* @return int|string Date TMS or ''
|
* @return int|string Date TMS or ''
|
||||||
*/
|
*/
|
||||||
function jdate($string, $gm=false)
|
function jdate($string, $gm=false)
|
||||||
|
|||||||
@ -21,7 +21,7 @@
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* \file htdocs/core/db/mssql.class.php
|
* \file htdocs/core/db/mssql.class.php
|
||||||
* \brief Fichier de la classe permettant de gerer une base mssql
|
* \brief Fichier de la classe permettant de gerer une base MSSQL
|
||||||
*/
|
*/
|
||||||
|
|
||||||
require_once DOL_DOCUMENT_ROOT .'/core/db/DoliDB.class.php';
|
require_once DOL_DOCUMENT_ROOT .'/core/db/DoliDB.class.php';
|
||||||
@ -41,7 +41,7 @@ class DoliDBMssql extends DoliDB
|
|||||||
var $forcecollate='latin1_swedish_ci'; // Can't be static as it may be forced with a dynamic value
|
var $forcecollate='latin1_swedish_ci'; // Can't be static as it may be forced with a dynamic value
|
||||||
//! Version min database
|
//! Version min database
|
||||||
const VERSIONMIN='2000';
|
const VERSIONMIN='2000';
|
||||||
//! Resultset of last query
|
/** @var resource Resultset of last query */
|
||||||
private $_results;
|
private $_results;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -57,7 +57,7 @@ class DoliDBMssql extends DoliDB
|
|||||||
*/
|
*/
|
||||||
function __construct($type, $host, $user, $pass, $name='', $port=0)
|
function __construct($type, $host, $user, $pass, $name='', $port=0)
|
||||||
{
|
{
|
||||||
global $conf,$langs;
|
global $langs;
|
||||||
|
|
||||||
$this->database_user=$user;
|
$this->database_user=$user;
|
||||||
$this->database_host=$host;
|
$this->database_host=$host;
|
||||||
@ -66,8 +66,8 @@ class DoliDBMssql extends DoliDB
|
|||||||
|
|
||||||
if (! function_exists("mssql_connect"))
|
if (! function_exists("mssql_connect"))
|
||||||
{
|
{
|
||||||
$this->connected = 0;
|
$this->connected = false;
|
||||||
$this->ok = 0;
|
$this->ok = false;
|
||||||
$this->error="Mssql PHP functions for using MSSql driver are not available in this version of PHP";
|
$this->error="Mssql PHP functions for using MSSql driver are not available in this version of PHP";
|
||||||
dol_syslog(get_class($this)."::DoliDBMssql : MSsql PHP functions for using MSsql driver are not available in this version of PHP",LOG_ERR);
|
dol_syslog(get_class($this)."::DoliDBMssql : MSsql PHP functions for using MSsql driver are not available in this version of PHP",LOG_ERR);
|
||||||
return $this->ok;
|
return $this->ok;
|
||||||
@ -75,8 +75,8 @@ class DoliDBMssql extends DoliDB
|
|||||||
|
|
||||||
if (! $host)
|
if (! $host)
|
||||||
{
|
{
|
||||||
$this->connected = 0;
|
$this->connected = false;
|
||||||
$this->ok = 0;
|
$this->ok = false;
|
||||||
$this->error=$langs->trans("ErrorWrongHostParameter");
|
$this->error=$langs->trans("ErrorWrongHostParameter");
|
||||||
dol_syslog(get_class($this)."::DoliDBMssql : Erreur Connect, wrong host parameters",LOG_ERR);
|
dol_syslog(get_class($this)."::DoliDBMssql : Erreur Connect, wrong host parameters",LOG_ERR);
|
||||||
return $this->ok;
|
return $this->ok;
|
||||||
@ -88,14 +88,14 @@ class DoliDBMssql extends DoliDB
|
|||||||
{
|
{
|
||||||
// Si client connecte avec charset different de celui de la base Dolibarr
|
// Si client connecte avec charset different de celui de la base Dolibarr
|
||||||
// (La base Dolibarr a ete forcee en this->forcecharset a l'install)
|
// (La base Dolibarr a ete forcee en this->forcecharset a l'install)
|
||||||
$this->connected = 1;
|
$this->connected = true;
|
||||||
$this->ok = 1;
|
$this->ok = true;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// host, login ou password incorrect
|
// host, login ou password incorrect
|
||||||
$this->connected = 0;
|
$this->connected = false;
|
||||||
$this->ok = 0;
|
$this->ok = false;
|
||||||
$this->error=mssql_get_last_message();
|
$this->error=mssql_get_last_message();
|
||||||
dol_syslog(get_class($this)."::DoliDBMssql : Erreur Connect mssql_get_last_message=".$this->error,LOG_ERR);
|
dol_syslog(get_class($this)."::DoliDBMssql : Erreur Connect mssql_get_last_message=".$this->error,LOG_ERR);
|
||||||
}
|
}
|
||||||
@ -105,15 +105,15 @@ class DoliDBMssql extends DoliDB
|
|||||||
{
|
{
|
||||||
if ($this->select_db($name))
|
if ($this->select_db($name))
|
||||||
{
|
{
|
||||||
$this->database_selected = 1;
|
$this->database_selected = true;
|
||||||
$this->database_name = $name;
|
$this->database_name = $name;
|
||||||
$this->ok = 1;
|
$this->ok = true;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
$this->database_selected = 0;
|
$this->database_selected = false;
|
||||||
$this->database_name = '';
|
$this->database_name = '';
|
||||||
$this->ok = 0;
|
$this->ok = false;
|
||||||
$this->error=$this->error();
|
$this->error=$this->error();
|
||||||
dol_syslog(get_class($this)."::DoliDBMssql : Erreur Select_db ".$this->error,LOG_ERR);
|
dol_syslog(get_class($this)."::DoliDBMssql : Erreur Select_db ".$this->error,LOG_ERR);
|
||||||
}
|
}
|
||||||
@ -121,7 +121,7 @@ class DoliDBMssql extends DoliDB
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
// Pas de selection de base demandee, ok ou ko
|
// Pas de selection de base demandee, ok ou ko
|
||||||
$this->database_selected = 0;
|
$this->database_selected = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
return $this->ok;
|
return $this->ok;
|
||||||
@ -157,8 +157,8 @@ class DoliDBMssql extends DoliDB
|
|||||||
* @param string $login login
|
* @param string $login login
|
||||||
* @param string $passwd password
|
* @param string $passwd password
|
||||||
* @param string $name name of database (not used for mysql, used for pgsql)
|
* @param string $name name of database (not used for mysql, used for pgsql)
|
||||||
* @param string $port Port of database server
|
* @param int $port Port of database server
|
||||||
* @return resource Database access handler
|
* @return false|resource|true Database access handler
|
||||||
* @see close
|
* @see close
|
||||||
*/
|
*/
|
||||||
function connect($host, $login, $passwd, $name, $port=0)
|
function connect($host, $login, $passwd, $name, $port=0)
|
||||||
@ -212,7 +212,7 @@ class DoliDBMssql extends DoliDB
|
|||||||
/**
|
/**
|
||||||
* Close database connexion
|
* Close database connexion
|
||||||
*
|
*
|
||||||
* @return boolean True if disconnect successfull, false otherwise
|
* @return bool True if disconnect successfull, false otherwise
|
||||||
* @see connect
|
* @see connect
|
||||||
*/
|
*/
|
||||||
function close()
|
function close()
|
||||||
@ -220,7 +220,7 @@ class DoliDBMssql extends DoliDB
|
|||||||
if ($this->db)
|
if ($this->db)
|
||||||
{
|
{
|
||||||
if ($this->transaction_opened > 0) dol_syslog(get_class($this)."::close Closing a connection with an opened transaction depth=".$this->transaction_opened,LOG_ERR);
|
if ($this->transaction_opened > 0) dol_syslog(get_class($this)."::close Closing a connection with an opened transaction depth=".$this->transaction_opened,LOG_ERR);
|
||||||
$this->connected=0;
|
$this->connected=false;
|
||||||
return mssql_close($this->db);
|
return mssql_close($this->db);
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
@ -230,7 +230,7 @@ class DoliDBMssql extends DoliDB
|
|||||||
/**
|
/**
|
||||||
* Start transaction
|
* Start transaction
|
||||||
*
|
*
|
||||||
* @return int 1 if transaction successfuly opened or already opened, 0 if error
|
* @return bool true if transaction successfuly opened or already opened, false if error
|
||||||
*/
|
*/
|
||||||
function begin()
|
function begin()
|
||||||
{
|
{
|
||||||
@ -250,7 +250,7 @@ class DoliDBMssql extends DoliDB
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
return 1;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -258,7 +258,7 @@ class DoliDBMssql extends DoliDB
|
|||||||
* Validate a database transaction
|
* Validate a database transaction
|
||||||
*
|
*
|
||||||
* @param string $log Add more log to default log line
|
* @param string $log Add more log to default log line
|
||||||
* @return int 1 if validation is OK or transaction level no started, 0 if ERROR
|
* @return bool true if validation is OK or transaction level no started, false if ERROR
|
||||||
*/
|
*/
|
||||||
function commit($log='')
|
function commit($log='')
|
||||||
{
|
{
|
||||||
@ -272,25 +272,26 @@ class DoliDBMssql extends DoliDB
|
|||||||
if ($ret)
|
if ($ret)
|
||||||
{
|
{
|
||||||
dol_syslog("COMMIT Transaction",LOG_DEBUG);
|
dol_syslog("COMMIT Transaction",LOG_DEBUG);
|
||||||
return 1;
|
return true;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
return 0;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
elseif ($this->transaction_opened > 1)
|
elseif ($this->transaction_opened > 1)
|
||||||
{
|
{
|
||||||
return 1;
|
return true;
|
||||||
} else
|
}
|
||||||
trigger_error("Commit requested but no transaction remain");
|
trigger_error("Commit requested but no transaction remain");
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Annulation d'une transaction et retour aux anciennes valeurs
|
* Annulation d'une transaction et retour aux anciennes valeurs
|
||||||
*
|
*
|
||||||
* @param string $log Add more log to default log line
|
* @param string $log Add more log to default log line
|
||||||
* @return int 1 si annulation ok ou transaction non ouverte, 0 en cas d'erreur
|
* @return bool true si annulation ok ou transaction non ouverte, false en cas d'erreur
|
||||||
*/
|
*/
|
||||||
function rollback($log='')
|
function rollback($log='')
|
||||||
{
|
{
|
||||||
@ -305,9 +306,10 @@ class DoliDBMssql extends DoliDB
|
|||||||
}
|
}
|
||||||
elseif ($this->transaction_opened > 1)
|
elseif ($this->transaction_opened > 1)
|
||||||
{
|
{
|
||||||
return 1;
|
return true;
|
||||||
} else
|
}
|
||||||
trigger_error("Rollback requested but no transaction remain");
|
trigger_error("Rollback requested but no transaction remain");
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -317,7 +319,7 @@ class DoliDBMssql extends DoliDB
|
|||||||
* @param int $usesavepoint 0=Default mode, 1=Run a savepoint before and a rollbock to savepoint if error (this allow to have some request with errors inside global transactions).
|
* @param int $usesavepoint 0=Default mode, 1=Run a savepoint before and a rollbock to savepoint if error (this allow to have some request with errors inside global transactions).
|
||||||
* Note that with Mysql, this parameter is not used as Myssql can already commit a transaction even if one request is in error, without using savepoints.
|
* Note that with Mysql, this parameter is not used as Myssql can already commit a transaction even if one request is in error, without using savepoints.
|
||||||
* @param string $type Type of SQL order ('ddl' for insert, update, select, delete or 'dml' for create, alter...)
|
* @param string $type Type of SQL order ('ddl' for insert, update, select, delete or 'dml' for create, alter...)
|
||||||
* @return resource Resultset of answer
|
* @return false|resource|true Resultset of answer
|
||||||
*/
|
*/
|
||||||
function query($query,$usesavepoint=0,$type='auto')
|
function query($query,$usesavepoint=0,$type='auto')
|
||||||
{
|
{
|
||||||
@ -459,8 +461,8 @@ class DoliDBMssql extends DoliDB
|
|||||||
/**
|
/**
|
||||||
* Renvoie la ligne courante (comme un objet) pour le curseur resultset
|
* Renvoie la ligne courante (comme un objet) pour le curseur resultset
|
||||||
*
|
*
|
||||||
* @param Resultset $resultset Curseur de la requete voulue
|
* @param resource $resultset Curseur de la requete voulue
|
||||||
* @return Object Object result line or false if KO or end of cursor
|
* @return object|false Object result line or false if KO or end of cursor
|
||||||
*/
|
*/
|
||||||
function fetch_object($resultset)
|
function fetch_object($resultset)
|
||||||
{
|
{
|
||||||
@ -472,8 +474,8 @@ class DoliDBMssql extends DoliDB
|
|||||||
/**
|
/**
|
||||||
* Return datas as an array
|
* Return datas as an array
|
||||||
*
|
*
|
||||||
* @param Resultset $resultset Resultset of request
|
* @param resource $resultset Resultset of request
|
||||||
* @return array Array
|
* @return array|false Array or false if KO or end of cursor
|
||||||
*/
|
*/
|
||||||
function fetch_array($resultset)
|
function fetch_array($resultset)
|
||||||
{
|
{
|
||||||
@ -486,8 +488,8 @@ class DoliDBMssql extends DoliDB
|
|||||||
/**
|
/**
|
||||||
* Return datas as an array
|
* Return datas as an array
|
||||||
*
|
*
|
||||||
* @param Resultset $resultset Resultset of request
|
* @param resource $resultset Resultset of request
|
||||||
* @return array Array
|
* @return array|false Array or false if KO or end of cursor
|
||||||
*/
|
*/
|
||||||
function fetch_row($resultset)
|
function fetch_row($resultset)
|
||||||
{
|
{
|
||||||
@ -499,7 +501,7 @@ class DoliDBMssql extends DoliDB
|
|||||||
/**
|
/**
|
||||||
* Return number of lines for result of a SELECT
|
* Return number of lines for result of a SELECT
|
||||||
*
|
*
|
||||||
* @param Resultset $resultset Resulset of requests
|
* @param resource $resultset Resulset of requests
|
||||||
* @return int Nb of lines
|
* @return int Nb of lines
|
||||||
* @see affected_rows
|
* @see affected_rows
|
||||||
*/
|
*/
|
||||||
@ -513,7 +515,7 @@ class DoliDBMssql extends DoliDB
|
|||||||
/**
|
/**
|
||||||
* Renvoie le nombre de lignes dans le resultat d'une requete INSERT, DELETE ou UPDATE
|
* Renvoie le nombre de lignes dans le resultat d'une requete INSERT, DELETE ou UPDATE
|
||||||
*
|
*
|
||||||
* @param resultset $resultset Curseur de la requete voulue
|
* @param resource $resultset Curseur de la requete voulue
|
||||||
* @return int Nombre de lignes
|
* @return int Nombre de lignes
|
||||||
* @see num_rows
|
* @see num_rows
|
||||||
*/
|
*/
|
||||||
@ -532,10 +534,10 @@ class DoliDBMssql extends DoliDB
|
|||||||
/**
|
/**
|
||||||
* Free last resultset used.
|
* Free last resultset used.
|
||||||
*
|
*
|
||||||
* @param resultset $resultset Curseur de la requete voulue
|
* @param resource $resultset Curseur de la requete voulue
|
||||||
* @return void
|
* @return bool
|
||||||
*/
|
*/
|
||||||
function free($resultset=0)
|
function free($resultset=null)
|
||||||
{
|
{
|
||||||
// Si le resultset n'est pas fourni, on prend le dernier utilise sur cette connexion
|
// Si le resultset n'est pas fourni, on prend le dernier utilise sur cette connexion
|
||||||
if (! is_resource($resultset)) { $resultset=$this->_results; }
|
if (! is_resource($resultset)) { $resultset=$this->_results; }
|
||||||
@ -641,7 +643,7 @@ class DoliDBMssql extends DoliDB
|
|||||||
*
|
*
|
||||||
* @param string $tab Table name concerned by insert. Ne sert pas sous MySql mais requis pour compatibilite avec Postgresql
|
* @param string $tab Table name concerned by insert. Ne sert pas sous MySql mais requis pour compatibilite avec Postgresql
|
||||||
* @param string $fieldid Field name
|
* @param string $fieldid Field name
|
||||||
* @return int Id of row
|
* @return int Id of row or -1 on error
|
||||||
*/
|
*/
|
||||||
function last_insert_id($tab,$fieldid='rowid')
|
function last_insert_id($tab,$fieldid='rowid')
|
||||||
{
|
{
|
||||||
@ -662,7 +664,7 @@ class DoliDBMssql extends DoliDB
|
|||||||
*
|
*
|
||||||
* @param string $fieldorvalue Field name or value to encrypt
|
* @param string $fieldorvalue Field name or value to encrypt
|
||||||
* @param int $withQuotes Return string with quotes
|
* @param int $withQuotes Return string with quotes
|
||||||
* @return return XXX(field) or XXX('value') or field or 'value'
|
* @return string XXX(field) or XXX('value') or field or 'value'
|
||||||
*/
|
*/
|
||||||
function encrypt($fieldorvalue, $withQuotes=0)
|
function encrypt($fieldorvalue, $withQuotes=0)
|
||||||
{
|
{
|
||||||
@ -720,7 +722,7 @@ class DoliDBMssql extends DoliDB
|
|||||||
* @param string $charset Charset used to store data
|
* @param string $charset Charset used to store data
|
||||||
* @param string $collation Charset used to sort data
|
* @param string $collation Charset used to sort data
|
||||||
* @param string $owner Username of database owner
|
* @param string $owner Username of database owner
|
||||||
* @return resource resource defined if OK, null if KO
|
* @return false|resource|true resource defined if OK, false if KO
|
||||||
*/
|
*/
|
||||||
function DDLCreateDb($database,$charset='',$collation='',$owner='')
|
function DDLCreateDb($database,$charset='',$collation='',$owner='')
|
||||||
{
|
{
|
||||||
@ -786,11 +788,13 @@ class DoliDBMssql extends DoliDB
|
|||||||
* @param string $type Type de la table
|
* @param string $type Type de la table
|
||||||
* @param array $unique_keys Tableau associatifs Nom de champs qui seront clef unique => valeur
|
* @param array $unique_keys Tableau associatifs Nom de champs qui seront clef unique => valeur
|
||||||
* @param array $fulltext_keys Tableau des Nom de champs qui seront indexes en fulltext
|
* @param array $fulltext_keys Tableau des Nom de champs qui seront indexes en fulltext
|
||||||
* @param string $keys Tableau des champs cles noms => valeur
|
* @param array $keys Tableau des champs cles noms => valeur
|
||||||
* @return int <0 if KO, >=0 if OK
|
* @return int <0 if KO, >=0 if OK
|
||||||
*/
|
*/
|
||||||
function DDLCreateTable($table,$fields,$primary_key,$type,$unique_keys="",$fulltext_keys="",$keys="")
|
function DDLCreateTable($table,$fields,$primary_key,$type,$unique_keys=null,$fulltext_keys=null,$keys=null)
|
||||||
{
|
{
|
||||||
|
// FIXME: $fulltext_keys parameter is unused
|
||||||
|
|
||||||
// cles recherchees dans le tableau des descriptions (fields) : type,value,attribute,null,default,extra
|
// cles recherchees dans le tableau des descriptions (fields) : type,value,attribute,null,default,extra
|
||||||
// ex. : $fields['rowid'] = array('type'=>'int','value'=>'11','null'=>'not null','extra'=> 'auto_increment');
|
// ex. : $fields['rowid'] = array('type'=>'int','value'=>'11','null'=>'not null','extra'=> 'auto_increment');
|
||||||
$sql = "create table ".$table."(";
|
$sql = "create table ".$table."(";
|
||||||
@ -820,7 +824,7 @@ class DoliDBMssql extends DoliDB
|
|||||||
if($primary_key != "")
|
if($primary_key != "")
|
||||||
$pk = "primary key(".$primary_key.")";
|
$pk = "primary key(".$primary_key.")";
|
||||||
|
|
||||||
if($unique_keys != "")
|
if(is_array($unique_keys))
|
||||||
{
|
{
|
||||||
$i = 0;
|
$i = 0;
|
||||||
foreach($unique_keys as $key => $value)
|
foreach($unique_keys as $key => $value)
|
||||||
@ -829,7 +833,7 @@ class DoliDBMssql extends DoliDB
|
|||||||
$i++;
|
$i++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if($keys != "")
|
if(is_array($keys))
|
||||||
{
|
{
|
||||||
$i = 0;
|
$i = 0;
|
||||||
foreach($keys as $key => $value)
|
foreach($keys as $key => $value)
|
||||||
@ -841,9 +845,9 @@ class DoliDBMssql extends DoliDB
|
|||||||
$sql .= implode(',',$sqlfields);
|
$sql .= implode(',',$sqlfields);
|
||||||
if($primary_key != "")
|
if($primary_key != "")
|
||||||
$sql .= ",".$pk;
|
$sql .= ",".$pk;
|
||||||
if($unique_keys != "")
|
if(is_array($unique_keys))
|
||||||
$sql .= ",".implode(',',$sqluq);
|
$sql .= ",".implode(',',$sqluq);
|
||||||
if($keys != "")
|
if(is_array($keys))
|
||||||
$sql .= ",".implode(',',$sqlk);
|
$sql .= ",".implode(',',$sqlk);
|
||||||
$sql .=") type=".$type;
|
$sql .=") type=".$type;
|
||||||
|
|
||||||
@ -859,7 +863,7 @@ class DoliDBMssql extends DoliDB
|
|||||||
*
|
*
|
||||||
* @param string $table Name of table
|
* @param string $table Name of table
|
||||||
* @param string $field Optionnel : Name of field if we want description of field
|
* @param string $field Optionnel : Name of field if we want description of field
|
||||||
* @return resource Resource
|
* @return false|resource|true Resource
|
||||||
*/
|
*/
|
||||||
function DDLDescTable($table,$field="")
|
function DDLDescTable($table,$field="")
|
||||||
{
|
{
|
||||||
@ -1047,7 +1051,7 @@ class DoliDBMssql extends DoliDB
|
|||||||
// FIXME: Dummy method
|
// FIXME: Dummy method
|
||||||
// TODO: Implement
|
// TODO: Implement
|
||||||
|
|
||||||
return '';
|
return array();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -1123,7 +1127,7 @@ class DoliDBMssql extends DoliDB
|
|||||||
*
|
*
|
||||||
* @param string $table Table name which contains fields
|
* @param string $table Table name which contains fields
|
||||||
* @param mixed $fields String for one field or array of string for multiple field
|
* @param mixed $fields String for one field or array of string for multiple field
|
||||||
* @return boolean|multitype:object
|
* @return false|object
|
||||||
*/
|
*/
|
||||||
function GetFieldInformation($table,$fields) {
|
function GetFieldInformation($table,$fields) {
|
||||||
$sql="SELECT * from INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME='".$this->escape($table)."' AND COLUMN_NAME";
|
$sql="SELECT * from INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME='".$this->escape($table)."' AND COLUMN_NAME";
|
||||||
|
|||||||
@ -21,13 +21,13 @@
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* \file htdocs/core/db/mysql.class.php
|
* \file htdocs/core/db/mysql.class.php
|
||||||
* \brief Class file to manage Dolibarr database access for a Mysql database
|
* \brief Class file to manage Dolibarr database access for a MySQL database
|
||||||
*/
|
*/
|
||||||
|
|
||||||
require_once DOL_DOCUMENT_ROOT .'/core/db/DoliDB.class.php';
|
require_once DOL_DOCUMENT_ROOT .'/core/db/DoliDB.class.php';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Class to manage Dolibarr database access for a Mysql database
|
* Class to manage Dolibarr database access for a MySQL database using the mysql extension
|
||||||
*/
|
*/
|
||||||
class DoliDBMysql extends DoliDB
|
class DoliDBMysql extends DoliDB
|
||||||
{
|
{
|
||||||
@ -37,7 +37,7 @@ class DoliDBMysql extends DoliDB
|
|||||||
const LABEL='MySQL';
|
const LABEL='MySQL';
|
||||||
//! Version min database
|
//! Version min database
|
||||||
const VERSIONMIN='4.1.0';
|
const VERSIONMIN='4.1.0';
|
||||||
//! Resultset of last query
|
/** @var resource Resultset of last query */
|
||||||
private $_results;
|
private $_results;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -69,8 +69,8 @@ class DoliDBMysql extends DoliDB
|
|||||||
|
|
||||||
if (! function_exists("mysql_connect"))
|
if (! function_exists("mysql_connect"))
|
||||||
{
|
{
|
||||||
$this->connected = 0;
|
$this->connected = false;
|
||||||
$this->ok = 0;
|
$this->ok = false;
|
||||||
$this->error="Mysql PHP functions for using MySql driver are not available in this version of PHP. Try to use another driver.";
|
$this->error="Mysql PHP functions for using MySql driver are not available in this version of PHP. Try to use another driver.";
|
||||||
dol_syslog(get_class($this)."::DoliDBMysql : Mysql PHP functions for using Mysql driver are not available in this version of PHP. Try to use another driver.",LOG_ERR);
|
dol_syslog(get_class($this)."::DoliDBMysql : Mysql PHP functions for using Mysql driver are not available in this version of PHP. Try to use another driver.",LOG_ERR);
|
||||||
return $this->ok;
|
return $this->ok;
|
||||||
@ -78,8 +78,8 @@ class DoliDBMysql extends DoliDB
|
|||||||
|
|
||||||
if (! $host)
|
if (! $host)
|
||||||
{
|
{
|
||||||
$this->connected = 0;
|
$this->connected = false;
|
||||||
$this->ok = 0;
|
$this->ok = false;
|
||||||
$this->error=$langs->trans("ErrorWrongHostParameter");
|
$this->error=$langs->trans("ErrorWrongHostParameter");
|
||||||
dol_syslog(get_class($this)."::DoliDBMysql : Erreur Connect, wrong host parameters",LOG_ERR);
|
dol_syslog(get_class($this)."::DoliDBMysql : Erreur Connect, wrong host parameters",LOG_ERR);
|
||||||
return $this->ok;
|
return $this->ok;
|
||||||
@ -89,14 +89,14 @@ class DoliDBMysql extends DoliDB
|
|||||||
$this->db = $this->connect($host, $user, $pass, $name, $port);
|
$this->db = $this->connect($host, $user, $pass, $name, $port);
|
||||||
if ($this->db)
|
if ($this->db)
|
||||||
{
|
{
|
||||||
$this->connected = 1;
|
$this->connected = true;
|
||||||
$this->ok = 1;
|
$this->ok = true;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// host, login ou password incorrect
|
// host, login ou password incorrect
|
||||||
$this->connected = 0;
|
$this->connected = false;
|
||||||
$this->ok = 0;
|
$this->ok = false;
|
||||||
$this->error=mysql_error();
|
$this->error=mysql_error();
|
||||||
dol_syslog(get_class($this)."::DoliDBMysql : Erreur Connect mysql_error=".$this->error,LOG_ERR);
|
dol_syslog(get_class($this)."::DoliDBMysql : Erreur Connect mysql_error=".$this->error,LOG_ERR);
|
||||||
}
|
}
|
||||||
@ -106,9 +106,9 @@ class DoliDBMysql extends DoliDB
|
|||||||
{
|
{
|
||||||
if ($this->select_db($name))
|
if ($this->select_db($name))
|
||||||
{
|
{
|
||||||
$this->database_selected = 1;
|
$this->database_selected = true;
|
||||||
$this->database_name = $name;
|
$this->database_name = $name;
|
||||||
$this->ok = 1;
|
$this->ok = true;
|
||||||
|
|
||||||
// If client connected with different charset than Dolibarr HTML output
|
// If client connected with different charset than Dolibarr HTML output
|
||||||
$clientmustbe='';
|
$clientmustbe='';
|
||||||
@ -122,9 +122,9 @@ class DoliDBMysql extends DoliDB
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
$this->database_selected = 0;
|
$this->database_selected = false;
|
||||||
$this->database_name = '';
|
$this->database_name = '';
|
||||||
$this->ok = 0;
|
$this->ok = false;
|
||||||
$this->error=$this->error();
|
$this->error=$this->error();
|
||||||
dol_syslog(get_class($this)."::DoliDBMysql : Erreur Select_db ".$this->error,LOG_ERR);
|
dol_syslog(get_class($this)."::DoliDBMysql : Erreur Select_db ".$this->error,LOG_ERR);
|
||||||
}
|
}
|
||||||
@ -132,7 +132,7 @@ class DoliDBMysql extends DoliDB
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
// Pas de selection de base demandee, ok ou ko
|
// Pas de selection de base demandee, ok ou ko
|
||||||
$this->database_selected = 0;
|
$this->database_selected = false;
|
||||||
|
|
||||||
if ($this->connected)
|
if ($this->connected)
|
||||||
{
|
{
|
||||||
@ -177,14 +177,14 @@ class DoliDBMysql extends DoliDB
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Connexion to server
|
* Connection to server
|
||||||
*
|
*
|
||||||
* @param string $host database server host
|
* @param string $host database server host
|
||||||
* @param string $login login
|
* @param string $login login
|
||||||
* @param string $passwd password
|
* @param string $passwd password
|
||||||
* @param string $name name of database (not used for mysql, used for pgsql)
|
* @param string $name name of database (not used for mysql, used for pgsql)
|
||||||
* @param integer $port Port of database server
|
* @param integer $port Port of database server
|
||||||
* @return resource Database access handler
|
* @return resource|false Database access handler
|
||||||
* @see close
|
* @see close
|
||||||
*/
|
*/
|
||||||
function connect($host, $login, $passwd, $name, $port=0)
|
function connect($host, $login, $passwd, $name, $port=0)
|
||||||
@ -219,7 +219,7 @@ class DoliDBMysql extends DoliDB
|
|||||||
*/
|
*/
|
||||||
function getDriverInfo()
|
function getDriverInfo()
|
||||||
{
|
{
|
||||||
return mysqli_get_client_info();
|
return mysql_get_client_info();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -234,7 +234,7 @@ class DoliDBMysql extends DoliDB
|
|||||||
if ($this->db)
|
if ($this->db)
|
||||||
{
|
{
|
||||||
if ($this->transaction_opened > 0) dol_syslog(get_class($this)."::close Closing a connection with an opened transaction depth=".$this->transaction_opened,LOG_ERR);
|
if ($this->transaction_opened > 0) dol_syslog(get_class($this)."::close Closing a connection with an opened transaction depth=".$this->transaction_opened,LOG_ERR);
|
||||||
$this->connected=0;
|
$this->connected=false;
|
||||||
return mysql_close($this->db);
|
return mysql_close($this->db);
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
@ -247,7 +247,7 @@ class DoliDBMysql extends DoliDB
|
|||||||
* @param int $usesavepoint 0=Default mode, 1=Run a savepoint before and a rollbock to savepoint if error (this allow to have some request with errors inside global transactions).
|
* @param int $usesavepoint 0=Default mode, 1=Run a savepoint before and a rollbock to savepoint if error (this allow to have some request with errors inside global transactions).
|
||||||
* Note that with Mysql, this parameter is not used as Myssql can already commit a transaction even if one request is in error, without using savepoints.
|
* Note that with Mysql, this parameter is not used as Myssql can already commit a transaction even if one request is in error, without using savepoints.
|
||||||
* @param string $type Type of SQL order ('ddl' for insert, update, select, delete or 'dml' for create, alter...)
|
* @param string $type Type of SQL order ('ddl' for insert, update, select, delete or 'dml' for create, alter...)
|
||||||
* @return resource Resultset of answer
|
* @return resource|true|false Resultset of answer
|
||||||
*/
|
*/
|
||||||
function query($query,$usesavepoint=0,$type='auto')
|
function query($query,$usesavepoint=0,$type='auto')
|
||||||
{
|
{
|
||||||
@ -287,8 +287,8 @@ class DoliDBMysql extends DoliDB
|
|||||||
/**
|
/**
|
||||||
* Renvoie la ligne courante (comme un objet) pour le curseur resultset
|
* Renvoie la ligne courante (comme un objet) pour le curseur resultset
|
||||||
*
|
*
|
||||||
* @param Resultset $resultset Curseur de la requete voulue
|
* @param resource $resultset Curseur de la requete voulue
|
||||||
* @return Object Object result line or false if KO or end of cursor
|
* @return resource|false Object result line or false if KO or end of cursor
|
||||||
*/
|
*/
|
||||||
function fetch_object($resultset)
|
function fetch_object($resultset)
|
||||||
{
|
{
|
||||||
@ -300,7 +300,7 @@ class DoliDBMysql extends DoliDB
|
|||||||
/**
|
/**
|
||||||
* Return datas as an array
|
* Return datas as an array
|
||||||
*
|
*
|
||||||
* @param Resultset $resultset Resultset of request
|
* @param resource $resultset Resultset of request
|
||||||
* @return array Array
|
* @return array Array
|
||||||
*/
|
*/
|
||||||
function fetch_array($resultset)
|
function fetch_array($resultset)
|
||||||
@ -327,7 +327,7 @@ class DoliDBMysql extends DoliDB
|
|||||||
/**
|
/**
|
||||||
* Return number of lines for result of a SELECT
|
* Return number of lines for result of a SELECT
|
||||||
*
|
*
|
||||||
* @param Resultset $resultset Resulset of requests
|
* @param resource $resultset Resulset of requests
|
||||||
* @return int Nb of lines
|
* @return int Nb of lines
|
||||||
* @see affected_rows
|
* @see affected_rows
|
||||||
*/
|
*/
|
||||||
@ -341,7 +341,7 @@ class DoliDBMysql extends DoliDB
|
|||||||
/**
|
/**
|
||||||
* Renvoie le nombre de lignes dans le resultat d'une requete INSERT, DELETE ou UPDATE
|
* Renvoie le nombre de lignes dans le resultat d'une requete INSERT, DELETE ou UPDATE
|
||||||
*
|
*
|
||||||
* @param resultset $resultset Curseur de la requete voulue
|
* @param resource $resultset Curseur de la requete voulue
|
||||||
* @return int Nombre de lignes
|
* @return int Nombre de lignes
|
||||||
* @see num_rows
|
* @see num_rows
|
||||||
*/
|
*/
|
||||||
@ -358,10 +358,10 @@ class DoliDBMysql extends DoliDB
|
|||||||
/**
|
/**
|
||||||
* Free last resultset used.
|
* Free last resultset used.
|
||||||
*
|
*
|
||||||
* @param resultset $resultset Curseur de la requete voulue
|
* @param resource $resultset Curseur de la requete voulue
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
function free($resultset=0)
|
function free($resultset=null)
|
||||||
{
|
{
|
||||||
// If resultset not provided, we take the last used by connexion
|
// If resultset not provided, we take the last used by connexion
|
||||||
if (! is_resource($resultset)) { $resultset=$this->_results; }
|
if (! is_resource($resultset)) { $resultset=$this->_results; }
|
||||||
@ -558,7 +558,7 @@ class DoliDBMysql extends DoliDB
|
|||||||
* @param string $charset Charset used to store data
|
* @param string $charset Charset used to store data
|
||||||
* @param string $collation Charset used to sort data
|
* @param string $collation Charset used to sort data
|
||||||
* @param string $owner Username of database owner
|
* @param string $owner Username of database owner
|
||||||
* @return resource resource defined if OK, null if KO
|
* @return false|resource|true resource defined if OK, null if KO
|
||||||
*/
|
*/
|
||||||
function DDLCreateDb($database,$charset='',$collation='',$owner='')
|
function DDLCreateDb($database,$charset='',$collation='',$owner='')
|
||||||
{
|
{
|
||||||
@ -634,11 +634,13 @@ class DoliDBMysql extends DoliDB
|
|||||||
* @param string $type Type de la table
|
* @param string $type Type de la table
|
||||||
* @param array $unique_keys Tableau associatifs Nom de champs qui seront clef unique => valeur
|
* @param array $unique_keys Tableau associatifs Nom de champs qui seront clef unique => valeur
|
||||||
* @param array $fulltext_keys Tableau des Nom de champs qui seront indexes en fulltext
|
* @param array $fulltext_keys Tableau des Nom de champs qui seront indexes en fulltext
|
||||||
* @param string $keys Tableau des champs cles noms => valeur
|
* @param array $keys Tableau des champs cles noms => valeur
|
||||||
* @return int <0 if KO, >=0 if OK
|
* @return int <0 if KO, >=0 if OK
|
||||||
*/
|
*/
|
||||||
function DDLCreateTable($table,$fields,$primary_key,$type,$unique_keys="",$fulltext_keys="",$keys="")
|
function DDLCreateTable($table,$fields,$primary_key,$type,$unique_keys=null,$fulltext_keys=null,$keys=null)
|
||||||
{
|
{
|
||||||
|
// FIXME: $fulltext_keys parameter is unused
|
||||||
|
|
||||||
// cles recherchees dans le tableau des descriptions (fields) : type,value,attribute,null,default,extra
|
// cles recherchees dans le tableau des descriptions (fields) : type,value,attribute,null,default,extra
|
||||||
// ex. : $fields['rowid'] = array('type'=>'int','value'=>'11','null'=>'not null','extra'=> 'auto_increment');
|
// ex. : $fields['rowid'] = array('type'=>'int','value'=>'11','null'=>'not null','extra'=> 'auto_increment');
|
||||||
$sql = "CREATE TABLE ".$table."(";
|
$sql = "CREATE TABLE ".$table."(";
|
||||||
@ -673,7 +675,7 @@ class DoliDBMysql extends DoliDB
|
|||||||
if($primary_key != "")
|
if($primary_key != "")
|
||||||
$pk = "primary key(".$primary_key.")";
|
$pk = "primary key(".$primary_key.")";
|
||||||
|
|
||||||
if($unique_keys != "")
|
if(is_array($unique_keys))
|
||||||
{
|
{
|
||||||
$i = 0;
|
$i = 0;
|
||||||
foreach($unique_keys as $key => $value)
|
foreach($unique_keys as $key => $value)
|
||||||
@ -682,7 +684,7 @@ class DoliDBMysql extends DoliDB
|
|||||||
$i++;
|
$i++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if($keys != "")
|
if(is_array($keys))
|
||||||
{
|
{
|
||||||
$i = 0;
|
$i = 0;
|
||||||
foreach($keys as $key => $value)
|
foreach($keys as $key => $value)
|
||||||
@ -694,9 +696,9 @@ class DoliDBMysql extends DoliDB
|
|||||||
$sql .= implode(',',$sqlfields);
|
$sql .= implode(',',$sqlfields);
|
||||||
if($primary_key != "")
|
if($primary_key != "")
|
||||||
$sql .= ",".$pk;
|
$sql .= ",".$pk;
|
||||||
if($unique_keys != "")
|
if(is_array($unique_keys))
|
||||||
$sql .= ",".implode(',',$sqluq);
|
$sql .= ",".implode(',',$sqluq);
|
||||||
if($keys != "")
|
if(is_array($keys))
|
||||||
$sql .= ",".implode(',',$sqlk);
|
$sql .= ",".implode(',',$sqlk);
|
||||||
$sql .=") engine=".$type;
|
$sql .=") engine=".$type;
|
||||||
|
|
||||||
@ -712,7 +714,7 @@ class DoliDBMysql extends DoliDB
|
|||||||
*
|
*
|
||||||
* @param string $table Name of table
|
* @param string $table Name of table
|
||||||
* @param string $field Optionnel : Name of field if we want description of field
|
* @param string $field Optionnel : Name of field if we want description of field
|
||||||
* @return resource Resource
|
* @return false|resource|true Resource
|
||||||
*/
|
*/
|
||||||
function DDLDescTable($table,$field="")
|
function DDLDescTable($table,$field="")
|
||||||
{
|
{
|
||||||
|
|||||||
@ -21,13 +21,13 @@
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* \file htdocs/core/db/mysqli.class.php
|
* \file htdocs/core/db/mysqli.class.php
|
||||||
* \brief Class file to manage Dolibarr database access for a Mysql database
|
* \brief Class file to manage Dolibarr database access for a MySQL database
|
||||||
*/
|
*/
|
||||||
|
|
||||||
require_once DOL_DOCUMENT_ROOT .'/core/db/DoliDB.class.php';
|
require_once DOL_DOCUMENT_ROOT .'/core/db/DoliDB.class.php';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Class to manage Dolibarr database access for a Mysql database
|
* Class to manage Dolibarr database access for a MySQL database using the MySQLi extension
|
||||||
*/
|
*/
|
||||||
class DoliDBMysqli extends DoliDB
|
class DoliDBMysqli extends DoliDB
|
||||||
{
|
{
|
||||||
@ -36,8 +36,8 @@ class DoliDBMysqli extends DoliDB
|
|||||||
//! Database label
|
//! Database label
|
||||||
const LABEL='MySQL';
|
const LABEL='MySQL';
|
||||||
//! Version min database
|
//! Version min database
|
||||||
const VERSIONMIN='4.1.0';
|
const VERSIONMIN='4.1.3';
|
||||||
//! Resultset of last query
|
/** @var mysqli_result Resultset of last query */
|
||||||
private $_results;
|
private $_results;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -69,8 +69,8 @@ class DoliDBMysqli extends DoliDB
|
|||||||
|
|
||||||
if (! function_exists("mysqli_connect"))
|
if (! function_exists("mysqli_connect"))
|
||||||
{
|
{
|
||||||
$this->connected = 0;
|
$this->connected = false;
|
||||||
$this->ok = 0;
|
$this->ok = false;
|
||||||
$this->error="Mysqli PHP functions for using Mysqli driver are not available in this version of PHP. Try to use another driver.";
|
$this->error="Mysqli PHP functions for using Mysqli driver are not available in this version of PHP. Try to use another driver.";
|
||||||
dol_syslog(get_class($this)."::DoliDBMysqli : Mysqli PHP functions for using Mysqli driver are not available in this version of PHP. Try to use another driver.",LOG_ERR);
|
dol_syslog(get_class($this)."::DoliDBMysqli : Mysqli PHP functions for using Mysqli driver are not available in this version of PHP. Try to use another driver.",LOG_ERR);
|
||||||
return $this->ok;
|
return $this->ok;
|
||||||
@ -78,8 +78,8 @@ class DoliDBMysqli extends DoliDB
|
|||||||
|
|
||||||
if (! $host)
|
if (! $host)
|
||||||
{
|
{
|
||||||
$this->connected = 0;
|
$this->connected = false;
|
||||||
$this->ok = 0;
|
$this->ok = false;
|
||||||
$this->error=$langs->trans("ErrorWrongHostParameter");
|
$this->error=$langs->trans("ErrorWrongHostParameter");
|
||||||
dol_syslog(get_class($this)."::DoliDBMysqli : Erreur Connect, wrong host parameters",LOG_ERR);
|
dol_syslog(get_class($this)."::DoliDBMysqli : Erreur Connect, wrong host parameters",LOG_ERR);
|
||||||
return $this->ok;
|
return $this->ok;
|
||||||
@ -91,14 +91,14 @@ class DoliDBMysqli extends DoliDB
|
|||||||
|
|
||||||
if ($this->db)
|
if ($this->db)
|
||||||
{
|
{
|
||||||
$this->connected = 1;
|
$this->connected = true;
|
||||||
$this->ok = 1;
|
$this->ok = true;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// host, login ou password incorrect
|
// host, login ou password incorrect
|
||||||
$this->connected = 0;
|
$this->connected = false;
|
||||||
$this->ok = 0;
|
$this->ok = false;
|
||||||
$this->error=mysqli_connect_error();
|
$this->error=mysqli_connect_error();
|
||||||
dol_syslog(get_class($this)."::DoliDBMysqli : Erreur Connect mysqli_connect_error=".$this->error,LOG_ERR);
|
dol_syslog(get_class($this)."::DoliDBMysqli : Erreur Connect mysqli_connect_error=".$this->error,LOG_ERR);
|
||||||
}
|
}
|
||||||
@ -108,9 +108,9 @@ class DoliDBMysqli extends DoliDB
|
|||||||
{
|
{
|
||||||
if ($this->select_db($name))
|
if ($this->select_db($name))
|
||||||
{
|
{
|
||||||
$this->database_selected = 1;
|
$this->database_selected = true;
|
||||||
$this->database_name = $name;
|
$this->database_name = $name;
|
||||||
$this->ok = 1;
|
$this->ok = true;
|
||||||
|
|
||||||
// If client connected with different charset than Dolibarr HTML output
|
// If client connected with different charset than Dolibarr HTML output
|
||||||
$clientmustbe='';
|
$clientmustbe='';
|
||||||
@ -124,9 +124,9 @@ class DoliDBMysqli extends DoliDB
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
$this->database_selected = 0;
|
$this->database_selected = false;
|
||||||
$this->database_name = '';
|
$this->database_name = '';
|
||||||
$this->ok = 0;
|
$this->ok = false;
|
||||||
$this->error=$this->error();
|
$this->error=$this->error();
|
||||||
dol_syslog(get_class($this)."::DoliDBMysqli : Erreur Select_db ".$this->error,LOG_ERR);
|
dol_syslog(get_class($this)."::DoliDBMysqli : Erreur Select_db ".$this->error,LOG_ERR);
|
||||||
}
|
}
|
||||||
@ -134,7 +134,7 @@ class DoliDBMysqli extends DoliDB
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
// Pas de selection de base demandee, ok ou ko
|
// Pas de selection de base demandee, ok ou ko
|
||||||
$this->database_selected = 0;
|
$this->database_selected = false;
|
||||||
|
|
||||||
if ($this->connected)
|
if ($this->connected)
|
||||||
{
|
{
|
||||||
@ -187,7 +187,7 @@ class DoliDBMysqli extends DoliDB
|
|||||||
* @param string $passwd password
|
* @param string $passwd password
|
||||||
* @param string $name name of database (not used for mysql, used for pgsql)
|
* @param string $name name of database (not used for mysql, used for pgsql)
|
||||||
* @param integer $port Port of database server
|
* @param integer $port Port of database server
|
||||||
* @return resource Database access handler
|
* @return mysqli Database access handler
|
||||||
* @see close
|
* @see close
|
||||||
*/
|
*/
|
||||||
function connect($host, $login, $passwd, $name, $port=0)
|
function connect($host, $login, $passwd, $name, $port=0)
|
||||||
@ -230,7 +230,7 @@ class DoliDBMysqli extends DoliDB
|
|||||||
/**
|
/**
|
||||||
* Close database connexion
|
* Close database connexion
|
||||||
*
|
*
|
||||||
* @return boolean True if disconnect successfull, false otherwise
|
* @return bool True if disconnect successfull, false otherwise
|
||||||
* @see connect
|
* @see connect
|
||||||
*/
|
*/
|
||||||
function close()
|
function close()
|
||||||
@ -238,7 +238,7 @@ class DoliDBMysqli extends DoliDB
|
|||||||
if ($this->db)
|
if ($this->db)
|
||||||
{
|
{
|
||||||
if ($this->transaction_opened > 0) dol_syslog(get_class($this)."::close Closing a connection with an opened transaction depth=".$this->transaction_opened,LOG_ERR);
|
if ($this->transaction_opened > 0) dol_syslog(get_class($this)."::close Closing a connection with an opened transaction depth=".$this->transaction_opened,LOG_ERR);
|
||||||
$this->connected=0;
|
$this->connected=false;
|
||||||
return mysqli_close($this->db);
|
return mysqli_close($this->db);
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
@ -251,7 +251,7 @@ class DoliDBMysqli extends DoliDB
|
|||||||
* @param int $usesavepoint 0=Default mode, 1=Run a savepoint before and a rollbock to savepoint if error (this allow to have some request with errors inside global transactions).
|
* @param int $usesavepoint 0=Default mode, 1=Run a savepoint before and a rollbock to savepoint if error (this allow to have some request with errors inside global transactions).
|
||||||
* Note that with Mysql, this parameter is not used as Myssql can already commit a transaction even if one request is in error, without using savepoints.
|
* Note that with Mysql, this parameter is not used as Myssql can already commit a transaction even if one request is in error, without using savepoints.
|
||||||
* @param string $type Type of SQL order ('ddl' for insert, update, select, delete or 'dml' for create, alter...)
|
* @param string $type Type of SQL order ('ddl' for insert, update, select, delete or 'dml' for create, alter...)
|
||||||
* @return resource Resultset of answer
|
* @return bool|mysqli_result Resultset of answer
|
||||||
*/
|
*/
|
||||||
function query($query,$usesavepoint=0,$type='auto')
|
function query($query,$usesavepoint=0,$type='auto')
|
||||||
{
|
{
|
||||||
@ -290,8 +290,8 @@ class DoliDBMysqli extends DoliDB
|
|||||||
/**
|
/**
|
||||||
* Renvoie la ligne courante (comme un objet) pour le curseur resultset
|
* Renvoie la ligne courante (comme un objet) pour le curseur resultset
|
||||||
*
|
*
|
||||||
* @param Resultset $resultset Curseur de la requete voulue
|
* @param mysqli_result $resultset Curseur de la requete voulue
|
||||||
* @return Object Object result line or false if KO or end of cursor
|
* @return object|null Object result line or null if KO or end of cursor
|
||||||
*/
|
*/
|
||||||
function fetch_object($resultset)
|
function fetch_object($resultset)
|
||||||
{
|
{
|
||||||
@ -304,8 +304,8 @@ class DoliDBMysqli extends DoliDB
|
|||||||
/**
|
/**
|
||||||
* Return datas as an array
|
* Return datas as an array
|
||||||
*
|
*
|
||||||
* @param Resultset $resultset Resultset of request
|
* @param mysqli_result $resultset Resultset of request
|
||||||
* @return array Array
|
* @return array|null Array or null if KO or end of cursor
|
||||||
*/
|
*/
|
||||||
function fetch_array($resultset)
|
function fetch_array($resultset)
|
||||||
{
|
{
|
||||||
@ -317,8 +317,8 @@ class DoliDBMysqli extends DoliDB
|
|||||||
/**
|
/**
|
||||||
* Return datas as an array
|
* Return datas as an array
|
||||||
*
|
*
|
||||||
* @param resource $resultset Resultset of request
|
* @param mysqli_result $resultset Resultset of request
|
||||||
* @return array Array
|
* @return array|null|0 Array or null if KO or end of cursor or 0 if resultset is bool
|
||||||
*/
|
*/
|
||||||
function fetch_row($resultset)
|
function fetch_row($resultset)
|
||||||
{
|
{
|
||||||
@ -338,8 +338,8 @@ class DoliDBMysqli extends DoliDB
|
|||||||
/**
|
/**
|
||||||
* Return number of lines for result of a SELECT
|
* Return number of lines for result of a SELECT
|
||||||
*
|
*
|
||||||
* @param Resultset $resultset Resulset of requests
|
* @param mysqli_result $resultset Resulset of requests
|
||||||
* @return int Nb of lines
|
* @return int Nb of lines
|
||||||
* @see affected_rows
|
* @see affected_rows
|
||||||
*/
|
*/
|
||||||
function num_rows($resultset)
|
function num_rows($resultset)
|
||||||
@ -352,8 +352,8 @@ class DoliDBMysqli extends DoliDB
|
|||||||
/**
|
/**
|
||||||
* Renvoie le nombre de lignes dans le resultat d'une requete INSERT, DELETE ou UPDATE
|
* Renvoie le nombre de lignes dans le resultat d'une requete INSERT, DELETE ou UPDATE
|
||||||
*
|
*
|
||||||
* @param resultset $resultset Curseur de la requete voulue
|
* @param mysqli_result $resultset Curseur de la requete voulue
|
||||||
* @return int Nombre de lignes
|
* @return int Nombre de lignes
|
||||||
* @see num_rows
|
* @see num_rows
|
||||||
*/
|
*/
|
||||||
function affected_rows($resultset)
|
function affected_rows($resultset)
|
||||||
@ -369,10 +369,10 @@ class DoliDBMysqli extends DoliDB
|
|||||||
/**
|
/**
|
||||||
* Libere le dernier resultset utilise sur cette connexion
|
* Libere le dernier resultset utilise sur cette connexion
|
||||||
*
|
*
|
||||||
* @param resultset $resultset Curseur de la requete voulue
|
* @param mysqli_result $resultset Curseur de la requete voulue
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
function free($resultset=0)
|
function free($resultset=null)
|
||||||
{
|
{
|
||||||
// If resultset not provided, we take the last used by connexion
|
// If resultset not provided, we take the last used by connexion
|
||||||
if (! is_object($resultset)) { $resultset=$this->_results; }
|
if (! is_object($resultset)) { $resultset=$this->_results; }
|
||||||
@ -401,8 +401,7 @@ class DoliDBMysqli extends DoliDB
|
|||||||
if (! $this->connected) {
|
if (! $this->connected) {
|
||||||
// Si il y a eu echec de connexion, $this->db n'est pas valide.
|
// Si il y a eu echec de connexion, $this->db n'est pas valide.
|
||||||
return 'DB_ERROR_FAILED_TO_CONNECT';
|
return 'DB_ERROR_FAILED_TO_CONNECT';
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
// Constants to convert a MySql error code to a generic Dolibarr error code
|
// Constants to convert a MySql error code to a generic Dolibarr error code
|
||||||
$errorcode_map = array(
|
$errorcode_map = array(
|
||||||
1004 => 'DB_ERROR_CANNOT_CREATE',
|
1004 => 'DB_ERROR_CANNOT_CREATE',
|
||||||
@ -434,8 +433,7 @@ class DoliDBMysqli extends DoliDB
|
|||||||
1451 => 'DB_ERROR_CHILD_EXISTS'
|
1451 => 'DB_ERROR_CHILD_EXISTS'
|
||||||
);
|
);
|
||||||
|
|
||||||
if (isset($errorcode_map[mysqli_errno($this->db)]))
|
if (isset($errorcode_map[mysqli_errno($this->db)])) {
|
||||||
{
|
|
||||||
return $errorcode_map[mysqli_errno($this->db)];
|
return $errorcode_map[mysqli_errno($this->db)];
|
||||||
}
|
}
|
||||||
$errno=mysqli_errno($this->db);
|
$errno=mysqli_errno($this->db);
|
||||||
@ -464,7 +462,7 @@ class DoliDBMysqli extends DoliDB
|
|||||||
*
|
*
|
||||||
* @param string $tab Table name concerned by insert. Ne sert pas sous MySql mais requis pour compatibilite avec Postgresql
|
* @param string $tab Table name concerned by insert. Ne sert pas sous MySql mais requis pour compatibilite avec Postgresql
|
||||||
* @param string $fieldid Field name
|
* @param string $fieldid Field name
|
||||||
* @return int Id of row
|
* @return int|string Id of row
|
||||||
*/
|
*/
|
||||||
function last_insert_id($tab,$fieldid='rowid')
|
function last_insert_id($tab,$fieldid='rowid')
|
||||||
{
|
{
|
||||||
@ -562,7 +560,7 @@ class DoliDBMysqli extends DoliDB
|
|||||||
* @param string $charset Charset used to store data
|
* @param string $charset Charset used to store data
|
||||||
* @param string $collation Charset used to sort data
|
* @param string $collation Charset used to sort data
|
||||||
* @param string $owner Username of database owner
|
* @param string $owner Username of database owner
|
||||||
* @return resource resource defined if OK, null if KO
|
* @return bool|mysqli_result resource defined if OK, null if KO
|
||||||
*/
|
*/
|
||||||
function DDLCreateDb($database,$charset='',$collation='',$owner='')
|
function DDLCreateDb($database,$charset='',$collation='',$owner='')
|
||||||
{
|
{
|
||||||
@ -638,11 +636,13 @@ class DoliDBMysqli extends DoliDB
|
|||||||
* @param string $type Type de la table
|
* @param string $type Type de la table
|
||||||
* @param array $unique_keys Tableau associatifs Nom de champs qui seront clef unique => valeur
|
* @param array $unique_keys Tableau associatifs Nom de champs qui seront clef unique => valeur
|
||||||
* @param array $fulltext_keys Tableau des Nom de champs qui seront indexes en fulltext
|
* @param array $fulltext_keys Tableau des Nom de champs qui seront indexes en fulltext
|
||||||
* @param string $keys Tableau des champs cles noms => valeur
|
* @param array $keys Tableau des champs cles noms => valeur
|
||||||
* @return int <0 if KO, >=0 if OK
|
* @return int <0 if KO, >=0 if OK
|
||||||
*/
|
*/
|
||||||
function DDLCreateTable($table,$fields,$primary_key,$type,$unique_keys="",$fulltext_keys="",$keys="")
|
function DDLCreateTable($table,$fields,$primary_key,$type,$unique_keys=null,$fulltext_keys=null,$keys=null)
|
||||||
{
|
{
|
||||||
|
// FIXME: $fulltext_keys parameter is unused
|
||||||
|
|
||||||
// cles recherchees dans le tableau des descriptions (fields) : type,value,attribute,null,default,extra
|
// cles recherchees dans le tableau des descriptions (fields) : type,value,attribute,null,default,extra
|
||||||
// ex. : $fields['rowid'] = array('type'=>'int','value'=>'11','null'=>'not null','extra'=> 'auto_increment');
|
// ex. : $fields['rowid'] = array('type'=>'int','value'=>'11','null'=>'not null','extra'=> 'auto_increment');
|
||||||
$sql = "CREATE TABLE ".$table."(";
|
$sql = "CREATE TABLE ".$table."(";
|
||||||
@ -677,8 +677,7 @@ class DoliDBMysqli extends DoliDB
|
|||||||
if($primary_key != "")
|
if($primary_key != "")
|
||||||
$pk = "primary key(".$primary_key.")";
|
$pk = "primary key(".$primary_key.")";
|
||||||
|
|
||||||
if($unique_keys != "")
|
if(is_array($unique_keys)) {
|
||||||
{
|
|
||||||
$i = 0;
|
$i = 0;
|
||||||
foreach($unique_keys as $key => $value)
|
foreach($unique_keys as $key => $value)
|
||||||
{
|
{
|
||||||
@ -686,7 +685,7 @@ class DoliDBMysqli extends DoliDB
|
|||||||
$i++;
|
$i++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if($keys != "")
|
if(is_array($keys))
|
||||||
{
|
{
|
||||||
$i = 0;
|
$i = 0;
|
||||||
foreach($keys as $key => $value)
|
foreach($keys as $key => $value)
|
||||||
@ -700,7 +699,7 @@ class DoliDBMysqli extends DoliDB
|
|||||||
$sql .= ",".$pk;
|
$sql .= ",".$pk;
|
||||||
if($unique_keys != "")
|
if($unique_keys != "")
|
||||||
$sql .= ",".implode(',',$sqluq);
|
$sql .= ",".implode(',',$sqluq);
|
||||||
if($keys != "")
|
if(is_array($keys))
|
||||||
$sql .= ",".implode(',',$sqlk);
|
$sql .= ",".implode(',',$sqlk);
|
||||||
$sql .=") engine=".$type;
|
$sql .=") engine=".$type;
|
||||||
|
|
||||||
@ -716,7 +715,7 @@ class DoliDBMysqli extends DoliDB
|
|||||||
*
|
*
|
||||||
* @param string $table Name of table
|
* @param string $table Name of table
|
||||||
* @param string $field Optionnel : Name of field if we want description of field
|
* @param string $field Optionnel : Name of field if we want description of field
|
||||||
* @return resource Resultset x (x->Field, x->Type, ...)
|
* @return bool|mysqli_result Resultset x (x->Field, x->Type, ...)
|
||||||
*/
|
*/
|
||||||
function DDLDescTable($table,$field="")
|
function DDLDescTable($table,$field="")
|
||||||
{
|
{
|
||||||
@ -763,14 +762,10 @@ class DoliDBMysqli extends DoliDB
|
|||||||
$sql.= " ".$field_position;
|
$sql.= " ".$field_position;
|
||||||
|
|
||||||
dol_syslog(get_class($this)."::DDLAddField ".$sql,LOG_DEBUG);
|
dol_syslog(get_class($this)."::DDLAddField ".$sql,LOG_DEBUG);
|
||||||
if(! $this->query($sql))
|
if($this->query($sql)) {
|
||||||
{
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -808,12 +803,11 @@ class DoliDBMysqli extends DoliDB
|
|||||||
{
|
{
|
||||||
$sql= "ALTER TABLE ".$table." DROP COLUMN `".$field_name."`";
|
$sql= "ALTER TABLE ".$table." DROP COLUMN `".$field_name."`";
|
||||||
dol_syslog(get_class($this)."::DDLDropField ".$sql,LOG_DEBUG);
|
dol_syslog(get_class($this)."::DDLDropField ".$sql,LOG_DEBUG);
|
||||||
if (! $this->query($sql))
|
if ($this->query($sql)) {
|
||||||
{
|
return 1;
|
||||||
$this->error=$this->lasterror();
|
|
||||||
return -1;
|
|
||||||
}
|
}
|
||||||
else return 1;
|
$this->error=$this->lasterror();
|
||||||
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -883,7 +877,7 @@ class DoliDBMysqli extends DoliDB
|
|||||||
/**
|
/**
|
||||||
* Return list of available charset that can be used to store data in database
|
* Return list of available charset that can be used to store data in database
|
||||||
*
|
*
|
||||||
* @return array List of Charset
|
* @return array|null List of Charset
|
||||||
*/
|
*/
|
||||||
function getListOfCharacterSet()
|
function getListOfCharacterSet()
|
||||||
{
|
{
|
||||||
@ -926,7 +920,7 @@ class DoliDBMysqli extends DoliDB
|
|||||||
/**
|
/**
|
||||||
* Return list of available collation that can be used for database
|
* Return list of available collation that can be used for database
|
||||||
*
|
*
|
||||||
* @return array Liste of Collation
|
* @return array|null Liste of Collation
|
||||||
*/
|
*/
|
||||||
function getListOfCollation()
|
function getListOfCollation()
|
||||||
{
|
{
|
||||||
|
|||||||
@ -45,7 +45,7 @@ class DoliDBPgsql extends DoliDB
|
|||||||
var $forcecollate=''; // Can't be static as it may be forced with a dynamic value
|
var $forcecollate=''; // Can't be static as it may be forced with a dynamic value
|
||||||
//! Version min database
|
//! Version min database
|
||||||
const VERSIONMIN='8.4.0'; // Version min database
|
const VERSIONMIN='8.4.0'; // Version min database
|
||||||
//! Resultset of last query
|
/** @var resource Resultset of last query */
|
||||||
private $_results;
|
private $_results;
|
||||||
|
|
||||||
public $unescapeslashquot;
|
public $unescapeslashquot;
|
||||||
@ -80,8 +80,8 @@ class DoliDBPgsql extends DoliDB
|
|||||||
|
|
||||||
if (! function_exists("pg_connect"))
|
if (! function_exists("pg_connect"))
|
||||||
{
|
{
|
||||||
$this->connected = 0;
|
$this->connected = false;
|
||||||
$this->ok = 0;
|
$this->ok = false;
|
||||||
$this->error="Pgsql PHP functions are not available in this version of PHP";
|
$this->error="Pgsql PHP functions are not available in this version of PHP";
|
||||||
dol_syslog(get_class($this)."::DoliDBPgsql : Pgsql PHP functions are not available in this version of PHP",LOG_ERR);
|
dol_syslog(get_class($this)."::DoliDBPgsql : Pgsql PHP functions are not available in this version of PHP",LOG_ERR);
|
||||||
return $this->ok;
|
return $this->ok;
|
||||||
@ -89,8 +89,8 @@ class DoliDBPgsql extends DoliDB
|
|||||||
|
|
||||||
if (! $host)
|
if (! $host)
|
||||||
{
|
{
|
||||||
$this->connected = 0;
|
$this->connected = false;
|
||||||
$this->ok = 0;
|
$this->ok = false;
|
||||||
$this->error=$langs->trans("ErrorWrongHostParameter");
|
$this->error=$langs->trans("ErrorWrongHostParameter");
|
||||||
dol_syslog(get_class($this)."::DoliDBPgsql : Erreur Connect, wrong host parameters",LOG_ERR);
|
dol_syslog(get_class($this)."::DoliDBPgsql : Erreur Connect, wrong host parameters",LOG_ERR);
|
||||||
return $this->ok;
|
return $this->ok;
|
||||||
@ -102,14 +102,14 @@ class DoliDBPgsql extends DoliDB
|
|||||||
|
|
||||||
if ($this->db)
|
if ($this->db)
|
||||||
{
|
{
|
||||||
$this->connected = 1;
|
$this->connected = true;
|
||||||
$this->ok = 1;
|
$this->ok = true;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// host, login ou password incorrect
|
// host, login ou password incorrect
|
||||||
$this->connected = 0;
|
$this->connected = false;
|
||||||
$this->ok = 0;
|
$this->ok = false;
|
||||||
$this->error='Host, login or password incorrect';
|
$this->error='Host, login or password incorrect';
|
||||||
dol_syslog(get_class($this)."::DoliDBPgsql : Erreur Connect ".$this->error,LOG_ERR);
|
dol_syslog(get_class($this)."::DoliDBPgsql : Erreur Connect ".$this->error,LOG_ERR);
|
||||||
}
|
}
|
||||||
@ -119,15 +119,15 @@ class DoliDBPgsql extends DoliDB
|
|||||||
{
|
{
|
||||||
if ($this->select_db($name))
|
if ($this->select_db($name))
|
||||||
{
|
{
|
||||||
$this->database_selected = 1;
|
$this->database_selected = true;
|
||||||
$this->database_name = $name;
|
$this->database_name = $name;
|
||||||
$this->ok = 1;
|
$this->ok = true;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
$this->database_selected = 0;
|
$this->database_selected = false;
|
||||||
$this->database_name = '';
|
$this->database_name = '';
|
||||||
$this->ok = 0;
|
$this->ok = false;
|
||||||
$this->error=$this->error();
|
$this->error=$this->error();
|
||||||
dol_syslog(get_class($this)."::DoliDBPgsql : Erreur Select_db ".$this->error,LOG_ERR);
|
dol_syslog(get_class($this)."::DoliDBPgsql : Erreur Select_db ".$this->error,LOG_ERR);
|
||||||
}
|
}
|
||||||
@ -135,7 +135,7 @@ class DoliDBPgsql extends DoliDB
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
// Pas de selection de base demandee, ok ou ko
|
// Pas de selection de base demandee, ok ou ko
|
||||||
$this->database_selected = 0;
|
$this->database_selected = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
return $this->ok;
|
return $this->ok;
|
||||||
@ -147,10 +147,10 @@ class DoliDBPgsql extends DoliDB
|
|||||||
*
|
*
|
||||||
* @param string $line SQL request line to convert
|
* @param string $line SQL request line to convert
|
||||||
* @param string $type Type of SQL order ('ddl' for insert, update, select, delete or 'dml' for create, alter...)
|
* @param string $type Type of SQL order ('ddl' for insert, update, select, delete or 'dml' for create, alter...)
|
||||||
* @param string $unescapeslashquot Unescape slash quote with quote quote
|
* @param bool $unescapeslashquot Unescape slash quote with quote quote
|
||||||
* @return string SQL request line converted
|
* @return string SQL request line converted
|
||||||
*/
|
*/
|
||||||
static function convertSQLFromMysql($line,$type='auto',$unescapeslashquot=0)
|
static function convertSQLFromMysql($line,$type='auto',$unescapeslashquot=false)
|
||||||
{
|
{
|
||||||
// Removed empty line if this is a comment line for SVN tagging
|
// Removed empty line if this is a comment line for SVN tagging
|
||||||
if (preg_match('/^--\s\$Id/i',$line)) {
|
if (preg_match('/^--\s\$Id/i',$line)) {
|
||||||
@ -353,7 +353,7 @@ class DoliDBPgsql extends DoliDB
|
|||||||
* On compare juste manuellement si la database choisie est bien celle activee par la connexion
|
* On compare juste manuellement si la database choisie est bien celle activee par la connexion
|
||||||
*
|
*
|
||||||
* @param string $database Name of database
|
* @param string $database Name of database
|
||||||
* @return boolean true if OK, false if KO
|
* @return bool true if OK, false if KO
|
||||||
*/
|
*/
|
||||||
function select_db($database)
|
function select_db($database)
|
||||||
{
|
{
|
||||||
@ -369,7 +369,7 @@ class DoliDBPgsql extends DoliDB
|
|||||||
* @param string $passwd Password
|
* @param string $passwd Password
|
||||||
* @param string $name Name of database (not used for mysql, used for pgsql)
|
* @param string $name Name of database (not used for mysql, used for pgsql)
|
||||||
* @param integer $port Port of database server
|
* @param integer $port Port of database server
|
||||||
* @return resource Database access handler
|
* @return false|resource Database access handler
|
||||||
* @see close
|
* @see close
|
||||||
*/
|
*/
|
||||||
function connect($host, $login, $passwd, $name, $port=0)
|
function connect($host, $login, $passwd, $name, $port=0)
|
||||||
@ -451,7 +451,7 @@ class DoliDBPgsql extends DoliDB
|
|||||||
if ($this->db)
|
if ($this->db)
|
||||||
{
|
{
|
||||||
if ($this->transaction_opened > 0) dol_syslog(get_class($this)."::close Closing a connection with an opened transaction depth=".$this->transaction_opened,LOG_ERR);
|
if ($this->transaction_opened > 0) dol_syslog(get_class($this)."::close Closing a connection with an opened transaction depth=".$this->transaction_opened,LOG_ERR);
|
||||||
$this->connected=0;
|
$this->connected=false;
|
||||||
return pg_close($this->db);
|
return pg_close($this->db);
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
@ -463,7 +463,7 @@ class DoliDBPgsql extends DoliDB
|
|||||||
* @param string $query SQL query string
|
* @param string $query SQL query string
|
||||||
* @param int $usesavepoint 0=Default mode, 1=Run a savepoint before and a rollback to savepoint if error (this allow to have some request with errors inside global transactions).
|
* @param int $usesavepoint 0=Default mode, 1=Run a savepoint before and a rollback to savepoint if error (this allow to have some request with errors inside global transactions).
|
||||||
* @param string $type Type of SQL order ('ddl' for insert, update, select, delete or 'dml' for create, alter...)
|
* @param string $type Type of SQL order ('ddl' for insert, update, select, delete or 'dml' for create, alter...)
|
||||||
* @return resource Resultset of answer
|
* @return false|resource Resultset of answer
|
||||||
*/
|
*/
|
||||||
function query($query,$usesavepoint=0,$type='auto')
|
function query($query,$usesavepoint=0,$type='auto')
|
||||||
{
|
{
|
||||||
@ -530,8 +530,8 @@ class DoliDBPgsql extends DoliDB
|
|||||||
/**
|
/**
|
||||||
* Renvoie la ligne courante (comme un objet) pour le curseur resultset
|
* Renvoie la ligne courante (comme un objet) pour le curseur resultset
|
||||||
*
|
*
|
||||||
* @param Resultset $resultset Curseur de la requete voulue
|
* @param resource $resultset Curseur de la requete voulue
|
||||||
* @return Object Object result line or false if KO or end of cursor
|
* @return false|object Object result line or false if KO or end of cursor
|
||||||
*/
|
*/
|
||||||
function fetch_object($resultset)
|
function fetch_object($resultset)
|
||||||
{
|
{
|
||||||
@ -544,7 +544,7 @@ class DoliDBPgsql extends DoliDB
|
|||||||
* Return datas as an array
|
* Return datas as an array
|
||||||
*
|
*
|
||||||
* @param resource $resultset Resultset of request
|
* @param resource $resultset Resultset of request
|
||||||
* @return array Array
|
* @return false|array Array
|
||||||
*/
|
*/
|
||||||
function fetch_array($resultset)
|
function fetch_array($resultset)
|
||||||
{
|
{
|
||||||
@ -557,7 +557,7 @@ class DoliDBPgsql extends DoliDB
|
|||||||
* Return datas as an array
|
* Return datas as an array
|
||||||
*
|
*
|
||||||
* @param resource $resultset Resultset of request
|
* @param resource $resultset Resultset of request
|
||||||
* @return array Array
|
* @return false|array Array
|
||||||
*/
|
*/
|
||||||
function fetch_row($resultset)
|
function fetch_row($resultset)
|
||||||
{
|
{
|
||||||
@ -569,8 +569,8 @@ class DoliDBPgsql extends DoliDB
|
|||||||
/**
|
/**
|
||||||
* Return number of lines for result of a SELECT
|
* Return number of lines for result of a SELECT
|
||||||
*
|
*
|
||||||
* @param Resultset $resultset Resulset of requests
|
* @param resourse $resultset Resulset of requests
|
||||||
* @return int Nb of lines
|
* @return int Nb of lines, -1 on error
|
||||||
* @see affected_rows
|
* @see affected_rows
|
||||||
*/
|
*/
|
||||||
function num_rows($resultset)
|
function num_rows($resultset)
|
||||||
@ -583,7 +583,7 @@ class DoliDBPgsql extends DoliDB
|
|||||||
/**
|
/**
|
||||||
* Renvoie le nombre de lignes dans le resultat d'une requete INSERT, DELETE ou UPDATE
|
* Renvoie le nombre de lignes dans le resultat d'une requete INSERT, DELETE ou UPDATE
|
||||||
*
|
*
|
||||||
* @param Resultset $resultset Result set of request
|
* @param resource $resultset Result set of request
|
||||||
* @return int Nb of lines
|
* @return int Nb of lines
|
||||||
* @see num_rows
|
* @see num_rows
|
||||||
*/
|
*/
|
||||||
@ -600,10 +600,10 @@ class DoliDBPgsql extends DoliDB
|
|||||||
/**
|
/**
|
||||||
* Libere le dernier resultset utilise sur cette connexion
|
* Libere le dernier resultset utilise sur cette connexion
|
||||||
*
|
*
|
||||||
* @param Resultset $resultset Result set of request
|
* @param resource $resultset Result set of request
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
function free($resultset=0)
|
function free($resultset=null)
|
||||||
{
|
{
|
||||||
// If resultset not provided, we take the last used by connexion
|
// If resultset not provided, we take the last used by connexion
|
||||||
if (! is_resource($resultset)) { $resultset=$this->_results; }
|
if (! is_resource($resultset)) { $resultset=$this->_results; }
|
||||||
@ -746,7 +746,7 @@ class DoliDBPgsql extends DoliDB
|
|||||||
*
|
*
|
||||||
* @param string $tab Table name concerned by insert. Ne sert pas sous MySql mais requis pour compatibilite avec Postgresql
|
* @param string $tab Table name concerned by insert. Ne sert pas sous MySql mais requis pour compatibilite avec Postgresql
|
||||||
* @param string $fieldid Field name
|
* @param string $fieldid Field name
|
||||||
* @return int Id of row
|
* @return string Id of row
|
||||||
*/
|
*/
|
||||||
function last_insert_id($tab,$fieldid='rowid')
|
function last_insert_id($tab,$fieldid='rowid')
|
||||||
{
|
{
|
||||||
@ -827,7 +827,7 @@ class DoliDBPgsql extends DoliDB
|
|||||||
* @param string $charset Charset used to store data
|
* @param string $charset Charset used to store data
|
||||||
* @param string $collation Charset used to sort data
|
* @param string $collation Charset used to sort data
|
||||||
* @param string $owner Username of database owner
|
* @param string $owner Username of database owner
|
||||||
* @return resource resource defined if OK, null if KO
|
* @return false|resource resource defined if OK, null if KO
|
||||||
*/
|
*/
|
||||||
function DDLCreateDb($database,$charset='',$collation='',$owner='')
|
function DDLCreateDb($database,$charset='',$collation='',$owner='')
|
||||||
{
|
{
|
||||||
@ -910,11 +910,13 @@ class DoliDBPgsql extends DoliDB
|
|||||||
* @param string $type Type de la table
|
* @param string $type Type de la table
|
||||||
* @param array $unique_keys Tableau associatifs Nom de champs qui seront clef unique => valeur
|
* @param array $unique_keys Tableau associatifs Nom de champs qui seront clef unique => valeur
|
||||||
* @param array $fulltext_keys Tableau des Nom de champs qui seront indexes en fulltext
|
* @param array $fulltext_keys Tableau des Nom de champs qui seront indexes en fulltext
|
||||||
* @param string $keys Tableau des champs cles noms => valeur
|
* @param array $keys Tableau des champs cles noms => valeur
|
||||||
* @return int <0 if KO, >=0 if OK
|
* @return int <0 if KO, >=0 if OK
|
||||||
*/
|
*/
|
||||||
function DDLCreateTable($table,$fields,$primary_key,$type,$unique_keys="",$fulltext_keys="",$keys="")
|
function DDLCreateTable($table,$fields,$primary_key,$type,$unique_keys=null,$fulltext_keys=null,$keys=null)
|
||||||
{
|
{
|
||||||
|
// FIXME: $fulltext_keys parameter is unused
|
||||||
|
|
||||||
// cles recherchees dans le tableau des descriptions (fields) : type,value,attribute,null,default,extra
|
// cles recherchees dans le tableau des descriptions (fields) : type,value,attribute,null,default,extra
|
||||||
// ex. : $fields['rowid'] = array('type'=>'int','value'=>'11','null'=>'not null','extra'=> 'auto_increment');
|
// ex. : $fields['rowid'] = array('type'=>'int','value'=>'11','null'=>'not null','extra'=> 'auto_increment');
|
||||||
$sql = "create table ".$table."(";
|
$sql = "create table ".$table."(";
|
||||||
@ -944,7 +946,7 @@ class DoliDBPgsql extends DoliDB
|
|||||||
if($primary_key != "")
|
if($primary_key != "")
|
||||||
$pk = "primary key(".$primary_key.")";
|
$pk = "primary key(".$primary_key.")";
|
||||||
|
|
||||||
if($unique_keys != "")
|
if(is_array($unique_keys))
|
||||||
{
|
{
|
||||||
$i = 0;
|
$i = 0;
|
||||||
foreach($unique_keys as $key => $value)
|
foreach($unique_keys as $key => $value)
|
||||||
@ -953,7 +955,7 @@ class DoliDBPgsql extends DoliDB
|
|||||||
$i++;
|
$i++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if($keys != "")
|
if(is_array($keys))
|
||||||
{
|
{
|
||||||
$i = 0;
|
$i = 0;
|
||||||
foreach($keys as $key => $value)
|
foreach($keys as $key => $value)
|
||||||
@ -965,9 +967,9 @@ class DoliDBPgsql extends DoliDB
|
|||||||
$sql .= implode(',',$sqlfields);
|
$sql .= implode(',',$sqlfields);
|
||||||
if($primary_key != "")
|
if($primary_key != "")
|
||||||
$sql .= ",".$pk;
|
$sql .= ",".$pk;
|
||||||
if($unique_keys != "")
|
if(is_array($unique_keys))
|
||||||
$sql .= ",".implode(',',$sqluq);
|
$sql .= ",".implode(',',$sqluq);
|
||||||
if($keys != "")
|
if(is_array($keys))
|
||||||
$sql .= ",".implode(',',$sqlk);
|
$sql .= ",".implode(',',$sqlk);
|
||||||
$sql .=") type=".$type;
|
$sql .=") type=".$type;
|
||||||
|
|
||||||
@ -1007,7 +1009,7 @@ class DoliDBPgsql extends DoliDB
|
|||||||
*
|
*
|
||||||
* @param string $table Name of table
|
* @param string $table Name of table
|
||||||
* @param string $field Optionnel : Name of field if we want description of field
|
* @param string $field Optionnel : Name of field if we want description of field
|
||||||
* @return resource Resultset x (x->attname)
|
* @return false|resource Resultset x (x->attname)
|
||||||
*/
|
*/
|
||||||
function DDLDescTable($table,$field="")
|
function DDLDescTable($table,$field="")
|
||||||
{
|
{
|
||||||
@ -1052,8 +1054,7 @@ class DoliDBPgsql extends DoliDB
|
|||||||
|
|
||||||
dol_syslog($sql,LOG_DEBUG);
|
dol_syslog($sql,LOG_DEBUG);
|
||||||
if(! $this -> query($sql))
|
if(! $this -> query($sql))
|
||||||
return -1;
|
return -1;
|
||||||
else
|
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1078,8 +1079,7 @@ class DoliDBPgsql extends DoliDB
|
|||||||
|
|
||||||
dol_syslog($sql,LOG_DEBUG);
|
dol_syslog($sql,LOG_DEBUG);
|
||||||
if (! $this->query($sql))
|
if (! $this->query($sql))
|
||||||
return -1;
|
return -1;
|
||||||
else
|
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1099,7 +1099,7 @@ class DoliDBPgsql extends DoliDB
|
|||||||
$this->error=$this->lasterror();
|
$this->error=$this->lasterror();
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
else return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@ -37,7 +37,7 @@ class DoliDBSqlite extends DoliDB
|
|||||||
const LABEL='PDO Sqlite';
|
const LABEL='PDO Sqlite';
|
||||||
//! Version min database
|
//! Version min database
|
||||||
const VERSIONMIN='3.0.0';
|
const VERSIONMIN='3.0.0';
|
||||||
//! Resultset of last query
|
/** @var PDOStatement Resultset of last query */
|
||||||
private $_results;
|
private $_results;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -54,7 +54,7 @@ class DoliDBSqlite extends DoliDB
|
|||||||
*/
|
*/
|
||||||
function __construct($type, $host, $user, $pass, $name='', $port=0)
|
function __construct($type, $host, $user, $pass, $name='', $port=0)
|
||||||
{
|
{
|
||||||
global $conf,$langs;
|
global $conf;
|
||||||
|
|
||||||
// Note that having "static" property for "$forcecharset" and "$forcecollate" will make error here in strict mode, so they are not static
|
// Note that having "static" property for "$forcecharset" and "$forcecollate" will make error here in strict mode, so they are not static
|
||||||
if (! empty($conf->db->character_set)) $this->forcecharset=$conf->db->character_set;
|
if (! empty($conf->db->character_set)) $this->forcecharset=$conf->db->character_set;
|
||||||
@ -70,8 +70,8 @@ class DoliDBSqlite extends DoliDB
|
|||||||
|
|
||||||
/*if (! function_exists("sqlite_query"))
|
/*if (! function_exists("sqlite_query"))
|
||||||
{
|
{
|
||||||
$this->connected = 0;
|
$this->connected = false;
|
||||||
$this->ok = 0;
|
$this->ok = false;
|
||||||
$this->error="Sqlite PHP functions for using Sqlite driver are not available in this version of PHP. Try to use another driver.";
|
$this->error="Sqlite PHP functions for using Sqlite driver are not available in this version of PHP. Try to use another driver.";
|
||||||
dol_syslog(get_class($this)."::DoliDBSqlite : Sqlite PHP functions for using Sqlite driver are not available in this version of PHP. Try to use another driver.",LOG_ERR);
|
dol_syslog(get_class($this)."::DoliDBSqlite : Sqlite PHP functions for using Sqlite driver are not available in this version of PHP. Try to use another driver.",LOG_ERR);
|
||||||
return $this->ok;
|
return $this->ok;
|
||||||
@ -79,8 +79,8 @@ class DoliDBSqlite extends DoliDB
|
|||||||
|
|
||||||
/*if (! $host)
|
/*if (! $host)
|
||||||
{
|
{
|
||||||
$this->connected = 0;
|
$this->connected = false;
|
||||||
$this->ok = 0;
|
$this->ok = false;
|
||||||
$this->error=$langs->trans("ErrorWrongHostParameter");
|
$this->error=$langs->trans("ErrorWrongHostParameter");
|
||||||
dol_syslog(get_class($this)."::DoliDBSqlite : Erreur Connect, wrong host parameters",LOG_ERR);
|
dol_syslog(get_class($this)."::DoliDBSqlite : Erreur Connect, wrong host parameters",LOG_ERR);
|
||||||
return $this->ok;
|
return $this->ok;
|
||||||
@ -92,9 +92,9 @@ class DoliDBSqlite extends DoliDB
|
|||||||
|
|
||||||
if ($this->db)
|
if ($this->db)
|
||||||
{
|
{
|
||||||
$this->connected = 1;
|
$this->connected = true;
|
||||||
$this->ok = 1;
|
$this->ok = true;
|
||||||
$this->database_selected = 1;
|
$this->database_selected = true;
|
||||||
$this->database_name = $name;
|
$this->database_name = $name;
|
||||||
|
|
||||||
$this->db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
|
$this->db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
|
||||||
@ -102,15 +102,15 @@ class DoliDBSqlite extends DoliDB
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
// host, login ou password incorrect
|
// host, login ou password incorrect
|
||||||
$this->connected = 0;
|
$this->connected = false;
|
||||||
$this->ok = 0;
|
$this->ok = false;
|
||||||
$this->database_selected = 0;
|
$this->database_selected = false;
|
||||||
$this->database_name = '';
|
$this->database_name = '';
|
||||||
//$this->error=sqlite_connect_error();
|
//$this->error=sqlite_connect_error();
|
||||||
dol_syslog(get_class($this)."::DoliDBSqlite : Erreur Connect ".$this->error,LOG_ERR);
|
dol_syslog(get_class($this)."::DoliDBSqlite : Erreur Connect ".$this->error,LOG_ERR);
|
||||||
}
|
}
|
||||||
|
|
||||||
return $this->ok;
|
return (int) $this->ok;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -285,6 +285,7 @@ class DoliDBSqlite extends DoliDB
|
|||||||
function select_db($database)
|
function select_db($database)
|
||||||
{
|
{
|
||||||
dol_syslog(get_class($this)."::select_db database=".$database, LOG_DEBUG);
|
dol_syslog(get_class($this)."::select_db database=".$database, LOG_DEBUG);
|
||||||
|
// FIXME: sqlite_select_db() does not exist
|
||||||
return sqlite_select_db($this->db,$database);
|
return sqlite_select_db($this->db,$database);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -297,12 +298,12 @@ class DoliDBSqlite extends DoliDB
|
|||||||
* @param string $passwd password
|
* @param string $passwd password
|
||||||
* @param string $name name of database (not used for mysql, used for pgsql)
|
* @param string $name name of database (not used for mysql, used for pgsql)
|
||||||
* @param integer $port Port of database server
|
* @param integer $port Port of database server
|
||||||
* @return resource Database access handler
|
* @return PDO Database access handler
|
||||||
* @see close
|
* @see close
|
||||||
*/
|
*/
|
||||||
function connect($host, $login, $passwd, $name, $port=0)
|
function connect($host, $login, $passwd, $name, $port=0)
|
||||||
{
|
{
|
||||||
global $conf,$main_data_dir;
|
global $main_data_dir;
|
||||||
|
|
||||||
dol_syslog(get_class($this)."::connect name=".$name,LOG_DEBUG);
|
dol_syslog(get_class($this)."::connect name=".$name,LOG_DEBUG);
|
||||||
|
|
||||||
@ -352,7 +353,7 @@ class DoliDBSqlite extends DoliDB
|
|||||||
/**
|
/**
|
||||||
* Close database connexion
|
* Close database connexion
|
||||||
*
|
*
|
||||||
* @return boolean True if disconnect successfull, false otherwise
|
* @return bool True if disconnect successfull, false otherwise
|
||||||
* @see connect
|
* @see connect
|
||||||
*/
|
*/
|
||||||
function close()
|
function close()
|
||||||
@ -360,7 +361,7 @@ class DoliDBSqlite extends DoliDB
|
|||||||
if ($this->db)
|
if ($this->db)
|
||||||
{
|
{
|
||||||
if ($this->transaction_opened > 0) dol_syslog(get_class($this)."::close Closing a connection with an opened transaction depth=".$this->transaction_opened,LOG_ERR);
|
if ($this->transaction_opened > 0) dol_syslog(get_class($this)."::close Closing a connection with an opened transaction depth=".$this->transaction_opened,LOG_ERR);
|
||||||
$this->connected=0;
|
$this->connected=false;
|
||||||
$this->db=null; // Clean this->db
|
$this->db=null; // Clean this->db
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@ -374,13 +375,11 @@ class DoliDBSqlite extends DoliDB
|
|||||||
* @param int $usesavepoint 0=Default mode, 1=Run a savepoint before and a rollbock to savepoint if error (this allow to have some request with errors inside global transactions).
|
* @param int $usesavepoint 0=Default mode, 1=Run a savepoint before and a rollbock to savepoint if error (this allow to have some request with errors inside global transactions).
|
||||||
* Note that with Mysql, this parameter is not used as Myssql can already commit a transaction even if one request is in error, without using savepoints.
|
* Note that with Mysql, this parameter is not used as Myssql can already commit a transaction even if one request is in error, without using savepoints.
|
||||||
* @param string $type Type of SQL order ('ddl' for insert, update, select, delete or 'dml' for create, alter...)
|
* @param string $type Type of SQL order ('ddl' for insert, update, select, delete or 'dml' for create, alter...)
|
||||||
* @return resource Resultset of answer
|
* @return PDOStatement Resultset of answer
|
||||||
*/
|
*/
|
||||||
function query($query,$usesavepoint=0,$type='auto')
|
function query($query,$usesavepoint=0,$type='auto')
|
||||||
{
|
{
|
||||||
$errmsg='';
|
$ret=null;
|
||||||
|
|
||||||
$ret='';
|
|
||||||
$query = trim($query);
|
$query = trim($query);
|
||||||
$this->error = 0;
|
$this->error = 0;
|
||||||
|
|
||||||
@ -429,8 +428,8 @@ class DoliDBSqlite extends DoliDB
|
|||||||
/**
|
/**
|
||||||
* Renvoie la ligne courante (comme un objet) pour le curseur resultset
|
* Renvoie la ligne courante (comme un objet) pour le curseur resultset
|
||||||
*
|
*
|
||||||
* @param Resultset $resultset Curseur de la requete voulue
|
* @param PDOStatement $resultset Curseur de la requete voulue
|
||||||
* @return Object Object result line or false if KO or end of cursor
|
* @return false|object Object result line or false if KO or end of cursor
|
||||||
*/
|
*/
|
||||||
function fetch_object($resultset)
|
function fetch_object($resultset)
|
||||||
{
|
{
|
||||||
@ -443,8 +442,8 @@ class DoliDBSqlite extends DoliDB
|
|||||||
/**
|
/**
|
||||||
* Return datas as an array
|
* Return datas as an array
|
||||||
*
|
*
|
||||||
* @param Resultset $resultset Resultset of request
|
* @param PDOStatement $resultset Resultset of request
|
||||||
* @return array Array
|
* @return false|array Array or false if KO or end of cursor
|
||||||
*/
|
*/
|
||||||
function fetch_array($resultset)
|
function fetch_array($resultset)
|
||||||
{
|
{
|
||||||
@ -456,8 +455,8 @@ class DoliDBSqlite extends DoliDB
|
|||||||
/**
|
/**
|
||||||
* Return datas as an array
|
* Return datas as an array
|
||||||
*
|
*
|
||||||
* @param resource $resultset Resultset of request
|
* @param PDOStatement $resultset Resultset of request
|
||||||
* @return array Array
|
* @return false|array Array or false if KO or end of cursor
|
||||||
*/
|
*/
|
||||||
function fetch_row($resultset)
|
function fetch_row($resultset)
|
||||||
{
|
{
|
||||||
@ -477,7 +476,7 @@ class DoliDBSqlite extends DoliDB
|
|||||||
/**
|
/**
|
||||||
* Return number of lines for result of a SELECT
|
* Return number of lines for result of a SELECT
|
||||||
*
|
*
|
||||||
* @param Resultset $resultset Resulset of requests
|
* @param PDOStatement $resultset Resulset of requests
|
||||||
* @return int Nb of lines
|
* @return int Nb of lines
|
||||||
* @see affected_rows
|
* @see affected_rows
|
||||||
*/
|
*/
|
||||||
@ -491,7 +490,7 @@ class DoliDBSqlite extends DoliDB
|
|||||||
/**
|
/**
|
||||||
* Return number of lines for result of a SELECT
|
* Return number of lines for result of a SELECT
|
||||||
*
|
*
|
||||||
* @param Resultset $resultset Resulset of requests
|
* @param PDOStatement $resultset Resulset of requests
|
||||||
* @return int Nb of lines
|
* @return int Nb of lines
|
||||||
* @see affected_rows
|
* @see affected_rows
|
||||||
*/
|
*/
|
||||||
@ -508,10 +507,10 @@ class DoliDBSqlite extends DoliDB
|
|||||||
/**
|
/**
|
||||||
* Free last resultset used.
|
* Free last resultset used.
|
||||||
*
|
*
|
||||||
* @param integer $resultset Curseur de la requete voulue
|
* @param PDOStatement $resultset Curseur de la requete voulue
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
function free($resultset=0)
|
function free($resultset=null)
|
||||||
{
|
{
|
||||||
// If resultset not provided, we take the last used by connexion
|
// If resultset not provided, we take the last used by connexion
|
||||||
if (! is_object($resultset)) { $resultset=$this->_results; }
|
if (! is_object($resultset)) { $resultset=$this->_results; }
|
||||||
@ -709,7 +708,7 @@ class DoliDBSqlite extends DoliDB
|
|||||||
* @param string $charset Charset used to store data
|
* @param string $charset Charset used to store data
|
||||||
* @param string $collation Charset used to sort data
|
* @param string $collation Charset used to sort data
|
||||||
* @param string $owner Username of database owner
|
* @param string $owner Username of database owner
|
||||||
* @return resource resource defined if OK, null if KO
|
* @return PDOStatement resource defined if OK, null if KO
|
||||||
*/
|
*/
|
||||||
function DDLCreateDb($database,$charset='',$collation='',$owner='')
|
function DDLCreateDb($database,$charset='',$collation='',$owner='')
|
||||||
{
|
{
|
||||||
@ -786,11 +785,13 @@ class DoliDBSqlite extends DoliDB
|
|||||||
* @param string $type Type de la table
|
* @param string $type Type de la table
|
||||||
* @param array $unique_keys Tableau associatifs Nom de champs qui seront clef unique => valeur
|
* @param array $unique_keys Tableau associatifs Nom de champs qui seront clef unique => valeur
|
||||||
* @param array $fulltext_keys Tableau des Nom de champs qui seront indexes en fulltext
|
* @param array $fulltext_keys Tableau des Nom de champs qui seront indexes en fulltext
|
||||||
* @param string $keys Tableau des champs cles noms => valeur
|
* @param array $keys Tableau des champs cles noms => valeur
|
||||||
* @return int <0 if KO, >=0 if OK
|
* @return int <0 if KO, >=0 if OK
|
||||||
*/
|
*/
|
||||||
function DDLCreateTable($table,$fields,$primary_key,$type,$unique_keys="",$fulltext_keys="",$keys="")
|
function DDLCreateTable($table,$fields,$primary_key,$type,$unique_keys=null,$fulltext_keys=null,$keys=null)
|
||||||
{
|
{
|
||||||
|
// FIXME: $fulltext_keys parameter is unused
|
||||||
|
|
||||||
// cles recherchees dans le tableau des descriptions (fields) : type,value,attribute,null,default,extra
|
// cles recherchees dans le tableau des descriptions (fields) : type,value,attribute,null,default,extra
|
||||||
// ex. : $fields['rowid'] = array('type'=>'int','value'=>'11','null'=>'not null','extra'=> 'auto_increment');
|
// ex. : $fields['rowid'] = array('type'=>'int','value'=>'11','null'=>'not null','extra'=> 'auto_increment');
|
||||||
$sql = "create table ".$table."(";
|
$sql = "create table ".$table."(";
|
||||||
@ -820,7 +821,7 @@ class DoliDBSqlite extends DoliDB
|
|||||||
if($primary_key != "")
|
if($primary_key != "")
|
||||||
$pk = "primary key(".$primary_key.")";
|
$pk = "primary key(".$primary_key.")";
|
||||||
|
|
||||||
if($unique_keys != "")
|
if(is_array($unique_keys))
|
||||||
{
|
{
|
||||||
$i = 0;
|
$i = 0;
|
||||||
foreach($unique_keys as $key => $value)
|
foreach($unique_keys as $key => $value)
|
||||||
@ -829,7 +830,7 @@ class DoliDBSqlite extends DoliDB
|
|||||||
$i++;
|
$i++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if($keys != "")
|
if(is_array($keys))
|
||||||
{
|
{
|
||||||
$i = 0;
|
$i = 0;
|
||||||
foreach($keys as $key => $value)
|
foreach($keys as $key => $value)
|
||||||
@ -841,9 +842,9 @@ class DoliDBSqlite extends DoliDB
|
|||||||
$sql .= implode(',',$sqlfields);
|
$sql .= implode(',',$sqlfields);
|
||||||
if($primary_key != "")
|
if($primary_key != "")
|
||||||
$sql .= ",".$pk;
|
$sql .= ",".$pk;
|
||||||
if($unique_keys != "")
|
if(is_array($unique_keys))
|
||||||
$sql .= ",".implode(',',$sqluq);
|
$sql .= ",".implode(',',$sqluq);
|
||||||
if($keys != "")
|
if(is_array($keys))
|
||||||
$sql .= ",".implode(',',$sqlk);
|
$sql .= ",".implode(',',$sqlk);
|
||||||
$sql .=") type=".$type;
|
$sql .=") type=".$type;
|
||||||
|
|
||||||
|
|||||||
@ -4,6 +4,7 @@
|
|||||||
* Copyright (C) 2004-2011 Laurent Destailleur <eldy@users.sourceforge.net>
|
* Copyright (C) 2004-2011 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||||
* Copyright (C) 2006 Andre Cianfarani <acianfa@free.fr>
|
* Copyright (C) 2006 Andre Cianfarani <acianfa@free.fr>
|
||||||
* Copyright (C) 2005-2009 Regis Houssin <regis.houssin@capnetworks.com>
|
* Copyright (C) 2005-2009 Regis Houssin <regis.houssin@capnetworks.com>
|
||||||
|
* Copyright (C) 2015 Raphaël Doursenaud <rdoursenaud@gpcsolutions.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
|
||||||
@ -21,13 +22,13 @@
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* \file htdocs/core/db/sqlite.class.php
|
* \file htdocs/core/db/sqlite.class.php
|
||||||
* \brief Class file to manage Dolibarr database access for a Sqlite database
|
* \brief Class file to manage Dolibarr database access for a SQLite database
|
||||||
*/
|
*/
|
||||||
|
|
||||||
require_once DOL_DOCUMENT_ROOT .'/core/db/DoliDB.class.php';
|
require_once DOL_DOCUMENT_ROOT .'/core/db/DoliDB.class.php';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Class to manage Dolibarr database access for a Sqlite database
|
* Class to manage Dolibarr database access for a SQLite database
|
||||||
*/
|
*/
|
||||||
class DoliDBSqlite3 extends DoliDB
|
class DoliDBSqlite3 extends DoliDB
|
||||||
{
|
{
|
||||||
@ -37,8 +38,8 @@ class DoliDBSqlite3 extends DoliDB
|
|||||||
const LABEL='Sqlite3';
|
const LABEL='Sqlite3';
|
||||||
//! Version min database
|
//! Version min database
|
||||||
const VERSIONMIN='3.0.0';
|
const VERSIONMIN='3.0.0';
|
||||||
//! Resultset of last query
|
/** @var SQLite3Result Resultset of last query */
|
||||||
private $_results;
|
private $_results;
|
||||||
|
|
||||||
const WEEK_MONDAY_FIRST=1;
|
const WEEK_MONDAY_FIRST=1;
|
||||||
const WEEK_YEAR = 2;
|
const WEEK_YEAR = 2;
|
||||||
@ -58,7 +59,7 @@ class DoliDBSqlite3 extends DoliDB
|
|||||||
*/
|
*/
|
||||||
function __construct($type, $host, $user, $pass, $name='', $port=0)
|
function __construct($type, $host, $user, $pass, $name='', $port=0)
|
||||||
{
|
{
|
||||||
global $conf,$langs;
|
global $conf;
|
||||||
|
|
||||||
// Note that having "static" property for "$forcecharset" and "$forcecollate" will make error here in strict mode, so they are not static
|
// Note that having "static" property for "$forcecharset" and "$forcecollate" will make error here in strict mode, so they are not static
|
||||||
if (! empty($conf->db->character_set)) $this->forcecharset=$conf->db->character_set;
|
if (! empty($conf->db->character_set)) $this->forcecharset=$conf->db->character_set;
|
||||||
@ -74,8 +75,8 @@ class DoliDBSqlite3 extends DoliDB
|
|||||||
|
|
||||||
/*if (! function_exists("sqlite_query"))
|
/*if (! function_exists("sqlite_query"))
|
||||||
{
|
{
|
||||||
$this->connected = 0;
|
$this->connected = false;
|
||||||
$this->ok = 0;
|
$this->ok = false;
|
||||||
$this->error="Sqlite PHP functions for using Sqlite driver are not available in this version of PHP. Try to use another driver.";
|
$this->error="Sqlite PHP functions for using Sqlite driver are not available in this version of PHP. Try to use another driver.";
|
||||||
dol_syslog(get_class($this)."::DoliDBSqlite3 : Sqlite PHP functions for using Sqlite driver are not available in this version of PHP. Try to use another driver.",LOG_ERR);
|
dol_syslog(get_class($this)."::DoliDBSqlite3 : Sqlite PHP functions for using Sqlite driver are not available in this version of PHP. Try to use another driver.",LOG_ERR);
|
||||||
return $this->ok;
|
return $this->ok;
|
||||||
@ -83,8 +84,8 @@ class DoliDBSqlite3 extends DoliDB
|
|||||||
|
|
||||||
/*if (! $host)
|
/*if (! $host)
|
||||||
{
|
{
|
||||||
$this->connected = 0;
|
$this->connected = false;
|
||||||
$this->ok = 0;
|
$this->ok = false;
|
||||||
$this->error=$langs->trans("ErrorWrongHostParameter");
|
$this->error=$langs->trans("ErrorWrongHostParameter");
|
||||||
dol_syslog(get_class($this)."::DoliDBSqlite3 : Erreur Connect, wrong host parameters",LOG_ERR);
|
dol_syslog(get_class($this)."::DoliDBSqlite3 : Erreur Connect, wrong host parameters",LOG_ERR);
|
||||||
return $this->ok;
|
return $this->ok;
|
||||||
@ -96,9 +97,9 @@ class DoliDBSqlite3 extends DoliDB
|
|||||||
|
|
||||||
if ($this->db)
|
if ($this->db)
|
||||||
{
|
{
|
||||||
$this->connected = 1;
|
$this->connected = true;
|
||||||
$this->ok = 1;
|
$this->ok = true;
|
||||||
$this->database_selected = 1;
|
$this->database_selected = true;
|
||||||
$this->database_name = $name;
|
$this->database_name = $name;
|
||||||
|
|
||||||
$this->addCustomFunction('IF');
|
$this->addCustomFunction('IF');
|
||||||
@ -114,9 +115,9 @@ class DoliDBSqlite3 extends DoliDB
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
// host, login ou password incorrect
|
// host, login ou password incorrect
|
||||||
$this->connected = 0;
|
$this->connected = false;
|
||||||
$this->ok = 0;
|
$this->ok = false;
|
||||||
$this->database_selected = 0;
|
$this->database_selected = false;
|
||||||
$this->database_name = '';
|
$this->database_name = '';
|
||||||
//$this->error=sqlite_connect_error();
|
//$this->error=sqlite_connect_error();
|
||||||
dol_syslog(get_class($this)."::DoliDBSqlite3 : Error Connect ".$this->error,LOG_ERR);
|
dol_syslog(get_class($this)."::DoliDBSqlite3 : Error Connect ".$this->error,LOG_ERR);
|
||||||
@ -304,6 +305,7 @@ class DoliDBSqlite3 extends DoliDB
|
|||||||
function select_db($database)
|
function select_db($database)
|
||||||
{
|
{
|
||||||
dol_syslog(get_class($this)."::select_db database=".$database, LOG_DEBUG);
|
dol_syslog(get_class($this)."::select_db database=".$database, LOG_DEBUG);
|
||||||
|
// FIXME: sqlite_select_db() does not exist
|
||||||
return sqlite_select_db($this->db,$database);
|
return sqlite_select_db($this->db,$database);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -316,12 +318,12 @@ class DoliDBSqlite3 extends DoliDB
|
|||||||
* @param string $passwd password
|
* @param string $passwd password
|
||||||
* @param string $name name of database (not used for mysql, used for pgsql)
|
* @param string $name name of database (not used for mysql, used for pgsql)
|
||||||
* @param integer $port Port of database server
|
* @param integer $port Port of database server
|
||||||
* @return resource Database access handler
|
* @return SQLite3 Database access handler
|
||||||
* @see close
|
* @see close
|
||||||
*/
|
*/
|
||||||
function connect($host, $login, $passwd, $name, $port=0)
|
function connect($host, $login, $passwd, $name, $port=0)
|
||||||
{
|
{
|
||||||
global $conf,$main_data_dir;
|
global $main_data_dir;
|
||||||
|
|
||||||
dol_syslog(get_class($this)."::connect name=".$name,LOG_DEBUG);
|
dol_syslog(get_class($this)."::connect name=".$name,LOG_DEBUG);
|
||||||
|
|
||||||
@ -372,7 +374,7 @@ class DoliDBSqlite3 extends DoliDB
|
|||||||
/**
|
/**
|
||||||
* Close database connexion
|
* Close database connexion
|
||||||
*
|
*
|
||||||
* @return boolean True if disconnect successfull, false otherwise
|
* @return bool True if disconnect successfull, false otherwise
|
||||||
* @see connect
|
* @see connect
|
||||||
*/
|
*/
|
||||||
function close()
|
function close()
|
||||||
@ -380,9 +382,9 @@ class DoliDBSqlite3 extends DoliDB
|
|||||||
if ($this->db)
|
if ($this->db)
|
||||||
{
|
{
|
||||||
if ($this->transaction_opened > 0) dol_syslog(get_class($this)."::close Closing a connection with an opened transaction depth=".$this->transaction_opened,LOG_ERR);
|
if ($this->transaction_opened > 0) dol_syslog(get_class($this)."::close Closing a connection with an opened transaction depth=".$this->transaction_opened,LOG_ERR);
|
||||||
$this->connected=0;
|
$this->connected=false;
|
||||||
$this->db->close();
|
$this->db->close();
|
||||||
$this->db=null; // Clean this->db
|
unset($this->db); // Clean this->db
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
@ -395,13 +397,11 @@ class DoliDBSqlite3 extends DoliDB
|
|||||||
* @param int $usesavepoint 0=Default mode, 1=Run a savepoint before and a rollbock to savepoint if error (this allow to have some request with errors inside global transactions).
|
* @param int $usesavepoint 0=Default mode, 1=Run a savepoint before and a rollbock to savepoint if error (this allow to have some request with errors inside global transactions).
|
||||||
* Note that with Mysql, this parameter is not used as Myssql can already commit a transaction even if one request is in error, without using savepoints.
|
* Note that with Mysql, this parameter is not used as Myssql can already commit a transaction even if one request is in error, without using savepoints.
|
||||||
* @param string $type Type of SQL order ('ddl' for insert, update, select, delete or 'dml' for create, alter...)
|
* @param string $type Type of SQL order ('ddl' for insert, update, select, delete or 'dml' for create, alter...)
|
||||||
* @return resource Resultset of answer
|
* @return SQLite3Result Resultset of answer
|
||||||
*/
|
*/
|
||||||
function query($query,$usesavepoint=0,$type='auto')
|
function query($query,$usesavepoint=0,$type='auto')
|
||||||
{
|
{
|
||||||
$errmsg='';
|
$ret=null;
|
||||||
|
|
||||||
$ret='';
|
|
||||||
$query = trim($query);
|
$query = trim($query);
|
||||||
$this->error = 0;
|
$this->error = 0;
|
||||||
|
|
||||||
@ -492,8 +492,8 @@ class DoliDBSqlite3 extends DoliDB
|
|||||||
/**
|
/**
|
||||||
* Renvoie la ligne courante (comme un objet) pour le curseur resultset
|
* Renvoie la ligne courante (comme un objet) pour le curseur resultset
|
||||||
*
|
*
|
||||||
* @param Resultset $resultset Curseur de la requete voulue
|
* @param SQLite3Result $resultset Curseur de la requete voulue
|
||||||
* @return Object Object result line or false if KO or end of cursor
|
* @return false|object Object result line or false if KO or end of cursor
|
||||||
*/
|
*/
|
||||||
function fetch_object($resultset)
|
function fetch_object($resultset)
|
||||||
{
|
{
|
||||||
@ -504,14 +504,15 @@ class DoliDBSqlite3 extends DoliDB
|
|||||||
if ($ret) {
|
if ($ret) {
|
||||||
return (object) $ret;
|
return (object) $ret;
|
||||||
}
|
}
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Return datas as an array
|
* Return datas as an array
|
||||||
*
|
*
|
||||||
* @param Resultset $resultset Resultset of request
|
* @param SQLite3Result $resultset Resultset of request
|
||||||
* @return array Array
|
* @return false|array Array or false if KO or end of cursor
|
||||||
*/
|
*/
|
||||||
function fetch_array($resultset)
|
function fetch_array($resultset)
|
||||||
{
|
{
|
||||||
@ -519,16 +520,14 @@ class DoliDBSqlite3 extends DoliDB
|
|||||||
if (! is_object($resultset)) { $resultset=$this->_results; }
|
if (! is_object($resultset)) { $resultset=$this->_results; }
|
||||||
//return $resultset->fetch(PDO::FETCH_ASSOC);
|
//return $resultset->fetch(PDO::FETCH_ASSOC);
|
||||||
$ret = $resultset->fetchArray(SQLITE3_ASSOC);
|
$ret = $resultset->fetchArray(SQLITE3_ASSOC);
|
||||||
if ($ret) {
|
return $ret;
|
||||||
return (array) $ret;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Return datas as an array
|
* Return datas as an array
|
||||||
*
|
*
|
||||||
* @param resource $resultset Resultset of request
|
* @param SQLite3Result $resultset Resultset of request
|
||||||
* @return array Array
|
* @return false|array Array or false if KO or end of cursor
|
||||||
*/
|
*/
|
||||||
function fetch_row($resultset)
|
function fetch_row($resultset)
|
||||||
{
|
{
|
||||||
@ -541,19 +540,21 @@ class DoliDBSqlite3 extends DoliDB
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
// si le curseur est un booleen on retourne la valeur 0
|
// si le curseur est un booleen on retourne la valeur 0
|
||||||
return 0;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Return number of lines for result of a SELECT
|
* Return number of lines for result of a SELECT
|
||||||
*
|
*
|
||||||
* @param Resultset $resultset Resulset of requests
|
* @param SQLite3Result $resultset Resulset of requests
|
||||||
* @return int Nb of lines
|
* @return int Nb of lines
|
||||||
* @see affected_rows
|
* @see affected_rows
|
||||||
*/
|
*/
|
||||||
function num_rows($resultset)
|
function num_rows($resultset)
|
||||||
{
|
{
|
||||||
|
// FIXME: SQLite3Result does not have a queryString member
|
||||||
|
|
||||||
// If resultset not provided, we take the last used by connexion
|
// If resultset not provided, we take the last used by connexion
|
||||||
if (! is_object($resultset)) { $resultset=$this->_results; }
|
if (! is_object($resultset)) { $resultset=$this->_results; }
|
||||||
if (preg_match("/^SELECT/i", $resultset->queryString)) {
|
if (preg_match("/^SELECT/i", $resultset->queryString)) {
|
||||||
@ -565,12 +566,14 @@ class DoliDBSqlite3 extends DoliDB
|
|||||||
/**
|
/**
|
||||||
* Return number of lines for result of a SELECT
|
* Return number of lines for result of a SELECT
|
||||||
*
|
*
|
||||||
* @param Resultset $resultset Resulset of requests
|
* @param SQLite3Result $resultset Resulset of requests
|
||||||
* @return int Nb of lines
|
* @return int Nb of lines
|
||||||
* @see affected_rows
|
* @see affected_rows
|
||||||
*/
|
*/
|
||||||
function affected_rows($resultset)
|
function affected_rows($resultset)
|
||||||
{
|
{
|
||||||
|
// FIXME: SQLite3Result does not have a queryString member
|
||||||
|
|
||||||
// If resultset not provided, we take the last used by connexion
|
// If resultset not provided, we take the last used by connexion
|
||||||
if (! is_object($resultset)) { $resultset=$this->_results; }
|
if (! is_object($resultset)) { $resultset=$this->_results; }
|
||||||
if (preg_match("/^SELECT/i", $resultset->queryString)) {
|
if (preg_match("/^SELECT/i", $resultset->queryString)) {
|
||||||
@ -585,10 +588,10 @@ class DoliDBSqlite3 extends DoliDB
|
|||||||
/**
|
/**
|
||||||
* Free last resultset used.
|
* Free last resultset used.
|
||||||
*
|
*
|
||||||
* @param integer $resultset Curseur de la requete voulue
|
* @param SQLite3Result $resultset Curseur de la requete voulue
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
function free($resultset=0)
|
function free($resultset=null)
|
||||||
{
|
{
|
||||||
// If resultset not provided, we take the last used by connexion
|
// If resultset not provided, we take the last used by connexion
|
||||||
if (! is_object($resultset)) { $resultset=$this->_results; }
|
if (! is_object($resultset)) { $resultset=$this->_results; }
|
||||||
@ -789,7 +792,7 @@ class DoliDBSqlite3 extends DoliDB
|
|||||||
* @param string $charset Charset used to store data
|
* @param string $charset Charset used to store data
|
||||||
* @param string $collation Charset used to sort data
|
* @param string $collation Charset used to sort data
|
||||||
* @param string $owner Username of database owner
|
* @param string $owner Username of database owner
|
||||||
* @return resource resource defined if OK, null if KO
|
* @return SQLite3Result resource defined if OK, null if KO
|
||||||
*/
|
*/
|
||||||
function DDLCreateDb($database,$charset='',$collation='',$owner='')
|
function DDLCreateDb($database,$charset='',$collation='',$owner='')
|
||||||
{
|
{
|
||||||
@ -866,11 +869,13 @@ class DoliDBSqlite3 extends DoliDB
|
|||||||
* @param string $type Type de la table
|
* @param string $type Type de la table
|
||||||
* @param array $unique_keys Tableau associatifs Nom de champs qui seront clef unique => valeur
|
* @param array $unique_keys Tableau associatifs Nom de champs qui seront clef unique => valeur
|
||||||
* @param array $fulltext_keys Tableau des Nom de champs qui seront indexes en fulltext
|
* @param array $fulltext_keys Tableau des Nom de champs qui seront indexes en fulltext
|
||||||
* @param string $keys Tableau des champs cles noms => valeur
|
* @param array $keys Tableau des champs cles noms => valeur
|
||||||
* @return int <0 if KO, >=0 if OK
|
* @return int <0 if KO, >=0 if OK
|
||||||
*/
|
*/
|
||||||
function DDLCreateTable($table,$fields,$primary_key,$type,$unique_keys="",$fulltext_keys="",$keys="")
|
function DDLCreateTable($table,$fields,$primary_key,$type,$unique_keys=null,$fulltext_keys=null,$keys=null)
|
||||||
{
|
{
|
||||||
|
// FIXME: $fulltext_keys parameter is unused
|
||||||
|
|
||||||
// cles recherchees dans le tableau des descriptions (fields) : type,value,attribute,null,default,extra
|
// cles recherchees dans le tableau des descriptions (fields) : type,value,attribute,null,default,extra
|
||||||
// ex. : $fields['rowid'] = array('type'=>'int','value'=>'11','null'=>'not null','extra'=> 'auto_increment');
|
// ex. : $fields['rowid'] = array('type'=>'int','value'=>'11','null'=>'not null','extra'=> 'auto_increment');
|
||||||
$sql = "create table ".$table."(";
|
$sql = "create table ".$table."(";
|
||||||
@ -900,7 +905,7 @@ class DoliDBSqlite3 extends DoliDB
|
|||||||
if($primary_key != "")
|
if($primary_key != "")
|
||||||
$pk = "primary key(".$primary_key.")";
|
$pk = "primary key(".$primary_key.")";
|
||||||
|
|
||||||
if($unique_keys != "")
|
if(is_array($unique_keys))
|
||||||
{
|
{
|
||||||
$i = 0;
|
$i = 0;
|
||||||
foreach($unique_keys as $key => $value)
|
foreach($unique_keys as $key => $value)
|
||||||
@ -909,7 +914,7 @@ class DoliDBSqlite3 extends DoliDB
|
|||||||
$i++;
|
$i++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if($keys != "")
|
if(is_array($keys))
|
||||||
{
|
{
|
||||||
$i = 0;
|
$i = 0;
|
||||||
foreach($keys as $key => $value)
|
foreach($keys as $key => $value)
|
||||||
@ -921,16 +926,15 @@ class DoliDBSqlite3 extends DoliDB
|
|||||||
$sql .= implode(',',$sqlfields);
|
$sql .= implode(',',$sqlfields);
|
||||||
if($primary_key != "")
|
if($primary_key != "")
|
||||||
$sql .= ",".$pk;
|
$sql .= ",".$pk;
|
||||||
if($unique_keys != "")
|
if(is_array($unique_keys))
|
||||||
$sql .= ",".implode(',',$sqluq);
|
$sql .= ",".implode(',',$sqluq);
|
||||||
if($keys != "")
|
if(is_array($keys))
|
||||||
$sql .= ",".implode(',',$sqlk);
|
$sql .= ",".implode(',',$sqlk);
|
||||||
$sql .=") type=".$type;
|
$sql .=") type=".$type;
|
||||||
|
|
||||||
dol_syslog($sql,LOG_DEBUG);
|
dol_syslog($sql,LOG_DEBUG);
|
||||||
if(! $this -> query($sql))
|
if(! $this -> query($sql))
|
||||||
return -1;
|
return -1;
|
||||||
else
|
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -939,7 +943,7 @@ class DoliDBSqlite3 extends DoliDB
|
|||||||
*
|
*
|
||||||
* @param string $table Name of table
|
* @param string $table Name of table
|
||||||
* @param string $field Optionnel : Name of field if we want description of field
|
* @param string $field Optionnel : Name of field if we want description of field
|
||||||
* @return resource Resource
|
* @return SQLite3Result Resource
|
||||||
*/
|
*/
|
||||||
function DDLDescTable($table,$field="")
|
function DDLDescTable($table,$field="")
|
||||||
{
|
{
|
||||||
@ -990,10 +994,7 @@ class DoliDBSqlite3 extends DoliDB
|
|||||||
{
|
{
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
else
|
return 1;
|
||||||
{
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -1014,8 +1015,7 @@ class DoliDBSqlite3 extends DoliDB
|
|||||||
|
|
||||||
dol_syslog(get_class($this)."::DDLUpdateField ".$sql,LOG_DEBUG);
|
dol_syslog(get_class($this)."::DDLUpdateField ".$sql,LOG_DEBUG);
|
||||||
if (! $this->query($sql))
|
if (! $this->query($sql))
|
||||||
return -1;
|
return -1;
|
||||||
else
|
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1035,7 +1035,7 @@ class DoliDBSqlite3 extends DoliDB
|
|||||||
$this->error=$this->lasterror();
|
$this->error=$this->lasterror();
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
else return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -1082,7 +1082,6 @@ class DoliDBSqlite3 extends DoliDB
|
|||||||
{
|
{
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1141,6 +1140,7 @@ class DoliDBSqlite3 extends DoliDB
|
|||||||
*/
|
*/
|
||||||
function getPathOfDump()
|
function getPathOfDump()
|
||||||
{
|
{
|
||||||
|
// FIXME: not for SQLite
|
||||||
$fullpathofdump='/pathtomysqldump/mysqldump';
|
$fullpathofdump='/pathtomysqldump/mysqldump';
|
||||||
|
|
||||||
$resql=$this->query('SHOW VARIABLES LIKE \'basedir\'');
|
$resql=$this->query('SHOW VARIABLES LIKE \'basedir\'');
|
||||||
@ -1160,6 +1160,7 @@ class DoliDBSqlite3 extends DoliDB
|
|||||||
*/
|
*/
|
||||||
function getPathOfRestore()
|
function getPathOfRestore()
|
||||||
{
|
{
|
||||||
|
// FIXME: not for SQLite
|
||||||
$fullpathofimport='/pathtomysql/mysql';
|
$fullpathofimport='/pathtomysql/mysql';
|
||||||
|
|
||||||
$resql=$this->query('SHOW VARIABLES LIKE \'basedir\'');
|
$resql=$this->query('SHOW VARIABLES LIKE \'basedir\'');
|
||||||
@ -1425,10 +1426,10 @@ class DoliDBSqlite3 extends DoliDB
|
|||||||
/**
|
/**
|
||||||
* calc_daynr
|
* calc_daynr
|
||||||
*
|
*
|
||||||
* @param string $year Year
|
* @param int $year Year
|
||||||
* @param string $month Month
|
* @param int $month Month
|
||||||
* @param string $day Day
|
* @param int $day Day
|
||||||
* @return string La date formatee.
|
* @return int Formatted date
|
||||||
*/
|
*/
|
||||||
private static function calc_daynr($year, $month, $day) {
|
private static function calc_daynr($year, $month, $day) {
|
||||||
$y = $year;
|
$y = $year;
|
||||||
@ -1446,8 +1447,9 @@ class DoliDBSqlite3 extends DoliDB
|
|||||||
/**
|
/**
|
||||||
* calc_weekday
|
* calc_weekday
|
||||||
*
|
*
|
||||||
* @param string $daynr ???
|
* @param int $daynr ???
|
||||||
* @param string $sunday_first_day_of_week ???
|
* @param bool $sunday_first_day_of_week ???
|
||||||
|
* @return int
|
||||||
*/
|
*/
|
||||||
private static function calc_weekday($daynr, $sunday_first_day_of_week) {
|
private static function calc_weekday($daynr, $sunday_first_day_of_week) {
|
||||||
$ret = floor(($daynr + 5 + ($sunday_first_day_of_week ? 1 : 0)) % 7);
|
$ret = floor(($daynr + 5 + ($sunday_first_day_of_week ? 1 : 0)) % 7);
|
||||||
|
|||||||
@ -296,9 +296,9 @@ else
|
|||||||
$conf->db->user = $dolibarr_main_db_user;
|
$conf->db->user = $dolibarr_main_db_user;
|
||||||
$conf->db->pass = $dolibarr_main_db_pass;
|
$conf->db->pass = $dolibarr_main_db_pass;
|
||||||
$db=getDoliDBInstance($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name,$conf->db->port);
|
$db=getDoliDBInstance($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name,$conf->db->port);
|
||||||
if ($db->connected == 1 && $db->database_selected == 1)
|
if ($db->connected && $db->database_selected)
|
||||||
{
|
{
|
||||||
$ok=1;
|
$ok=true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -637,7 +637,7 @@ if (! $error && $db->connected && $action == "set")
|
|||||||
|
|
||||||
$db=getDoliDBInstance($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name,$conf->db->port);
|
$db=getDoliDBInstance($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name,$conf->db->port);
|
||||||
|
|
||||||
if ($db->connected == 1)
|
if ($db->connected)
|
||||||
{
|
{
|
||||||
dolibarr_install_syslog("etape1: connexion to server by user ".$conf->db->user." is ok", LOG_DEBUG);
|
dolibarr_install_syslog("etape1: connexion to server by user ".$conf->db->user." is ok", LOG_DEBUG);
|
||||||
print "<tr><td>";
|
print "<tr><td>";
|
||||||
@ -648,7 +648,7 @@ if (! $error && $db->connected && $action == "set")
|
|||||||
print "</td></tr>";
|
print "</td></tr>";
|
||||||
|
|
||||||
// si acces serveur ok et acces base ok, tout est ok, on ne va pas plus loin, on a meme pas utilise le compte root.
|
// si acces serveur ok et acces base ok, tout est ok, on ne va pas plus loin, on a meme pas utilise le compte root.
|
||||||
if ($db->database_selected == 1)
|
if ($db->database_selected)
|
||||||
{
|
{
|
||||||
dolibarr_install_syslog("etape1: connexion to database : ".$conf->db->name.", by user : ".$conf->db->user." is ok", LOG_DEBUG);
|
dolibarr_install_syslog("etape1: connexion to database : ".$conf->db->name.", by user : ".$conf->db->user." is ok", LOG_DEBUG);
|
||||||
print "<tr><td>";
|
print "<tr><td>";
|
||||||
|
|||||||
@ -88,7 +88,7 @@ if ($action == "set")
|
|||||||
|
|
||||||
$db=getDoliDBInstance($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name,$conf->db->port);
|
$db=getDoliDBInstance($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name,$conf->db->port);
|
||||||
|
|
||||||
if ($db->connected == 1)
|
if ($db->connected)
|
||||||
{
|
{
|
||||||
print "<tr><td>";
|
print "<tr><td>";
|
||||||
print $langs->trans("ServerConnection")." : ".$conf->db->host.'</td><td><img src="../theme/eldy/img/tick.png" alt="Ok"></td></tr>';
|
print $langs->trans("ServerConnection")." : ".$conf->db->host.'</td><td><img src="../theme/eldy/img/tick.png" alt="Ok"></td></tr>';
|
||||||
@ -101,7 +101,7 @@ if ($action == "set")
|
|||||||
|
|
||||||
if ($ok)
|
if ($ok)
|
||||||
{
|
{
|
||||||
if($db->database_selected == 1)
|
if($db->database_selected)
|
||||||
{
|
{
|
||||||
dolibarr_install_syslog("etape2: Connexion successful to database : ".$conf->db->name);
|
dolibarr_install_syslog("etape2: Connexion successful to database : ".$conf->db->name);
|
||||||
}
|
}
|
||||||
@ -139,7 +139,7 @@ if ($action == "set")
|
|||||||
|
|
||||||
|
|
||||||
// To say sql requests are escaped for mysql so we need to unescape them
|
// To say sql requests are escaped for mysql so we need to unescape them
|
||||||
$db->unescapeslashquot=1;
|
$db->unescapeslashquot=true;
|
||||||
|
|
||||||
|
|
||||||
/**************************************************************************************
|
/**************************************************************************************
|
||||||
|
|||||||
@ -71,7 +71,7 @@ print '<table cellspacing="0" cellpadding="2" width="100%">';
|
|||||||
|
|
||||||
$db=getDoliDBInstance($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name,$conf->db->port);
|
$db=getDoliDBInstance($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name,$conf->db->port);
|
||||||
|
|
||||||
if ($db->ok == 1)
|
if ($db->ok)
|
||||||
{
|
{
|
||||||
print '<tr><td>'.$langs->trans("DolibarrAdminLogin").' :</td><td>';
|
print '<tr><td>'.$langs->trans("DolibarrAdminLogin").' :</td><td>';
|
||||||
print '<input name="login" type="text" value="'.(! empty($_GET["login"])?$_GET["login"]:(isset($force_install_dolibarrlogin)?$force_install_dolibarrlogin:'')).'"></td></tr>';
|
print '<input name="login" type="text" value="'.(! empty($_GET["login"])?$_GET["login"]:(isset($force_install_dolibarrlogin)?$force_install_dolibarrlogin:'')).'"></td></tr>';
|
||||||
|
|||||||
@ -159,7 +159,7 @@ if ($action == "set" || empty($action) || preg_match('/upgrade/i',$action))
|
|||||||
$result=$objMod->init();
|
$result=$objMod->init();
|
||||||
if (! $result) print 'ERROR in activating module file='.$file;
|
if (! $result) print 'ERROR in activating module file='.$file;
|
||||||
|
|
||||||
if ($db->connected == 1)
|
if ($db->connected)
|
||||||
{
|
{
|
||||||
$conf->setValues($db);
|
$conf->setValues($db);
|
||||||
|
|
||||||
@ -255,7 +255,7 @@ if ($action == "set" || empty($action) || preg_match('/upgrade/i',$action))
|
|||||||
// If upgrade
|
// If upgrade
|
||||||
elseif (empty($action) || preg_match('/upgrade/i',$action))
|
elseif (empty($action) || preg_match('/upgrade/i',$action))
|
||||||
{
|
{
|
||||||
if ($db->connected == 1)
|
if ($db->connected)
|
||||||
{
|
{
|
||||||
$conf->setValues($db);
|
$conf->setValues($db);
|
||||||
|
|
||||||
|
|||||||
@ -101,7 +101,7 @@ $conf->db->dolibarr_main_db_cryptkey = isset($dolibarr_main_db_cryptkey)?$doliba
|
|||||||
|
|
||||||
$db=getDoliDBInstance($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name,$conf->db->port);
|
$db=getDoliDBInstance($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name,$conf->db->port);
|
||||||
|
|
||||||
if ($db->connected == 1)
|
if ($db->connected)
|
||||||
{
|
{
|
||||||
print '<tr><td class="nowrap">';
|
print '<tr><td class="nowrap">';
|
||||||
print $langs->trans("ServerConnection")." : $dolibarr_main_db_host</td><td align=\"right\">".$langs->trans("OK")."</td></tr>";
|
print $langs->trans("ServerConnection")." : $dolibarr_main_db_host</td><td align=\"right\">".$langs->trans("OK")."</td></tr>";
|
||||||
@ -117,7 +117,7 @@ else
|
|||||||
|
|
||||||
if ($ok)
|
if ($ok)
|
||||||
{
|
{
|
||||||
if($db->database_selected == 1)
|
if($db->database_selected)
|
||||||
{
|
{
|
||||||
print '<tr><td class="nowrap">';
|
print '<tr><td class="nowrap">';
|
||||||
print $langs->trans("DatabaseConnection")." : ".$dolibarr_main_db_name."</td><td align=\"right\">".$langs->trans("OK")."</td></tr>";
|
print $langs->trans("DatabaseConnection")." : ".$dolibarr_main_db_name."</td><td align=\"right\">".$langs->trans("OK")."</td></tr>";
|
||||||
|
|||||||
@ -141,7 +141,7 @@ if (! GETPOST("action") || preg_match('/upgrade/i',GETPOST('action')))
|
|||||||
include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
|
include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
|
||||||
$hookmanager=new HookManager($db);
|
$hookmanager=new HookManager($db);
|
||||||
|
|
||||||
if ($db->connected == 1)
|
if ($db->connected)
|
||||||
{
|
{
|
||||||
print '<tr><td class="nowrap">';
|
print '<tr><td class="nowrap">';
|
||||||
print $langs->trans("ServerConnection")." : $dolibarr_main_db_host</td><td align=\"right\">".$langs->trans("OK")."</td></tr>\n";
|
print $langs->trans("ServerConnection")." : $dolibarr_main_db_host</td><td align=\"right\">".$langs->trans("OK")."</td></tr>\n";
|
||||||
@ -157,7 +157,7 @@ if (! GETPOST("action") || preg_match('/upgrade/i',GETPOST('action')))
|
|||||||
|
|
||||||
if ($ok)
|
if ($ok)
|
||||||
{
|
{
|
||||||
if($db->database_selected == 1)
|
if($db->database_selected)
|
||||||
{
|
{
|
||||||
print '<tr><td class="nowrap">';
|
print '<tr><td class="nowrap">';
|
||||||
print $langs->trans("DatabaseConnection")." : ".$dolibarr_main_db_name."</td><td align=\"right\">".$langs->trans("OK")."</td></tr>\n";
|
print $langs->trans("DatabaseConnection")." : ".$dolibarr_main_db_name."</td><td align=\"right\">".$langs->trans("OK")."</td></tr>\n";
|
||||||
|
|||||||
@ -134,7 +134,7 @@ if (! GETPOST("action") || preg_match('/upgrade/i',GETPOST('action')))
|
|||||||
include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
|
include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
|
||||||
$hookmanager=new HookManager($db);
|
$hookmanager=new HookManager($db);
|
||||||
|
|
||||||
if ($db->connected != 1)
|
if (!$db->connected)
|
||||||
{
|
{
|
||||||
print '<tr><td colspan="4">'.$langs->trans("ErrorFailedToConnectToDatabase",$conf->db->name).'</td><td align="right">'.$langs->trans('Error').'</td></tr>';
|
print '<tr><td colspan="4">'.$langs->trans("ErrorFailedToConnectToDatabase",$conf->db->name).'</td><td align="right">'.$langs->trans('Error').'</td></tr>';
|
||||||
dolibarr_install_syslog('upgrade2: Failed to connect to database : '.$conf->db->name.' on '.$conf->db->host.' for user '.$conf->db->user, LOG_ERR);
|
dolibarr_install_syslog('upgrade2: Failed to connect to database : '.$conf->db->name.' on '.$conf->db->host.' for user '.$conf->db->user, LOG_ERR);
|
||||||
@ -143,7 +143,7 @@ if (! GETPOST("action") || preg_match('/upgrade/i',GETPOST('action')))
|
|||||||
|
|
||||||
if (! $error)
|
if (! $error)
|
||||||
{
|
{
|
||||||
if($db->database_selected == 1)
|
if($db->database_selected)
|
||||||
{
|
{
|
||||||
dolibarr_install_syslog('upgrade2: Database connection successfull : '.$dolibarr_main_db_name);
|
dolibarr_install_syslog('upgrade2: Database connection successfull : '.$dolibarr_main_db_name);
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user