feat: de-dupe where conditions and select expressions (#54)

Author: joshbmarshall

.vscode/settings.json

@@ -1,29 +1,30 @@
-{
-  "files.trimTrailingWhitespace": true,
-  "intelephense.completion.insertUseDeclaration": false,
-  "intelephense.environment.shortOpenTag": false,
-  "intelephense.format.braces": "per",
-  "intelephense.phpdoc.useFullyQualifiedNames": true,
-  "php.suggest.basic": false,
-  "prettier.enable": false,
-  "files.exclude": {
-    "composer.lock": true,
-    ".phpunit.result.cache": true
-  },
-  "search.exclude": {},
-  "[php]": {
-    "editor.formatOnSave": true,
-    "editor.tabSize": 4,
-    "editor.detectIndentation": false,
-    "editor.insertSpaces": true,
-    "editor.defaultFormatter": "Jota0222.multi-formatter",
-    "multiFormatter.formatterList": [
-      "bmewburn.vscode-intelephense-client",
-      "junstyle.php-cs-fixer"
-    ]
-  },
-  "editor.codeActionsOnSave": {
-    "source.fixAll.eslint": "explicit",
-    "source.organizeImports": "never"
-  }
-}
+{
+  "files.trimTrailingWhitespace": true,
+  "intelephense.completion.insertUseDeclaration": false,
+  "intelephense.environment.shortOpenTag": false,
+  "intelephense.format.braces": "per",
+  "intelephense.phpdoc.useFullyQualifiedNames": true,
+  "intelephense.inlayHint.parameterNames": false,
+  "php.suggest.basic": false,
+  "prettier.enable": false,
+  "files.exclude": {
+    "composer.lock": true,
+    ".phpunit.result.cache": true
+  },
+  "search.exclude": {},
+  "[php]": {
+    "editor.formatOnSave": true,
+    "editor.tabSize": 4,
+    "editor.detectIndentation": false,
+    "editor.insertSpaces": true,
+    "editor.defaultFormatter": "Jota0222.multi-formatter",
+    "multiFormatter.formatterList": [
+      "bmewburn.vscode-intelephense-client",
+      "junstyle.php-cs-fixer"
+    ]
+  },
+  "editor.codeActionsOnSave": {
+    "source.fixAll.eslint": "explicit",
+    "source.organizeImports": "never"
+  }
+}

src/Granada/ORM.php

@@ -961,7 +961,9 @@ protected function _add_result_column($expr, $alias = null)
             $this->_result_columns               = [$expr];
             $this->_using_default_result_columns = false;
         } else {
-            $this->_result_columns[] = $expr;
+            if (!in_array($expr, $this->_result_columns)) {
+                $this->_result_columns[] = $expr;
+            }
         }
 
         return $this;
@@ -1245,10 +1247,15 @@ protected function _add_condition($type, $fragment, $values = [])
         if (!is_array($values)) {
             $values = [$values];
         }
-        array_push($this->$conditions_class_property_name, [
+        $filter = [
             self::CONDITION_FRAGMENT => $fragment,
             self::CONDITION_VALUES   => $values,
-        ]);
+        ];
+        if (in_array($filter, $this->$conditions_class_property_name)) {
+            // Condition already exists, de-dupe
+            return $this;
+        }
+        array_push($this->$conditions_class_property_name, $filter);
 
         return $this;
     }

tests/orm/ORMTest.php

@@ -184,4 +184,25 @@ public function testSaveInsideLoop()
             $this->assertEquals($expected, ORM::get_last_query());
         }
     }
+
+    public function testDuplicateFilters()
+    {
+        $cars_query = ORM::for_table('car')
+            ->where('name', 'ABC')
+            ->where('name', 'ABC')
+            ->get_select_query();
+
+        $this->assertSame("SELECT * FROM `car` WHERE `name` = 'ABC'", $cars_query);
+    }
+
+    public function testDuplicateSelect()
+    {
+        $cars_query = ORM::for_table('car')
+            ->select('id')
+            ->select('name')
+            ->select('id')
+            ->get_select_query();
+
+        $this->assertSame('SELECT `id`, `name` FROM `car`', $cars_query);
+    }
 }