Full support for Int16

db/migrations/20190702125912_create_menu_options.cr

@@ -0,0 +1,14 @@
+class CreateMenuOptions::V20190702125912 < Avram::Migrator::Migration::V1
+  def migrate
+    create table_for(MenuOption) do
+      primary_key id : Int16
+      add_timestamps
+      add title : String
+      add option_value : Int16
+    end
+  end
+
+  def rollback
+    drop :menu_options
+  end
+end

spec/migrator/create_table_statement_spec.cr

@@ -62,6 +62,16 @@ describe Avram::Migrator::CreateTableStatement do
     CREATE TABLE users (
       custom_id_name bigserial PRIMARY KEY);
     SQL
+
+    built = Avram::Migrator::CreateTableStatement.new(:users).build do
+      primary_key id : Int16
+    end
+
+    built.statements.size.should eq 1
+    built.statements.first.should eq <<-SQL
+    CREATE TABLE users (
+      id smallserial PRIMARY KEY);
+    SQL
   end
 
   it "sets default values" do
@@ -75,6 +85,7 @@ describe Avram::Migrator::CreateTableStatement do
       add meta : JSON::Any, default: JSON::Any.new(Hash(String, JSON::Any).new)
       add joined_at : Time, default: :now
       add future_time : Time, default: Time.local
+      add friend_count : Int16, default: 1
     end
 
     built.statements.size.should eq 1
@@ -88,7 +99,8 @@ describe Avram::Migrator::CreateTableStatement do
       completed boolean NOT NULL DEFAULT 'false',
       meta jsonb NOT NULL DEFAULT '{}',
       joined_at timestamptz NOT NULL DEFAULT NOW(),
-      future_time timestamptz NOT NULL DEFAULT '#{Time.local.to_utc}');
+      future_time timestamptz NOT NULL DEFAULT '#{Time.local.to_utc}',
+      friend_count smallint NOT NULL DEFAULT '1');
     SQL
   end
 

spec/support/boxes/menu_option_box.cr

@@ -0,0 +1,6 @@
+class MenuOptionBox < BaseBox
+  def initialize
+    title "Option"
+    option_value 1_i16
+  end
+end

spec/support/menu_option.cr

@@ -0,0 +1,11 @@
+class MenuOption < Avram::Model
+  skip_default_columns
+
+  table do
+    primary_key id : Int16
+    timestamps
+
+    column title : String
+    column option_value : Int16
+  end
+end

spec/type_extension_spec.cr

@@ -12,6 +12,9 @@ class SaveCompany < Company::SaveOperation
   end
 end
 
+class MenuOptionQuery < MenuOption::BaseQuery
+end
+
 describe "TypeExtensions" do
   it "should work in boxes" do
     CompanyBox.create
@@ -38,4 +41,13 @@ describe "TypeExtensions" do
     using_earnings = CompanyQuery.new.earnings(1).first
     using_earnings.earnings.should eq 1.0
   end
+
+  it "Int16 should allow querying with Int32" do
+    MenuOptionBox.create &.title("test").option_value(4_i16)
+    opt = MenuOptionQuery.new.option_value(4).first
+    opt.option_value.should eq 4_i16
+
+    opt = MenuOptionQuery.new.option_value(33000).first?
+    opt.should eq nil
+  end
 end

src/avram/blank_extensions.cr

@@ -4,6 +4,12 @@ struct Time
   end
 end
 
+struct Int16
+  def blank?
+    nil?
+  end
+end
+
 struct Int32
   def blank?
     nil?

src/avram/charms/int16_extensions.cr

@@ -0,0 +1,31 @@
+struct Int16
+  module Lucky
+    alias ColumnType = Int16
+    include Avram::Type
+
+    def self.from_db!(value : Int16)
+      value
+    end
+
+    def self.parse(value : Int16)
+      SuccessfulCast(Int16).new(value)
+    end
+
+    def self.parse(value : String)
+      SuccessfulCast(Int16).new value.to_i16
+    rescue ArgumentError
+      FailedCast.new
+    end
+
+    def self.parse(value : Int32)
+      SuccessfulCast(Int16).new value.to_i16
+    end
+
+    def self.to_db(value : Int16)
+      value.to_s
+    end
+
+    class Criteria(T, V) < Avram::Criteria(T, V)
+    end
+  end
+end

src/avram/migrator/columns/int16_column.cr

@@ -0,0 +1,14 @@
+require "./base"
+
+module Avram::Migrator::Columns
+  class Int16Column < Base
+    @default : Int16 | Int32 | Nil = nil
+
+    def initialize(@name, @nilable, @default)
+    end
+
+    def column_type
+      "smallint"
+    end
+  end
+end

src/avram/migrator/columns/primary_keys/int16_primary_key.cr

@@ -0,0 +1,12 @@
+require "./base"
+
+module Avram::Migrator::Columns::PrimaryKeys
+  class Int16PrimaryKey < Base
+    def initialize(@name)
+    end
+
+    def column_type : String
+      "smallserial"
+    end
+  end
+end