Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions packages/forest_admin_datasource_active_record/Gemfile
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,8 @@ source "https://rubygems.org"
gemspec

gem 'database_cleaner-active_record'
gem 'forest_admin_agent'
gem 'forest_admin_datasource_customizer'
gem 'forest_admin_datasource_toolkit'
gem 'rake', '~> 13.0'
gem 'rubocop', '~> 1.21'
Expand Down
2 changes: 2 additions & 0 deletions packages/forest_admin_datasource_active_record/Gemfile-test
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,8 @@ gem 'rubocop', '~> 1.21'
group :development, :test do
gem 'database_cleaner-active_record'
gem 'forest_admin_datasource_toolkit', path: '../forest_admin_datasource_toolkit'
gem 'forest_admin_datasource_customizer', path: '../forest_admin_datasource_customizer'
gem 'forest_admin_agent', path: '../forest_admin_agent'
gem 'rails'
gem 'rspec-rails', '~> 3.0'
gem 'simplecov', '~> 0.22', require: false
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,8 +27,18 @@ def get_column_type(model, column)
return 'Enum'
end

if TYPES.key?(column.type)
type = TYPES[column.type]
else
type = TYPES[:string]
ForestAdminAgent::Facades::Container.logger.log(
'Info',
"unknown type '#{column.type}' for field named '#{column.name}', '#{TYPES[:string]}' type use by default"
)
end

is_array = column.respond_to?(:array) && column.array == true
is_array ? "[#{TYPES[column.type]}]" : TYPES[column.type]
is_array ? "[#{type}]" : type
end

def get_enum_values(model, column)
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,7 @@ def parse_numericality_validator(validator, parsed_validations)
end

def parse_length_validator(validator, parsed_validations)
return unless get_column_type(column) == 'String'
return unless get_column_type(@model, column) == 'String'

validator.options.each do |option, value|
case option
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,18 @@ module Parser
it { expect(dummy_class.get_column_type(User, columns['time_field'])).to eq 'Time' }
it { expect(dummy_class.get_column_type(User, columns['binary_field'])).to eq 'Binary' }
it { expect(dummy_class.get_column_type(User, columns['enum_field'])).to eq 'Enum' }

it 'return string type by default when column type is unknown' do
logger = instance_double(Logger, log: nil)
allow(ForestAdminAgent::Facades::Container).to receive(:logger).and_return(logger)
column = instance_double(
ActiveRecord::ConnectionAdapters::SQLite3::Column,
name: 'foo',
type: 'unknown type'
)

expect(dummy_class.get_column_type(User, column)).to eq 'String'
end
end

describe 'get_enum_values' do
Expand Down