diff options
| author | Damien Regad <dregad@mantisbt.org> | 2020-01-15 00:43:48 +0100 |
|---|---|---|
| committer | Damien Regad <dregad@mantisbt.org> | 2020-01-24 23:08:41 +0100 |
| commit | fd33e16493213abaadd0be79841ca02f02070030 (patch) | |
| tree | e44d6362b18e7f96c023bf62cc19a0ef9dd24d67 | |
| parent | e1c86c5e50545e0034ec5bdb3461448b2d83b57b (diff) | |
| download | adodb-fd33e16493213abaadd0be79841ca02f02070030.tar.gz adodb-fd33e16493213abaadd0be79841ca02f02070030.tar.bz2 adodb-fd33e16493213abaadd0be79841ca02f02070030.zip | |
Remove PHP>=4.1 check in mssql/mssqlpo drivers
Remove $_has_mssql_init property, which is no longer useful.
The ADODB_mssql class' constructor has been removed too, as it was no
longer doing anything.
| -rw-r--r-- | drivers/adodb-mssql.inc.php | 17 | ||||
| -rw-r--r-- | drivers/adodb-mssqlpo.inc.php | 4 |
2 files changed, 1 insertions, 20 deletions
diff --git a/drivers/adodb-mssql.inc.php b/drivers/adodb-mssql.inc.php index 2242df29..5d8a05b1 100644 --- a/drivers/adodb-mssql.inc.php +++ b/drivers/adodb-mssql.inc.php @@ -62,7 +62,6 @@ class ADODB_mssql extends ADOConnection { var $hasGenID = true; var $sysDate = 'convert(datetime,convert(char,GetDate(),102),102)'; var $sysTimeStamp = 'GetDate()'; - var $_has_mssql_init; var $maxParameterLen = 4000; var $arrayClass = 'ADORecordSet_array_mssql'; var $uniqueSort = true; @@ -75,11 +74,6 @@ class ADODB_mssql extends ADOConnection { var $_bindInputArray = true; var $forceNewConnect = false; - function __construct() - { - $this->_has_mssql_init = (strnatcmp(PHP_VERSION,'4.1.0')>=0); - } - function ServerInfo() { global $ADODB_FETCH_MODE; @@ -637,10 +631,6 @@ order by constraint_name, referenced_table_name, keyno"; function PrepareSP($sql,$param=true) { - if (!$this->_has_mssql_init) { - ADOConnection::outp( "PrepareSP: mssql_init only available since PHP 4.1.0"); - return $sql; - } $stmt = mssql_init($sql,$this->_connectionID); if (!$stmt) return $sql; return array($sql,$stmt); @@ -695,11 +685,6 @@ order by constraint_name, referenced_table_name, keyno"; */ function Parameter(&$stmt, &$var, $name, $isOutput=false, $maxLen=4000, $type=false) { - if (!$this->_has_mssql_init) { - ADOConnection::outp( "Parameter: mssql_bind only available since PHP 4.1.0"); - return false; - } - $isNull = is_null($var); // php 4.0.4 and above... if ($type === false) @@ -709,7 +694,7 @@ order by constraint_name, referenced_table_name, keyno"; case 'double': $type = SQLFLT8; break; case 'integer': $type = SQLINT4; break; case 'boolean': $type = SQLINT1; break; # SQLBIT not supported in 4.1.0 - } + } if ($this->debug) { $prefix = ($isOutput) ? 'Out' : 'In'; diff --git a/drivers/adodb-mssqlpo.inc.php b/drivers/adodb-mssqlpo.inc.php index d2ec7c3b..a8c5b3b9 100644 --- a/drivers/adodb-mssqlpo.inc.php +++ b/drivers/adodb-mssqlpo.inc.php @@ -32,10 +32,6 @@ class ADODB_mssqlpo extends ADODB_mssql { function PrepareSP($sql, $param = true) { - if (!$this->_has_mssql_init) { - ADOConnection::outp( "PrepareSP: mssql_init only available since PHP 4.1.0"); - return $sql; - } if (is_string($sql)) $sql = str_replace('||','+',$sql); $stmt = mssql_init($sql,$this->_connectionID); if (!$stmt) return $sql; |
