move ivar to initialize, use triple dot rather than minus

2 files changed, 2 insertions, 2 deletions

diff --git a/activerecord/lib/active_record/associations/class_methods/join_dependency/join_association.rb b/activerecord/lib/active_record/associations/class_methods/join_dependency/join_association.rb
index f1b923e98b..c552603097 100644
--- a/activerecord/lib/active_record/associations/class_methods/join_dependency/join_association.rb
+++ b/activerecord/lib/active_record/associations/class_methods/join_dependency/join_association.rb
@@ -37,6 +37,7 @@ module ActiveRecord
             @join_dependency = join_dependency
             @parent          = parent
             @join_type       = Arel::InnerJoin
+            @aliased_prefix  = "t#{ join_dependency.join_parts.size }"
 
             # This must be done eagerly upon initialisation because the alias which is produced
             # depends on the state of the join dependency, but we want it to work the same way
@@ -97,7 +98,6 @@ module ActiveRecord
           private
 
           def allocate_aliases
-            @aliased_prefix     = "t#{ join_dependency.join_parts.size }"
             @aliased_table_name = aliased_table_name_for(table_name)
 
             if reflection.macro == :has_and_belongs_to_many
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb b/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
index d4aefada22..5b9c48bafa 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
@@ -12,7 +12,7 @@ module ActiveRecord
 
       # Truncates a table alias according to the limits of the current adapter.
       def table_alias_for(table_name)
-        table_name[0..table_alias_length-1].gsub(/\./, '_')
+        table_name[0...table_alias_length].gsub(/\./, '_')
       end
 
       # def tables(name = nil) end