refactor: change some compiler error messages

Author: vladfaust

src/onyx-sql/bulk_query/where.cr

@@ -7,7 +7,7 @@ module Onyx::SQL
           raise "Onyx::SQL::Model::Options annotation must be defined for #{T}" unless options
 
           pk = options[:primary_key]
-          raise "Onyx::SQL::Model::Options annotation is missing :primary_key option for #{T}" unless pk
+          raise "Onyx::SQL::Model::Options annotation is missing `primary_key` option for #{T}" unless pk
 
           pk_ivar = T.instance_vars.find { |iv| "@#{iv.name}".id == pk.id }
           raise "Cannot find primary key field #{pk} for #{T}" unless pk_ivar

src/onyx-sql/model/instance_query_shortcuts.cr

@@ -25,7 +25,11 @@ module Onyx::SQL::Model
             query.insert({{ivar.name}}: @{{ivar.name}}.not_nil!)
           end
         {% elsif ann && ann[:not_null] %}
-          query.insert({{ivar.name}}: @{{ivar.name}}.not_nil!)
+          if @{{ivar.name}}.nil?
+            raise NilAssertionError.new("{{@type}}@{{ivar.name}} must not be nil on {{@type}}#insert")
+          else
+            query.insert({{ivar.name}}: @{{ivar.name}}.not_nil!)
+          end
         {% else %}
           query.insert({{ivar.name}}: @{{ivar.name}})
         {% end %}

src/onyx-sql/query/insert.cr

@@ -33,7 +33,7 @@ module Onyx::SQL
               ivar = T.instance_vars.find(&.name.== key)
 
               not_null = (a = ivar.annotation(Field) || ivar.annotation(Reference)) && a[:not_null]
-              raise "On Query#insert: #{key} is nilable in compilation time (#{value}), but @#{ivar.name} has `not_null` option set to `true`. Consider calling `.not_nil!` on the value" if not_null && value.nilable?
+              raise "On Query(#{T})#insert: #{key} is nilable in compilation time (`#{value}`), but #{T}@#{ivar.name} has `not_null` option set to `true`. Consider calling `.not_nil!` on the value" if not_null && value.nilable?
 
               db_default = (a = ivar.annotation(Field)) && a[:default]
               is_pk = "@#{ivar.name}".id == T.annotation(Model::Options)[:primary_key].id

src/onyx-sql/query/join.cr

@@ -174,14 +174,14 @@ module Onyx::SQL
             raise "Onyx::SQL::Model::Options annotation must be defined for #{type}" unless roptions
 
             rtable = roptions[:table].id
-            raise "Onyx::SQL::Model::Options annotation is missing :table option for #{type}" unless rtable
+            raise "Onyx::SQL::Model::Options annotation is missing `table` option for #{type}" unless rtable
           %}
 
           when .{{ivar.name}}?
             {% if key = ivar.annotation(Reference)[:key] %}
               {%
                 rpk = roptions[:primary_key]
-                raise "Onyx::SQL::Model::Options annotation is missing :primary_key option for #{type}" unless rpk
+                raise "Onyx::SQL::Model::Options annotation is missing `primary_key` option for #{type}" unless rpk
 
                 rpk = rpk.name.stringify.split('@')[1].id
                 on_op = (enumerable ? "IN".id : "=".id)
@@ -212,11 +212,11 @@ module Onyx::SQL
                 type: type
               )
             {% else %}
-              {% raise "Neither `key` nor `foreign_key` option is set for reference @#{ivar.name} in #{T}" %}
+              {% raise "Neither `key` nor `foreign_key` option is set for reference @#{ivar.name} of #{T}" %}
             {% end %}
         {% end %}
         else
-          raise "BUG: Cannot find reference #{reference} in #{T}::Reference"
+          raise "BUG: Cannot find reference #{reference} in #{T}::Reference enum"
         end
       {% end %}
 

src/onyx-sql/query/set.cr

@@ -55,7 +55,7 @@ module Onyx::SQL
               ivar = T.instance_vars.find(&.name.== key)
 
               not_null = (a = ivar.annotation(Field) || ivar.annotation(Reference)) && a[:not_null]
-              raise "On Query#set: #{key} is nilable in compilation time (#{value}), but @#{ivar.name} has `not_null` option set to `true`. Consider calling `.not_nil!` on the value" if not_null && value.nilable?
+              raise "On Query(#{T})#set: #{key} is nilable in compilation time (`#{value}`), but #{T}@#{ivar.name} has `not_null` option set to `true`. Consider calling `.not_nil!` on the value" if not_null && value.nilable?
             %}
 
             {% raise "Cannot find an instance variable named @#{key} in #{T}" unless ivar %}

src/onyx-sql/query/where.cr

@@ -55,7 +55,7 @@ module Onyx::SQL
 
                   {% raise "`primary_key: #{pk}` option didn't match any of `#{type}` instance variables" unless pk_rivar %}
 
-                  {% raise "On Query#where: #{key} is nilable in compilation time (#{value}), but @#{ivar.name} has `not_null` option set to `true`. Consider calling `.not_nil!` on the value" if ann[:not_null] && value.nilable? %}
+                  {% raise "On Query(#{T})#where: #{key} is nilable in compilation time (`#{value}`), but #{T}@#{ivar.name} has `not_null` option set to `true`. Consider calling `.not_nil!` on the value" if ann[:not_null] && value.nilable? %}
 
                   {% reference_sql_key = ivar.annotation(Reference)[:key].id %}
 
@@ -95,9 +95,9 @@ module Onyx::SQL
               {% elsif key.id == ivar.name %}
                 {% not_null = (a = ivar.annotation(Field)) && a[:not_null] %}
 
-                {% raise "On Query#where: argument `#{key}:` is nilable in compilation time #{value}, but #{T}@#{ivar.name} has `not_null` option set to `true`. Consider calling `.not_nil!` on the `#{key}:` argument" if not_null && value.nilable? %}
+                {% raise "On Query#where: argument `#{key}` is nilable in compilation time (`#{value}`), but #{T}@#{ivar.name} has `not_null` option set to `true`. Consider calling `.not_nil!` on the `#{key}` argument" if not_null && value.nilable? %}
 
-                {% raise "Invalid compile-time type `#{value}` for argument `#{key.symbolize}` in `Query(#{T})#where` call. Expected: `#{ivar.type}`" unless value <= ivar.type %}
+                {% raise "Invalid compile-time type `#{value}` for argument `#{key.symbolize}` on `Query(#{T})#where` call. Expected: `#{ivar.type}`" unless value <= ivar.type %}
 
                 {% found = true %}