Skip to content

Commit 11743db

Browse files
committed
Fixed using model default select columns correctly
Only use model get_selects() if no other columns are specified
1 parent ccf9025 commit 11743db

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

src/masoniteorm/models/Model.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@ def get_builder(self):
354354
dry=self.__dry__,
355355
)
356356

357-
return self.builder.select(*self.get_selects())
357+
return self.builder
358358

359359
def get_selects(self):
360360
return self.__selects__

src/masoniteorm/query/QueryBuilder.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1229,6 +1229,7 @@ def or_where_doesnt_have(self, relationship, callback):
12291229
return self
12301230

12311231
def with_count(self, relationship, callback=None):
1232+
self.select(*self._model.get_selects())
12321233
return getattr(self._model, relationship).get_with_count_query(
12331234
self, callback=callback
12341235
)
@@ -2067,6 +2068,9 @@ def get_grammar(self):
20672068

20682069
# Either _creates when creating, otherwise use columns
20692070
columns = self._creates or self._columns
2071+
if not columns and not self._aggregates and self._model:
2072+
self.select(*self._model.get_selects())
2073+
columns = self._columns
20702074

20712075
return self.grammar(
20722076
columns=columns,

0 commit comments

Comments
 (0)