masonite-orm 2.23.2__tar.gz → 2.24.0__tar.gz

{masonite-orm-2.23.2/src/masonite_orm.egg-info → masonite-orm-2.24.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: masonite-orm
-Version: 2.23.2
+Version: 2.24.0
 Summary: The Official Masonite ORM
 Home-page: https://github.com/masoniteframework/orm
 Author: Joe Mancuso

{masonite-orm-2.23.2 → masonite-orm-2.24.0}/setup.py

@@ -8,7 +8,7 @@ setup(
     # Versions should comply with PEP440.  For a discussion on single-sourcing
     # the version across setup.py and the project code, see
     # https://packaging.python.org/en/latest/single_source_version.html
-    version="2.23.2",
+    version="2.24.0",
     package_dir={"": "src"},
     description="The Official Masonite ORM",
     long_description=long_description,

{masonite-orm-2.23.2 → masonite-orm-2.24.0/src/masonite_orm.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: masonite-orm
-Version: 2.23.2
+Version: 2.24.0
 Summary: The Official Masonite ORM
 Home-page: https://github.com/masoniteframework/orm
 Author: Joe Mancuso

{masonite-orm-2.23.2 → masonite-orm-2.24.0}/src/masoniteorm/models/Model.py

@@ -354,7 +354,7 @@ class Model(TimeStampsMixin, ObservesEvents, metaclass=ModelMeta):
             dry=self.__dry__,
         )
 
-        return self.builder.select(*self.get_selects())
+        return self.builder
 
     def get_selects(self):
         return self.__selects__

{masonite-orm-2.23.2 → masonite-orm-2.24.0}/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 @@ class QueryBuilder(ObservesEvents):
         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 @@ class QueryBuilder(ObservesEvents):
 
         # 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,

{masonite-orm-2.23.2 → masonite-orm-2.24.0}/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."""

{masonite-orm-2.23.2 → masonite-orm-2.24.0}/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."""

{masonite-orm-2.23.2 → masonite-orm-2.24.0}/src/masoniteorm/query/grammars/BaseGrammar.py

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

{masonite-orm-2.23.2 → masonite-orm-2.24.0}/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

{masonite-orm-2.23.2 → masonite-orm-2.24.0}/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