Switch to composition of modules than an inheritance structure

luckyframework · Sep 14, 2020 · bfd71ed · bfd71ed
1 parent a0ff6cd
commit bfd71ed
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/src/avram/base_query_template.cr b/src/avram/base_query_template.cr
@@ -5,6 +5,7 @@ class Avram::BaseQueryTemplate
       end
 
       def_clone
+      include Avram::Queryable({{ type }})
       include Avram::PrimaryKeyQueryable({{ type }})
 
       def database : Avram::Database.class

diff --git a/src/avram/primary_key_queryable.cr b/src/avram/primary_key_queryable.cr
@@ -1,13 +1,11 @@
 require "./errors"
-require "./queryable"
 
 module Avram::PrimaryKeyQueryable(T)
   abstract def id
   abstract def id(id_val)
+  abstract def query
 
   macro included
-    include Avram::Queryable(T)
-
     def self.find(id)
       new.find(id)
     end