From 2c4eb0064ba9b550a39fd89072343232dce08e62 Mon Sep 17 00:00:00 2001
From: skodak <skodak>
Date: Tue, 9 Dec 2008 22:24:07 +0000
Subject: [PATCH] MDL-17491 oracle dml: towards full support

---
 lib/dml/oci8po_adodb_moodle_database.php | 2 +-
 lib/dml/oci_native_moodle_database.php   | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/lib/dml/oci8po_adodb_moodle_database.php b/lib/dml/oci8po_adodb_moodle_database.php
index ab7c084da5..417561b781 100644
--- a/lib/dml/oci8po_adodb_moodle_database.php
+++ b/lib/dml/oci8po_adodb_moodle_database.php
@@ -170,7 +170,7 @@ class oci8po_adodb_moodle_database extends adodb_moodle_database {
     }
 
     public function sql_bitxor($int1, $int2) {
-        return '((' . $int1 . ') # (' . $int2 . '))';
+        return '(' . $this->sql_bitor($int1, $int2) . ' - ' . $this->sql_bitand($int1, $int2) . ')';
     }
 
     /**
diff --git a/lib/dml/oci_native_moodle_database.php b/lib/dml/oci_native_moodle_database.php
index 8c0538ce30..8291877f65 100644
--- a/lib/dml/oci_native_moodle_database.php
+++ b/lib/dml/oci_native_moodle_database.php
@@ -1118,13 +1118,11 @@ class oci_native_moodle_database extends moodle_database {
     }
 
     public function sql_bitor($int1, $int2) {
-        // TODO: this can not work because the number of params does not match
         return '((' . $int1 . ') + (' . $int2 . ') - ' . $this->sql_bitand($int1, $int2) . ')';
     }
 
     public function sql_bitxor($int1, $int2) {
-        // TODO: this can not work because the number of params does not match
-        return '(' . sql_bitor($int1, $int2) . ' - ' . $this->sql_bitand($int1, $int2) . ')';
+        return '(' . $this->sql_bitor($int1, $int2) . ' - ' . $this->sql_bitand($int1, $int2) . ')';
     }
 
     /**
-- 
2.39.5