mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Use max_identifier_length
for index_name_length
in PostgreSQL adapter
Actually `index_name_length` depend on `max_identifier_length`, not always 63.
This commit is contained in:
parent
7888f4fae0
commit
64e494f748
4 changed files with 8 additions and 8 deletions
|
@ -1,3 +1,7 @@
|
|||
* Use `max_identifier_length` for `index_name_length` in PostgreSQL adapter.
|
||||
|
||||
*Ryuta Kamizono*
|
||||
|
||||
* Deprecate `supports_migrations?` on connection adapters.
|
||||
|
||||
*Ryuta Kamizono*
|
||||
|
|
|
@ -615,10 +615,6 @@ module ActiveRecord
|
|||
end
|
||||
end
|
||||
|
||||
def index_name_length
|
||||
63
|
||||
end
|
||||
|
||||
# Maps logical Rails types to PostgreSQL-specific data types.
|
||||
def type_to_sql(type, limit: nil, precision: nil, scale: nil, array: nil, **) # :nodoc:
|
||||
sql = \
|
||||
|
|
|
@ -215,7 +215,7 @@ module ActiveRecord
|
|||
|
||||
# @local_tz is initialized as nil to avoid warnings when connect tries to use it
|
||||
@local_tz = nil
|
||||
@table_alias_length = nil
|
||||
@max_identifier_length = nil
|
||||
|
||||
connect
|
||||
add_pg_encoders
|
||||
|
@ -358,8 +358,9 @@ module ActiveRecord
|
|||
|
||||
# Returns the configured supported identifier length supported by PostgreSQL
|
||||
def table_alias_length
|
||||
@table_alias_length ||= query("SHOW max_identifier_length", "SCHEMA")[0][0].to_i
|
||||
@max_identifier_length ||= select_value("SHOW max_identifier_length", "SCHEMA").to_i
|
||||
end
|
||||
alias index_name_length table_alias_length
|
||||
|
||||
# Set the authorized user for this session
|
||||
def session_auth=(user)
|
||||
|
|
|
@ -105,7 +105,7 @@ module ActiveRecord
|
|||
end
|
||||
|
||||
def test_table_alias_length_logs_name
|
||||
@connection.instance_variable_set("@table_alias_length", nil)
|
||||
@connection.instance_variable_set("@max_identifier_length", nil)
|
||||
@connection.table_alias_length
|
||||
assert_equal "SCHEMA", @subscriber.logged[0][1]
|
||||
end
|
||||
|
@ -177,7 +177,6 @@ module ActiveRecord
|
|||
assert_not_equal original_connection_pid, new_connection_pid,
|
||||
"umm -- looks like you didn't break the connection, because we're still " \
|
||||
"successfully querying with the same connection pid."
|
||||
|
||||
ensure
|
||||
# Repair all fixture connections so other tests won't break.
|
||||
@fixture_connections.each(&:verify!)
|
||||
|
|
Loading…
Reference in a new issue