kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Revert "Allow :precision option for time type columns"

Browse source 
This reverts commit 1502caefd3.

The test suite for the mysql adapter broke when this commit was used
with MySQL 5.6.

Conflicts:
	activerecord/CHANGELOG.md
This commit is contained in:
Sean Griffin 2015-02-17 11:12:52 -07:00
parent df3fc94ae3
commit 89ba5bb456
7 changed files with 19 additions and 90 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
activerecord/CHANGELOG.md
View file

@ -29,10 +29,6 @@
*Eugene Gilburg*
* Allow `:precision` option for time type columns.
*Ryuta Kamizono*
* Have `enum` perform type casting consistently with the rest of Active
Record, such as `where`.

6
activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
View file

@ -851,12 +851,6 @@ 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

5
activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
View file

@ -245,11 +245,6 @@ 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

11
activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
View file

@ -251,10 +251,6 @@ 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
@ -627,6 +623,13 @@ 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

7
activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb
View file

@ -534,6 +534,13 @@ 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'
return super unless precision
case precision
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
end

11
activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
View file

@ -180,10 +180,6 @@ module ActiveRecord
true
end
def supports_datetime_with_precision?
true
end
def index_algorithms
{ concurrently: 'CONCURRENTLY' }
end
@ -481,6 +477,7 @@ module ActiveRecord
register_class_with_limit m, 'varbit', OID::BitVarying
m.alias_type 'timestamptz', 'timestamp'
m.register_type 'date', Type::Date.new
m.register_type 'time', Type::Time.new
m.register_type 'money', OID::Money.new
m.register_type 'bytea', OID::Bytea.new
@ -506,8 +503,10 @@ module ActiveRecord
m.alias_type 'lseg', 'varchar'
m.alias_type 'box', 'varchar'
register_class_with_precision m, 'time', Type::Time
register_class_with_precision m, 'timestamp', OID::DateTime
m.register_type 'timestamp' do |_, _, sql_type|
precision = extract_precision(sql_type)
OID::DateTime.new(precision: precision)
end
m.register_type 'numeric' do |_, fmod, sql_type|
precision = extract_precision(sql_type)

65
activerecord/test/cases/time_precision_test.rb
View file

@ -1,65 +0,0 @@
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