fix objectToArray()

sclubricants · sclubricants · commit c3465e5de5a3 · 2022-08-21T16:48:53.000-07:00
diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
@@ -14,6 +14,7 @@
 use Closure;
 use CodeIgniter\Database\Exceptions\DatabaseException;
 use CodeIgniter\Database\Exceptions\DataException;
+use CodeIgniter\Database\RawSql;
 use InvalidArgumentException;
 
 /**
@@ -2698,7 +2699,7 @@ protected function objectToArray($object)
 
         foreach (get_object_vars($object) as $key => $val) {
             // There are some built in keys we need to ignore for this conversion
-            if (! is_object($val) && ! is_array($val) && $key !== '_parent_name') {
+            if ((! is_object($val) && ! is_array($val) && $key !== '_parent_name') || is_a($val, RawSql::class)) {
                 $array[$key] = $val;
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@`
`14`	`14`	`use Closure;`
`15`	`15`	`use CodeIgniter\Database\Exceptions\DatabaseException;`
`16`	`16`	`use CodeIgniter\Database\Exceptions\DataException;`
	`17`	`+use CodeIgniter\Database\RawSql;`
`17`	`18`	`use InvalidArgumentException;`
`18`	`19`
`19`	`20`	`/**`
`@@ -2698,7 +2699,7 @@ protected function objectToArray($object)`
`2698`	`2699`
`2699`	`2700`	`foreach (get_object_vars($object) as $key => $val) {`
`2700`	`2701`	`// There are some built in keys we need to ignore for this conversion`
`2701`		`- if (! is_object($val) && ! is_array($val) && $key !== '_parent_name') {`
	`2702`	`+ if ((! is_object($val) && ! is_array($val) && $key !== '_parent_name') \|\| is_a($val, RawSql::class)) {`
`2702`	`2703`	`$array[$key] = $val;`
`2703`	`2704`	`}`
`2704`	`2705`	`}`