Fix types around Adapter#where

waterlink · Jan 1, 2017 · ddfe56b · ddfe56b
1 parent a079bd6
commit ddfe56b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 10 deletions.
diff --git a/src/adapter.cr b/src/adapter.cr
@@ -27,7 +27,7 @@ module ActiveRecord
  abstract def create(fields)
  abstract def get(id)
  abstract def all
- abstract def where(query_hash : Hash)
+ abstract def where(query_hash : Hash(K, V)) forall K, V
  abstract def where(query : ::Query::Query)
  abstract def update(id, fields)
  abstract def delete(id)

diff --git a/src/model.cr b/src/model.cr
@@ -187,15 +187,9 @@ module ActiveRecord
  end
 
  macro query_level(level)
- {{level.id}} def self.where(query_hash)
+ {{level.id}} def self.where(query)
  pool.connection do |adapter|
- adapter.where(query_hash).map { |fields| new(fields) }
- end
- end
-
- {{level.id}} def self.where(query, params)
- pool.connection do |adapter|
- adapter.where(query, params).map { |fields| new(fields) }
+ adapter.where(query).map { |fields| new(fields) }
  end
  end
 

diff --git a/src/null_adapter.cr b/src/null_adapter.cr
@@ -68,7 +68,7 @@ module ActiveRecord
  _where(query.query, query.params)
  end
 
- def where(query_hash)
+ def where(query_hash : Hash(K, V)) forall K, V
  result = [] of Fields
 
  records.each_index do |index|