Raise Hanami::Model::MissingPrimaryKeyError if the table doesn't ha…

…s a primary key.

CHANGELOG.md

@@ -12,7 +12,7 @@ A persistence layer for Hanami
 
 ### Fixed
 - [Thorbjørn Hermansen] Ensure repository to not override given timestamps
-- [Luca Guidi] Raise `Hanami::Model::UnknownPrimaryKeyError` if `Repository#find` is ran against a database w/o a primary key
+- [Luca Guidi] Raise `Hanami::Model::MissingPrimaryKeyError` if `Repository#find` is ran against a database w/o a primary key
 - [Alfonso Uceda] Ensure SQLite databases to be used on JRuby when the database path is in the same directory of the Ruby script (eg. `./test.sqlite`)
 
 ### Changed

lib/hanami/model/error.rb

@@ -98,10 +98,7 @@ class UnknownDatabaseTypeError < Error
     # Unknown primary key error
     #
     # @since 1.0.0.beta1
-    class UnknownPrimaryKeyError < Error
-      def initialize(relation)
-        super("Can't find primary key for `#{relation}' table")
-      end
+    class MissingPrimaryKeyError < Error
     end
   end
 end

lib/hanami/model/sql.rb

@@ -146,6 +146,7 @@ def self.desc(column)
     Error.register(ROM::SQL::CheckConstraintError,      CheckConstraintViolationError)
     Error.register(ROM::SQL::ForeignKeyConstraintError, ForeignKeyConstraintViolationError)
     Error.register(ROM::SQL::UnknownDBTypeError,        UnknownDatabaseTypeError)
+    Error.register(ROM::SQL::MissingPrimaryKeyError,    MissingPrimaryKeyError)
 
     Error.register(Java::JavaSql::SQLException, DatabaseError) if Utils.jruby?
   end

lib/hanami/repository.rb

@@ -382,7 +382,7 @@ def initialize
     #
     # @return [Hanami::Entity,NilClass] the entity, if found
     #
-    # @raise [Hanami::Model::UnknownPrimaryKeyError] if the table doesn't
+    # @raise [Hanami::Model::MissingPrimaryKeyError] if the table doesn't
     #   define a primary key
     #
     # @since 0.7.0
@@ -394,8 +394,8 @@ def initialize
     #   user       = repository.find(user.id)
     def find(id)
       root.by_pk(id).as(:entity).one
-    rescue KeyError
-      raise Hanami::Model::UnknownPrimaryKeyError.new(self.class.relation)
+    rescue => e
+      raise Hanami::Model::Error.for(e)
     end
 
     # Return all the records for the relation

test/integration/repository/base_test.rb

@@ -39,8 +39,8 @@
       it 'raises error' do
         repository.create(id: id)
 
-        exception = -> { repository.find(id) }.must_raise(Hanami::Model::UnknownPrimaryKeyError)
-        exception.message.must_equal "Can't find primary key for `labels' table"
+        exception = -> { repository.find(id) }.must_raise(Hanami::Model::MissingPrimaryKeyError)
+        exception.message.must_equal "Missing primary key for :labels"
       end
     end
   end