mirror of https://github.com/rails/rails
Allow `:precision` option for time type columns
This commit is contained in:
parent
9a476b8cd6
commit
9ef870c042
|
@ -1,3 +1,7 @@
|
|||
* Allow `:precision` option for time type columns.
|
||||
|
||||
*Ryuta Kamizono*
|
||||
|
||||
* Add `ActiveRecord::Base.suppress` to prevent the receiver from being saved
|
||||
during the given block.
|
||||
|
||||
|
|
|
@ -851,6 +851,12 @@ module ActiveRecord
|
|||
raise ArgumentError, "Error adding decimal column: precision cannot be empty if scale is specified"
|
||||
end
|
||||
|
||||
elsif [:datetime, :time].include?(type) && precision ||= native[:precision]
|
||||
if (0..6) === precision
|
||||
column_type_sql << "(#{precision})"
|
||||
else
|
||||
raise(ActiveRecordError, "No #{native[:name]} type has precision of #{precision}. The allowed range of precision is from 0 to 6")
|
||||
end
|
||||
elsif (type != :primary_key) && (limit ||= native.is_a?(Hash) && native[:limit])
|
||||
column_type_sql << "(#{limit})"
|
||||
end
|
||||
|
|
|
@ -245,6 +245,11 @@ module ActiveRecord
|
|||
false
|
||||
end
|
||||
|
||||
# Does this adapter support datetime with precision?
|
||||
def supports_datetime_with_precision?
|
||||
false
|
||||
end
|
||||
|
||||
# This is meant to be implemented by the adapters that support extensions
|
||||
def disable_extension(name)
|
||||
end
|
||||
|
|
|
@ -251,6 +251,10 @@ module ActiveRecord
|
|||
version[0] >= 5
|
||||
end
|
||||
|
||||
def supports_datetime_with_precision?
|
||||
(version[0] == 5 && version[1] >= 6) || version[0] >= 6
|
||||
end
|
||||
|
||||
def native_database_types
|
||||
NATIVE_DATABASE_TYPES
|
||||
end
|
||||
|
@ -623,13 +627,6 @@ module ActiveRecord
|
|||
when 0x1000000..0xffffffff; 'longtext'
|
||||
else raise(ActiveRecordError, "No text type has character length #{limit}")
|
||||
end
|
||||
when 'datetime'
|
||||
return super unless precision
|
||||
|
||||
case precision
|
||||
when 0..6; "datetime(#{precision})"
|
||||
else raise(ActiveRecordError, "No datetime type has precision of #{precision}. The allowed range of precision is from 0 to 6.")
|
||||
end
|
||||
else
|
||||
super
|
||||
end
|
||||
|
|
|
@ -533,12 +533,6 @@ module ActiveRecord
|
|||
when 5..8; 'bigint'
|
||||
else raise(ActiveRecordError, "No integer type has byte size #{limit}. Use a numeric with precision 0 instead.")
|
||||
end
|
||||
when 'datetime'
|
||||
case precision
|
||||
when nil; super(type, limit, precision, scale)
|
||||
when 0..6; "timestamp(#{precision})"
|
||||
else raise(ActiveRecordError, "No timestamp type has precision of #{precision}. The allowed range of precision is from 0 to 6")
|
||||
end
|
||||
else
|
||||
super(type, limit, precision, scale)
|
||||
end
|
||||
|
|
|
@ -180,6 +180,10 @@ module ActiveRecord
|
|||
true
|
||||
end
|
||||
|
||||
def supports_datetime_with_precision?
|
||||
true
|
||||
end
|
||||
|
||||
def index_algorithms
|
||||
{ concurrently: 'CONCURRENTLY' }
|
||||
end
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
require 'cases/helper'
|
||||
require 'support/schema_dumping_helper'
|
||||
|
||||
if mysql_56? || current_adapter?(:PostgreSQLAdapter)
|
||||
if ActiveRecord::Base.connection.supports_datetime_with_precision?
|
||||
class DateTimePrecisionTest < ActiveRecord::TestCase
|
||||
include SchemaDumpingHelper
|
||||
self.use_transactional_fixtures = false
|
||||
|
|
|
@ -0,0 +1,65 @@
|
|||
require 'cases/helper'
|
||||
|
||||
if ActiveRecord::Base.connection.supports_datetime_with_precision?
|
||||
class TimePrecisionTest < ActiveRecord::TestCase
|
||||
setup do
|
||||
@connection = ActiveRecord::Base.connection
|
||||
end
|
||||
|
||||
teardown do
|
||||
@connection.drop_table :foos, if_exists: true
|
||||
end
|
||||
|
||||
def test_time_data_type_with_precision
|
||||
@connection.create_table(:foos, force: true)
|
||||
@connection.add_column :foos, :start, :time, precision: 3
|
||||
@connection.add_column :foos, :finish, :time, precision: 6
|
||||
assert_equal 3, activerecord_column_option('foos', 'start', 'precision')
|
||||
assert_equal 6, activerecord_column_option('foos', 'finish', 'precision')
|
||||
end
|
||||
|
||||
def test_passing_precision_to_time_does_not_set_limit
|
||||
@connection.create_table(:foos, force: true) do |t|
|
||||
t.time :start, precision: 3
|
||||
t.time :finish, precision: 6
|
||||
end
|
||||
assert_nil activerecord_column_option('foos', 'start', 'limit')
|
||||
assert_nil activerecord_column_option('foos', 'finish', 'limit')
|
||||
end
|
||||
|
||||
def test_invalid_time_precision_raises_error
|
||||
assert_raises ActiveRecord::ActiveRecordError do
|
||||
@connection.create_table(:foos, force: true) do |t|
|
||||
t.time :start, precision: 7
|
||||
t.time :finish, precision: 7
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
def test_database_agrees_with_activerecord_about_precision
|
||||
@connection.create_table(:foos, force: true) do |t|
|
||||
t.time :start, precision: 2
|
||||
t.time :finish, precision: 4
|
||||
end
|
||||
assert_equal 2, database_datetime_precision('foos', 'start')
|
||||
assert_equal 4, database_datetime_precision('foos', 'finish')
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def database_datetime_precision(table_name, column_name)
|
||||
results = @connection.exec_query("SELECT column_name, datetime_precision FROM information_schema.columns WHERE table_name = '#{table_name}'")
|
||||
result = results.find do |result_hash|
|
||||
result_hash["column_name"] == column_name
|
||||
end
|
||||
result && result["datetime_precision"].to_i
|
||||
end
|
||||
|
||||
def activerecord_column_option(tablename, column_name, option)
|
||||
result = @connection.columns(tablename).find do |column|
|
||||
column.name == column_name
|
||||
end
|
||||
result && result.send(option)
|
||||
end
|
||||
end
|
||||
end
|
Loading…
Reference in New Issue