From 3d2a6077686e06ae6f0e9d385f347b640e91aa5e Mon Sep 17 00:00:00 2001 From: KJ Date: Fri, 30 Aug 2024 16:26:03 -0400 Subject: [PATCH] Fix where_in is wiping previous where/and/or. For now, works as an AND, but maybe later, same as where will exists new methods: AndIn and OrIN. --- src/Libs/Model.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/Libs/Model.php b/src/Libs/Model.php index 84f4573..3538ab2 100644 --- a/src/Libs/Model.php +++ b/src/Libs/Model.php @@ -581,9 +581,14 @@ class Model { } if ($in) - static::$querySelect['where'] = "$column IN (".join(', ', $arrIn).")"; + $where_in = "$column IN (".join(', ', $arrIn).")"; else - static::$querySelect['where'] = "$column NOT IN (".join(', ', $arrIn).")"; + $where_in = "$column NOT IN (".join(', ', $arrIn).")"; + + if (static::$querySelect['where'] == '') + static::$querySelect['where'] = $where_in; + else + static::$querySelect['where'] .= " AND $where_in"; return new static(); }