Merge pull request #200 from straight-shoota/fix/has_one-nilable

Fix has_one getter for nilable type
anykeyh · Nov 30, 2020 · 3bdaa44 · 3bdaa44
2 parents b98e233 + 6d76430
commit 3bdaa44
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/spec/model/relations/fixture.cr b/spec/model/relations/fixture.cr
@@ -45,6 +45,7 @@ module RelationSpec
     has_one user_info : UserInfo, foreign_key: "user_id"
     # Same...
     has_many user_infos : UserInfo, foreign_key: "user_id"
+    has_one user_info_nilable : UserInfo?, foreign_key: "user_id"
 
     has_many posts : Post, foreign_key: "user_id"
 

diff --git a/src/clear/model/modules/relations/has_one_macro.cr b/src/clear/model/modules/relations/has_one_macro.cr
@@ -61,11 +61,11 @@ module Clear::Model::Relations::HasOneMacro
 
       {% if nilable %}
         def {{method_name}}! : {{relation_type}}
-          if model = self.{{method_name}}.nil?
+          if model = self.{{method_name}}
+            model
+          else
             raise Clear::SQL::RecordNotFoundError.new
           end
-
-          model
         end # /  *!
       {% end %}