|
@@ -59,10 +59,10 @@ discard block |
|
|
block discarded – undo |
|
59
|
59
|
? $this->dbname |
|
60
|
60
|
: |
|
61
|
61
|
(!is_null($this->dbport) && !empty($this->dbport)) |
|
62
|
|
- ? $this->dbhost .":". $this->dbport ."/". $this->dbname |
|
63
|
|
- : $this->dbhost ."/". $this->dbname; |
|
|
62
|
+ ? $this->dbhost . ":" . $this->dbport . "/" . $this->dbname |
|
|
63
|
+ : $this->dbhost . "/" . $this->dbname; |
|
64
|
64
|
|
|
65
|
|
- $conn = @oci_connect($this->dbuser, $this->dbpass, $connection_string, $this->dbchar); |
|
|
65
|
+ $conn = @oci_connect($this->dbuser, $this->dbpass, $connection_string, $this->dbchar); |
|
66
|
66
|
|
|
67
|
67
|
if ($conn === false) |
|
68
|
68
|
{ |
|
@@ -131,7 +131,7 @@ discard block |
|
|
block discarded – undo |
|
131
|
131
|
$prev_error_handler = set_error_handler(['\Drone\Error\ErrorHandler', 'errorControlOperator'], E_ALL); |
|
132
|
132
|
|
|
133
|
133
|
// may be throw a Fatal error (Ex: Maximum execution time) |
|
134
|
|
- $r = ($this->transac_mode) ? oci_execute($stid, OCI_NO_AUTO_COMMIT) : oci_execute($stid, OCI_COMMIT_ON_SUCCESS); |
|
|
134
|
+ $r = ($this->transac_mode) ? oci_execute($stid, OCI_NO_AUTO_COMMIT) : oci_execute($stid, OCI_COMMIT_ON_SUCCESS); |
|
135
|
135
|
|
|
136
|
136
|
set_error_handler($prev_error_handler); |
|
137
|
137
|
|
|
@@ -152,7 +152,7 @@ discard block |
|
|
block discarded – undo |
|
152
|
152
|
$this->numFields = oci_num_fields($stid); |
|
153
|
153
|
|
|
154
|
154
|
if ($this->transac_mode) |
|
155
|
|
- $this->transac_result = is_null($this->transac_result) ? $stid: $this->transac_result && $stid; |
|
|
155
|
+ $this->transac_result = is_null($this->transac_result) ? $stid : $this->transac_result && $stid; |
|
156
|
156
|
|
|
157
|
157
|
$this->result = $stid; |
|
158
|
158
|
|
|
@@ -197,7 +197,7 @@ discard block |
|
|
block discarded – undo |
|
197
|
197
|
|
|
198
|
198
|
if ($this->result) |
|
199
|
199
|
{ |
|
200
|
|
- while ( ($row = @oci_fetch_array($this->result, OCI_BOTH + OCI_RETURN_NULLS)) !== false ) |
|
|
200
|
+ while (($row = @oci_fetch_array($this->result, OCI_BOTH + OCI_RETURN_NULLS)) !== false) |
|
201
|
201
|
{ |
|
202
|
202
|
$data[] = $row; |
|
203
|
203
|
} |