Merge pull request #10 from jksy/feature/fix-raise-error-on-mysql

Fixed an error that occurred when using this on mysql.
This commit is contained in:
YingRui Lu 2020-11-21 05:47:32 +08:00 committed by GitHub
commit 1b01e6a31a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -132,14 +132,15 @@ module Jsonapi
end
model_klass.columns.each do |col|
col_name = transform_method ? col.name.send(transform_method) : col.name
clos[col_name.to_sym] = { type: swagger_type(col), items_type: col.type, is_array: col.array, nullable: col.null, comment: col.comment }
is_array = col.respond_to?(:array) ? col.array : false
clos[col_name.to_sym] = { type: swagger_type(col), items_type: col.type, is_array: is_array, nullable: col.null, comment: col.comment }
clos[col_name.to_sym][:comment] = safe_encode(col.comment) if need_encoding
end
end
end
def swagger_type(column)
return 'array' if column.array
return 'array' if column.respond_to?(:array) && column.array
case column.type
when :bigint, :integer then 'integer'
@ -168,4 +169,4 @@ module Jsonapi
content&.force_encoding('ASCII-8BIT')
end
end
end
end