Withoutaname has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/133412

Change subject: Fetch string to pass through writeTemporary() in 
DatabaseOracle.php
......................................................................

Fetch string to pass through writeTemporary() in DatabaseOracle.php

Pulled some code from insertOneRow() to fix the update() function
and prevent the error warnings in bugzilla 64970 from showing up.
Note that since insertOneRow() and update() contains a lot of
duplicate code, they may be candidates for merging, but that is
outside the scope of this request.

Bug: 64970
Change-Id: I9ff9077d68e77f05f878fc541f87e0a5ce86ecc2
---
M includes/db/DatabaseOracle.php
1 file changed, 4 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/12/133412/1

diff --git a/includes/db/DatabaseOracle.php b/includes/db/DatabaseOracle.php
index 396de4f..b02474c 100644
--- a/includes/db/DatabaseOracle.php
+++ b/includes/db/DatabaseOracle.php
@@ -1491,6 +1491,10 @@
                                        throw new DBUnexpectedError( $this, 
"Cannot create LOB descriptor: " . $e['message'] );
                                }
 
+                               if ( is_object( $val ) ) {
+                                       $val = $val->fetch();
+                               }
+
                                if ( $col_type == 'BLOB' ) {
                                        $lob[$col]->writeTemporary( $val );
                                        oci_bind_by_name( $stmt, ":$col", 
$lob[$col], -1, SQLT_BLOB );

-- 
To view, visit https://gerrit.wikimedia.org/r/133412
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9ff9077d68e77f05f878fc541f87e0a5ce86ecc2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Withoutaname <drevit...@gmail.com>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to