BaseRelationship: s/self/instance #869
Conversation
|
can you expand on what this is fixing? |
|
oops, this isn't a good example. the user method should return the User class. I tried to make my example simpler, and instead made it confusing! @belong_to
def parent(self):
return Useror @belong_to
def parent(self):
return self.__class__ |
| @@ -52,7 +52,7 @@ def __get__(self, instance, owner): | |||
| object -- Either returns a builder or a hydrated model. | |||
| """ | |||
| attribute = self.fn.__name__ | |||
| relationship = self.fn(self)() | |||
| relationship = self.fn(instance)() | |||
There was a problem hiding this comment.
should this be the intance variable or the owner variable? i think owner. instance would be the class but owner would be the initialized object.
There was a problem hiding this comment.
owner appears to be the class, User in my example, whereas instance is an instance of owner. self.fn is a pointer to an instance method (Ruby vernacular) or prototype function (Node) -- apologies, I don't know the corresponding term in Python -- so I believe instance is correct
pmn4
force-pushed
the
pmn4.base-relationship
branch
from
be44797
to
1a3b0c4
Compare
| @@ -40,6 +40,14 @@ def articles(self): | |||
| def profile(self): | |||
| return Profile | |||
|
|
|||
| @belongs_to("id", "parent_dynamic_id") | |||
| def parent_dynamic(self): | |||
| return self.__class__ | |||
There was a problem hiding this comment.
previously, this test would have failed
| """SELECT * FROM [users] WHERE EXISTS (""" | ||
| """SELECT * FROM [users] WHERE [users].[parent_specified_id] = [users].[id]""" |
There was a problem hiding this comment.
any issue here, not having an alias for [users] when we self-join?
| @@ -316,7 +316,7 @@ def test_attribute_check_with_hasattr(self): | |||
| self.assertFalse(hasattr(Profile(), "__password__")) | |||
|
|
|||
|
|
|||
| if os.getenv("RUN_MYSQL_DATABASE", None).lower() == "true": | |||
| if os.getenv("RUN_MYSQL_DATABASE", "false").lower() == "true": | |||
There was a problem hiding this comment.
(my testing environment wasn't set up, so this caused an error, saying that lower is not a function on NoneType)
| @@ -52,7 +52,7 @@ def __get__(self, instance, owner): | |||
| object -- Either returns a builder or a hydrated model. | |||
| """ | |||
| attribute = self.fn.__name__ | |||
| relationship = self.fn(self)() | |||
| relationship = self.fn(instance)() | |||
There was a problem hiding this comment.
owner appears to be the class, User in my example, whereas instance is an instance of owner. self.fn is a pointer to an instance method (Ruby vernacular) or prototype function (Node) -- apologies, I don't know the corresponding term in Python -- so I believe instance is correct
when migrating from Orator to Masonite, several of my relationship methods were not working. Stepping through the code, I found that when referencing the
classviaself.__class__inside theUserclass,selfwas an instance ofBelongsTo, notUser. This PR aims to pass an instance ofUserinstead.