Merge pull request #912 from circulon/fix/allow_override_of_model_default_selects

allow override of model default selects

Author: josephmancuso

src/masoniteorm/models/Model.py

@@ -354,7 +354,7 @@ def get_builder(self):
             dry=self.__dry__,
         )
 
-        return self.builder.select(*self.get_selects())
+        return self.builder
 
     def get_selects(self):
         return self.__selects__

src/masoniteorm/query/QueryBuilder.py

@@ -1,16 +1,16 @@
 import inspect
 from copy import deepcopy
 from datetime import datetime
-from typing import Any, Dict, List, Optional, Callable
+from typing import Any, Callable, Dict, List, Optional
 
 from ..collection.Collection import Collection
 from ..config import load_config
 from ..exceptions import (
     HTTP404,
     ConnectionNotRegistered,
+    InvalidArgument,
     ModelNotFound,
     MultipleRecordsFound,
-    InvalidArgument,
 )
 from ..expressions.expressions import (
     AggregateExpression,
@@ -1229,6 +1229,7 @@ def or_where_doesnt_have(self, relationship, callback):
         return self
 
     def with_count(self, relationship, callback=None):
+        self.select(*self._model.get_selects())
         return getattr(self._model, relationship).get_with_count_query(
             self, callback=callback
         )
@@ -2067,6 +2068,9 @@ def get_grammar(self):
 
         # Either _creates when creating, otherwise use columns
         columns = self._creates or self._columns
+        if not columns and not self._aggregates and self._model:
+            self.select(*self._model.get_selects())
+            columns = self._columns
 
         return self.grammar(
             columns=columns,

src/masoniteorm/query/grammars/BaseGrammar.py

@@ -1,11 +1,11 @@
 import re
 
 from ...expressions.expressions import (
-    SubGroupExpression,
-    SubSelectExpression,
-    SelectExpression,
     JoinClause,
     OnClause,
+    SelectExpression,
+    SubGroupExpression,
+    SubSelectExpression,
 )
 
 

src/masoniteorm/query/grammars/PostgresGrammar.py

@@ -1,6 +1,7 @@
-from .BaseGrammar import BaseGrammar
 import re
 
+from .BaseGrammar import BaseGrammar
+
 
 class PostgresGrammar(BaseGrammar):
     """Postgres grammar class."""

src/masoniteorm/query/grammars/SQLiteGrammar.py

@@ -1,6 +1,7 @@
-from .BaseGrammar import BaseGrammar
 import re
 
+from .BaseGrammar import BaseGrammar
+
 
 class SQLiteGrammar(BaseGrammar):
     """SQLite grammar class."""

src/masoniteorm/query/grammars/__init__.py

@@ -1,4 +1,4 @@
-from .SQLiteGrammar import SQLiteGrammar
-from .PostgresGrammar import PostgresGrammar
-from .MySQLGrammar import MySQLGrammar
 from .MSSQLGrammar import MSSQLGrammar
+from .MySQLGrammar import MySQLGrammar
+from .PostgresGrammar import PostgresGrammar
+from .SQLiteGrammar import SQLiteGrammar

src/masoniteorm/query/processors/__init__.py

@@ -1,4 +1,4 @@
+from .MSSQLPostProcessor import MSSQLPostProcessor
 from .MySQLPostProcessor import MySQLPostProcessor
 from .PostgresPostProcessor import PostgresPostProcessor
 from .SQLitePostProcessor import SQLitePostProcessor
-from .MSSQLPostProcessor import MSSQLPostProcessor

tests/models/test_models.py

@@ -37,6 +37,7 @@ class ModelTestForced(Model):
     __force_update__ = True
 
 class BaseModel(Model):
+    __dry__ = True
     def get_selects(self):
         return [f"{self.get_table_name()}.*"]
 
@@ -267,9 +268,26 @@ def test_model_can_provide_default_select(self):
             """SELECT `users`.* FROM `users`""",
         )
 
-    def test_model_can_add_to_default_select(self):
+    def test_model_can_override_to_default_select(self):
         sql = ModelWithBaseModel.select(["products.name", "products.id", "store.name"]).to_sql()
         self.assertEqual(
             sql,
-            """SELECT `users`.*, `products`.`name`, `products`.`id`, `store`.`name` FROM `users`""",
+            """SELECT `products`.`name`, `products`.`id`, `store`.`name` FROM `users`""",
+        )
+
+    def test_model_can_use_aggregate_funcs_with_default_selects(self):
+        sql = ModelWithBaseModel.count().to_sql()
+        self.assertEqual(
+            sql,
+            """SELECT COUNT(*) AS m_count_reserved FROM `users`""",
+        )
+        sql = ModelWithBaseModel.max("id").to_sql()
+        self.assertEqual(
+            sql,
+            """SELECT MAX(`users`.`id`) AS id FROM `users`""",
+        )
+        sql = ModelWithBaseModel.min("id").to_sql()
+        self.assertEqual(
+            sql,
+            """SELECT MIN(`users`.`id`) AS id FROM `users`""",
         )

tests/mssql/builder/test_mssql_query_builder_relationships.py

@@ -59,7 +59,7 @@ def get_builder(self, table="users"):
             connection_class=connection,
             connection="mssql",
             table=table,
-            model=User,
+            model=User(),
         )
 
     def test_has(self):

tests/mysql/builder/test_transactions.py

@@ -26,7 +26,7 @@ class TestTransactions(unittest.TestCase):
         pass
         # def get_builder(self, table="users"):
         #     connection = ConnectionFactory().make("default")
-        #     return QueryBuilder(MySQLGrammar, connection, table=table, model=User)
+        #     return QueryBuilder(MySQLGrammar, connection, table=table, model=User())
 
         # def test_can_start_transaction(self, table="users"):
         #     builder = self.get_builder()