MDL-17491 oracle dml: towards full support

moodle · Dec 9, 2008 · 2c4eb00 · 2c4eb00
1 parent 67da7e6
commit 2c4eb00
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/lib/dml/oci8po_adodb_moodle_database.php b/lib/dml/oci8po_adodb_moodle_database.php
@@ -170,7 +170,7 @@ public function sql_bitor($int1, $int2) {
     }
 
     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
@@ -1118,13 +1118,11 @@ public function sql_bitnot($int1) {
     }
 
     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) . ')';
     }
 
     /**