activerecord 6.0.0 → 6.1.3
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of activerecord might be problematic. Click here for more details.
- checksums.yaml +4 -4
- data/CHANGELOG.md +1045 -575
- data/MIT-LICENSE +1 -1
- data/README.rdoc +4 -4
- data/lib/active_record.rb +7 -13
- data/lib/active_record/aggregations.rb +5 -6
- data/lib/active_record/association_relation.rb +30 -10
- data/lib/active_record/associations.rb +120 -13
- data/lib/active_record/associations/alias_tracker.rb +19 -16
- data/lib/active_record/associations/association.rb +49 -29
- data/lib/active_record/associations/association_scope.rb +19 -15
- data/lib/active_record/associations/belongs_to_association.rb +22 -8
- data/lib/active_record/associations/belongs_to_polymorphic_association.rb +8 -3
- data/lib/active_record/associations/builder/association.rb +32 -5
- data/lib/active_record/associations/builder/belongs_to.rb +10 -7
- data/lib/active_record/associations/builder/collection_association.rb +5 -4
- data/lib/active_record/associations/builder/has_and_belongs_to_many.rb +0 -3
- data/lib/active_record/associations/builder/has_many.rb +6 -2
- data/lib/active_record/associations/builder/has_one.rb +11 -14
- data/lib/active_record/associations/builder/singular_association.rb +1 -1
- data/lib/active_record/associations/collection_association.rb +25 -8
- data/lib/active_record/associations/collection_proxy.rb +14 -7
- data/lib/active_record/associations/foreign_association.rb +13 -0
- data/lib/active_record/associations/has_many_association.rb +24 -3
- data/lib/active_record/associations/has_many_through_association.rb +10 -4
- data/lib/active_record/associations/has_one_association.rb +15 -1
- data/lib/active_record/associations/join_dependency.rb +77 -42
- data/lib/active_record/associations/join_dependency/join_association.rb +39 -16
- data/lib/active_record/associations/join_dependency/join_part.rb +3 -3
- data/lib/active_record/associations/preloader.rb +13 -8
- data/lib/active_record/associations/preloader/association.rb +51 -25
- data/lib/active_record/associations/preloader/through_association.rb +2 -2
- data/lib/active_record/associations/singular_association.rb +1 -1
- data/lib/active_record/associations/through_association.rb +1 -1
- data/lib/active_record/attribute_assignment.rb +10 -9
- data/lib/active_record/attribute_methods.rb +64 -54
- data/lib/active_record/attribute_methods/before_type_cast.rb +13 -10
- data/lib/active_record/attribute_methods/dirty.rb +3 -13
- data/lib/active_record/attribute_methods/primary_key.rb +6 -4
- data/lib/active_record/attribute_methods/query.rb +3 -6
- data/lib/active_record/attribute_methods/read.rb +8 -12
- data/lib/active_record/attribute_methods/serialization.rb +11 -6
- data/lib/active_record/attribute_methods/time_zone_conversion.rb +12 -15
- data/lib/active_record/attribute_methods/write.rb +12 -21
- data/lib/active_record/attributes.rb +33 -9
- data/lib/active_record/autosave_association.rb +63 -44
- data/lib/active_record/base.rb +2 -14
- data/lib/active_record/callbacks.rb +153 -24
- data/lib/active_record/coders/yaml_column.rb +1 -2
- data/lib/active_record/connection_adapters.rb +50 -0
- data/lib/active_record/connection_adapters/abstract/connection_pool.rb +202 -138
- data/lib/active_record/connection_adapters/abstract/database_limits.rb +2 -44
- data/lib/active_record/connection_adapters/abstract/database_statements.rb +87 -38
- data/lib/active_record/connection_adapters/abstract/query_cache.rb +5 -10
- data/lib/active_record/connection_adapters/abstract/quoting.rb +34 -34
- data/lib/active_record/connection_adapters/abstract/savepoints.rb +3 -3
- data/lib/active_record/connection_adapters/abstract/schema_creation.rb +152 -116
- data/lib/active_record/connection_adapters/abstract/schema_definitions.rb +141 -52
- data/lib/active_record/connection_adapters/abstract/schema_dumper.rb +3 -3
- data/lib/active_record/connection_adapters/abstract/schema_statements.rb +267 -105
- data/lib/active_record/connection_adapters/abstract/transaction.rb +82 -35
- data/lib/active_record/connection_adapters/abstract_adapter.rb +74 -77
- data/lib/active_record/connection_adapters/abstract_mysql_adapter.rb +149 -115
- data/lib/active_record/connection_adapters/column.rb +15 -1
- data/lib/active_record/connection_adapters/deduplicable.rb +29 -0
- data/lib/active_record/connection_adapters/legacy_pool_manager.rb +31 -0
- data/lib/active_record/connection_adapters/mysql/column.rb +1 -1
- data/lib/active_record/connection_adapters/mysql/database_statements.rb +30 -36
- data/lib/active_record/connection_adapters/mysql/explain_pretty_printer.rb +1 -2
- data/lib/active_record/connection_adapters/mysql/quoting.rb +18 -3
- data/lib/active_record/connection_adapters/mysql/schema_creation.rb +32 -7
- data/lib/active_record/connection_adapters/mysql/schema_definitions.rb +8 -0
- data/lib/active_record/connection_adapters/mysql/schema_dumper.rb +5 -2
- data/lib/active_record/connection_adapters/mysql/schema_statements.rb +17 -13
- data/lib/active_record/connection_adapters/mysql/type_metadata.rb +10 -1
- data/lib/active_record/connection_adapters/mysql2_adapter.rb +31 -13
- data/lib/active_record/connection_adapters/pool_config.rb +73 -0
- data/lib/active_record/connection_adapters/pool_manager.rb +43 -0
- data/lib/active_record/connection_adapters/postgresql/column.rb +24 -1
- data/lib/active_record/connection_adapters/postgresql/database_statements.rb +21 -56
- data/lib/active_record/connection_adapters/postgresql/oid.rb +2 -0
- data/lib/active_record/connection_adapters/postgresql/oid/array.rb +0 -1
- data/lib/active_record/connection_adapters/postgresql/oid/cidr.rb +3 -5
- data/lib/active_record/connection_adapters/postgresql/oid/date.rb +2 -2
- data/lib/active_record/connection_adapters/postgresql/oid/date_time.rb +10 -2
- data/lib/active_record/connection_adapters/postgresql/oid/enum.rb +0 -1
- data/lib/active_record/connection_adapters/postgresql/oid/hstore.rb +0 -1
- data/lib/active_record/connection_adapters/postgresql/oid/interval.rb +49 -0
- data/lib/active_record/connection_adapters/postgresql/oid/legacy_point.rb +2 -3
- data/lib/active_record/connection_adapters/postgresql/oid/macaddr.rb +25 -0
- data/lib/active_record/connection_adapters/postgresql/oid/money.rb +2 -2
- data/lib/active_record/connection_adapters/postgresql/oid/oid.rb +1 -1
- data/lib/active_record/connection_adapters/postgresql/oid/point.rb +2 -3
- data/lib/active_record/connection_adapters/postgresql/oid/range.rb +24 -6
- data/lib/active_record/connection_adapters/postgresql/oid/specialized_string.rb +1 -1
- data/lib/active_record/connection_adapters/postgresql/oid/uuid.rb +11 -2
- data/lib/active_record/connection_adapters/postgresql/quoting.rb +4 -4
- data/lib/active_record/connection_adapters/postgresql/referential_integrity.rb +2 -2
- data/lib/active_record/connection_adapters/postgresql/schema_creation.rb +7 -3
- data/lib/active_record/connection_adapters/postgresql/schema_definitions.rb +1 -1
- data/lib/active_record/connection_adapters/postgresql/schema_dumper.rb +0 -1
- data/lib/active_record/connection_adapters/postgresql/schema_statements.rb +72 -54
- data/lib/active_record/connection_adapters/postgresql/type_metadata.rb +8 -0
- data/lib/active_record/connection_adapters/postgresql/utils.rb +0 -1
- data/lib/active_record/connection_adapters/postgresql_adapter.rb +83 -65
- data/lib/active_record/connection_adapters/schema_cache.rb +98 -15
- data/lib/active_record/connection_adapters/sql_type_metadata.rb +10 -0
- data/lib/active_record/connection_adapters/sqlite3/database_statements.rb +38 -12
- data/lib/active_record/connection_adapters/sqlite3/quoting.rb +1 -2
- data/lib/active_record/connection_adapters/sqlite3/schema_creation.rb +5 -1
- data/lib/active_record/connection_adapters/sqlite3/schema_statements.rb +38 -5
- data/lib/active_record/connection_adapters/sqlite3_adapter.rb +61 -57
- data/lib/active_record/connection_adapters/statement_pool.rb +0 -1
- data/lib/active_record/connection_handling.rb +219 -81
- data/lib/active_record/core.rb +253 -67
- data/lib/active_record/counter_cache.rb +4 -1
- data/lib/active_record/database_configurations.rb +124 -85
- data/lib/active_record/database_configurations/connection_url_resolver.rb +98 -0
- data/lib/active_record/database_configurations/database_config.rb +52 -9
- data/lib/active_record/database_configurations/hash_config.rb +54 -8
- data/lib/active_record/database_configurations/url_config.rb +15 -41
- data/lib/active_record/delegated_type.rb +209 -0
- data/lib/active_record/destroy_association_async_job.rb +36 -0
- data/lib/active_record/dynamic_matchers.rb +2 -3
- data/lib/active_record/enum.rb +82 -38
- data/lib/active_record/errors.rb +47 -12
- data/lib/active_record/explain.rb +9 -5
- data/lib/active_record/explain_subscriber.rb +1 -1
- data/lib/active_record/fixture_set/file.rb +10 -17
- data/lib/active_record/fixture_set/model_metadata.rb +1 -2
- data/lib/active_record/fixture_set/render_context.rb +1 -1
- data/lib/active_record/fixture_set/table_row.rb +2 -3
- data/lib/active_record/fixture_set/table_rows.rb +0 -1
- data/lib/active_record/fixtures.rb +58 -12
- data/lib/active_record/gem_version.rb +2 -2
- data/lib/active_record/inheritance.rb +40 -21
- data/lib/active_record/insert_all.rb +39 -10
- data/lib/active_record/integration.rb +3 -5
- data/lib/active_record/internal_metadata.rb +16 -7
- data/lib/active_record/legacy_yaml_adapter.rb +7 -3
- data/lib/active_record/locking/optimistic.rb +33 -18
- data/lib/active_record/locking/pessimistic.rb +6 -2
- data/lib/active_record/log_subscriber.rb +28 -9
- data/lib/active_record/middleware/database_selector.rb +4 -2
- data/lib/active_record/middleware/database_selector/resolver.rb +14 -14
- data/lib/active_record/middleware/database_selector/resolver/session.rb +3 -0
- data/lib/active_record/migration.rb +115 -85
- data/lib/active_record/migration/command_recorder.rb +53 -45
- data/lib/active_record/migration/compatibility.rb +71 -20
- data/lib/active_record/migration/join_table.rb +0 -1
- data/lib/active_record/model_schema.rb +120 -15
- data/lib/active_record/nested_attributes.rb +2 -5
- data/lib/active_record/no_touching.rb +1 -1
- data/lib/active_record/null_relation.rb +0 -1
- data/lib/active_record/persistence.rb +50 -46
- data/lib/active_record/query_cache.rb +15 -5
- data/lib/active_record/querying.rb +12 -7
- data/lib/active_record/railtie.rb +65 -45
- data/lib/active_record/railties/console_sandbox.rb +2 -4
- data/lib/active_record/railties/databases.rake +277 -97
- data/lib/active_record/readonly_attributes.rb +4 -0
- data/lib/active_record/reflection.rb +77 -63
- data/lib/active_record/relation.rb +107 -67
- data/lib/active_record/relation/batches.rb +38 -32
- data/lib/active_record/relation/batches/batch_enumerator.rb +25 -9
- data/lib/active_record/relation/calculations.rb +102 -45
- data/lib/active_record/relation/delegation.rb +9 -7
- data/lib/active_record/relation/finder_methods.rb +55 -17
- data/lib/active_record/relation/from_clause.rb +5 -1
- data/lib/active_record/relation/merger.rb +27 -26
- data/lib/active_record/relation/predicate_builder.rb +59 -40
- data/lib/active_record/relation/predicate_builder/array_handler.rb +8 -9
- data/lib/active_record/relation/predicate_builder/association_query_value.rb +4 -5
- data/lib/active_record/relation/predicate_builder/polymorphic_array_value.rb +10 -6
- data/lib/active_record/relation/predicate_builder/relation_handler.rb +1 -1
- data/lib/active_record/relation/query_methods.rb +343 -180
- data/lib/active_record/relation/record_fetch_warning.rb +3 -3
- data/lib/active_record/relation/spawn_methods.rb +8 -8
- data/lib/active_record/relation/where_clause.rb +107 -61
- data/lib/active_record/result.rb +41 -34
- data/lib/active_record/runtime_registry.rb +2 -2
- data/lib/active_record/sanitization.rb +6 -17
- data/lib/active_record/schema_dumper.rb +34 -4
- data/lib/active_record/schema_migration.rb +2 -8
- data/lib/active_record/scoping.rb +0 -1
- data/lib/active_record/scoping/default.rb +0 -1
- data/lib/active_record/scoping/named.rb +7 -18
- data/lib/active_record/secure_token.rb +16 -8
- data/lib/active_record/serialization.rb +5 -3
- data/lib/active_record/signed_id.rb +116 -0
- data/lib/active_record/statement_cache.rb +20 -4
- data/lib/active_record/store.rb +3 -3
- data/lib/active_record/suppressor.rb +2 -2
- data/lib/active_record/table_metadata.rb +42 -36
- data/lib/active_record/tasks/database_tasks.rb +140 -113
- data/lib/active_record/tasks/mysql_database_tasks.rb +34 -36
- data/lib/active_record/tasks/postgresql_database_tasks.rb +24 -27
- data/lib/active_record/tasks/sqlite_database_tasks.rb +13 -10
- data/lib/active_record/test_databases.rb +5 -4
- data/lib/active_record/test_fixtures.rb +38 -16
- data/lib/active_record/timestamp.rb +4 -7
- data/lib/active_record/touch_later.rb +20 -21
- data/lib/active_record/transactions.rb +26 -73
- data/lib/active_record/type.rb +8 -2
- data/lib/active_record/type/adapter_specific_registry.rb +2 -5
- data/lib/active_record/type/hash_lookup_type_map.rb +0 -1
- data/lib/active_record/type/serialized.rb +6 -3
- data/lib/active_record/type/time.rb +10 -0
- data/lib/active_record/type/type_map.rb +0 -1
- data/lib/active_record/type/unsigned_integer.rb +0 -1
- data/lib/active_record/type_caster/connection.rb +0 -1
- data/lib/active_record/type_caster/map.rb +8 -5
- data/lib/active_record/validations.rb +3 -3
- data/lib/active_record/validations/associated.rb +1 -2
- data/lib/active_record/validations/numericality.rb +35 -0
- data/lib/active_record/validations/uniqueness.rb +24 -4
- data/lib/arel.rb +15 -12
- data/lib/arel/attributes/attribute.rb +4 -0
- data/lib/arel/collectors/bind.rb +5 -0
- data/lib/arel/collectors/composite.rb +8 -0
- data/lib/arel/collectors/sql_string.rb +7 -0
- data/lib/arel/collectors/substitute_binds.rb +7 -0
- data/lib/arel/nodes.rb +3 -1
- data/lib/arel/nodes/binary.rb +82 -8
- data/lib/arel/nodes/bind_param.rb +8 -0
- data/lib/arel/nodes/casted.rb +21 -9
- data/lib/arel/nodes/equality.rb +6 -9
- data/lib/arel/nodes/grouping.rb +3 -0
- data/lib/arel/nodes/homogeneous_in.rb +72 -0
- data/lib/arel/nodes/in.rb +8 -1
- data/lib/arel/nodes/infix_operation.rb +13 -1
- data/lib/arel/nodes/join_source.rb +1 -1
- data/lib/arel/nodes/node.rb +7 -6
- data/lib/arel/nodes/ordering.rb +27 -0
- data/lib/arel/nodes/sql_literal.rb +3 -0
- data/lib/arel/nodes/table_alias.rb +7 -3
- data/lib/arel/nodes/unary.rb +0 -1
- data/lib/arel/predications.rb +17 -24
- data/lib/arel/select_manager.rb +1 -2
- data/lib/arel/table.rb +13 -5
- data/lib/arel/visitors.rb +0 -7
- data/lib/arel/visitors/dot.rb +14 -3
- data/lib/arel/visitors/mysql.rb +11 -1
- data/lib/arel/visitors/postgresql.rb +15 -5
- data/lib/arel/visitors/sqlite.rb +0 -1
- data/lib/arel/visitors/to_sql.rb +89 -79
- data/lib/arel/visitors/visitor.rb +0 -1
- data/lib/rails/generators/active_record/application_record/application_record_generator.rb +0 -1
- data/lib/rails/generators/active_record/migration.rb +6 -2
- data/lib/rails/generators/active_record/migration/migration_generator.rb +1 -0
- data/lib/rails/generators/active_record/migration/templates/create_table_migration.rb.tt +2 -0
- data/lib/rails/generators/active_record/migration/templates/migration.rb.tt +4 -4
- data/lib/rails/generators/active_record/model/model_generator.rb +38 -2
- data/lib/rails/generators/active_record/model/templates/abstract_base_class.rb.tt +7 -0
- metadata +30 -27
- data/lib/active_record/attribute_decorators.rb +0 -90
- data/lib/active_record/connection_adapters/connection_specification.rb +0 -297
- data/lib/active_record/connection_adapters/determine_if_preparable_visitor.rb +0 -29
- data/lib/active_record/define_callbacks.rb +0 -22
- data/lib/active_record/railties/collection_cache_association_loading.rb +0 -34
- data/lib/active_record/relation/predicate_builder/base_handler.rb +0 -18
- data/lib/active_record/relation/where_clause_factory.rb +0 -33
- data/lib/arel/attributes.rb +0 -22
- data/lib/arel/visitors/depth_first.rb +0 -204
- data/lib/arel/visitors/ibm_db.rb +0 -34
- data/lib/arel/visitors/informix.rb +0 -62
- data/lib/arel/visitors/mssql.rb +0 -157
- data/lib/arel/visitors/oracle.rb +0 -159
- data/lib/arel/visitors/oracle12.rb +0 -66
- data/lib/arel/visitors/where_sql.rb +0 -23
@@ -6,9 +6,11 @@ module ActiveRecord
|
|
6
6
|
class TypeMetadata < DelegateClass(SqlTypeMetadata) # :nodoc:
|
7
7
|
undef to_yaml if method_defined?(:to_yaml)
|
8
8
|
|
9
|
+
include Deduplicable
|
10
|
+
|
9
11
|
attr_reader :extra
|
10
12
|
|
11
|
-
def initialize(type_metadata, extra:
|
13
|
+
def initialize(type_metadata, extra: nil)
|
12
14
|
super(type_metadata)
|
13
15
|
@extra = extra
|
14
16
|
end
|
@@ -25,6 +27,13 @@ module ActiveRecord
|
|
25
27
|
__getobj__.hash ^
|
26
28
|
extra.hash
|
27
29
|
end
|
30
|
+
|
31
|
+
private
|
32
|
+
def deduplicated
|
33
|
+
__setobj__(__getobj__.deduplicate)
|
34
|
+
@extra = -extra if extra
|
35
|
+
super
|
36
|
+
end
|
28
37
|
end
|
29
38
|
end
|
30
39
|
end
|
@@ -3,13 +3,11 @@
|
|
3
3
|
require "active_record/connection_adapters/abstract_mysql_adapter"
|
4
4
|
require "active_record/connection_adapters/mysql/database_statements"
|
5
5
|
|
6
|
-
gem "mysql2", "
|
6
|
+
gem "mysql2", "~> 0.5"
|
7
7
|
require "mysql2"
|
8
8
|
|
9
9
|
module ActiveRecord
|
10
10
|
module ConnectionHandling # :nodoc:
|
11
|
-
ER_BAD_DB_ERROR = 1049
|
12
|
-
|
13
11
|
# Establishes a connection to the database that's used by all Active Record objects.
|
14
12
|
def mysql2_connection(config)
|
15
13
|
config = config.symbolize_keys
|
@@ -21,23 +19,34 @@ module ActiveRecord
|
|
21
19
|
config[:flags] |= Mysql2::Client::FOUND_ROWS
|
22
20
|
end
|
23
21
|
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
raise
|
31
|
-
end
|
22
|
+
ConnectionAdapters::Mysql2Adapter.new(
|
23
|
+
ConnectionAdapters::Mysql2Adapter.new_client(config),
|
24
|
+
logger,
|
25
|
+
nil,
|
26
|
+
config,
|
27
|
+
)
|
32
28
|
end
|
33
29
|
end
|
34
30
|
|
35
31
|
module ConnectionAdapters
|
36
32
|
class Mysql2Adapter < AbstractMysqlAdapter
|
33
|
+
ER_BAD_DB_ERROR = 1049
|
37
34
|
ADAPTER_NAME = "Mysql2"
|
38
35
|
|
39
36
|
include MySQL::DatabaseStatements
|
40
37
|
|
38
|
+
class << self
|
39
|
+
def new_client(config)
|
40
|
+
Mysql2::Client.new(config)
|
41
|
+
rescue Mysql2::Error => error
|
42
|
+
if error.error_number == ConnectionAdapters::Mysql2Adapter::ER_BAD_DB_ERROR
|
43
|
+
raise ActiveRecord::NoDatabaseError
|
44
|
+
else
|
45
|
+
raise ActiveRecord::ConnectionNotEstablished, error.message
|
46
|
+
end
|
47
|
+
end
|
48
|
+
end
|
49
|
+
|
41
50
|
def initialize(connection, logger, connection_options, config)
|
42
51
|
superclass_config = config.reverse_merge(prepared_statements: false)
|
43
52
|
super(connection, logger, connection_options, superclass_config)
|
@@ -92,6 +101,8 @@ module ActiveRecord
|
|
92
101
|
|
93
102
|
def quote_string(string)
|
94
103
|
@connection.escape(string)
|
104
|
+
rescue Mysql2::Error => error
|
105
|
+
raise translate_exception(error, message: error.message, sql: "<escape>", binds: [])
|
95
106
|
end
|
96
107
|
|
97
108
|
#--
|
@@ -123,9 +134,8 @@ module ActiveRecord
|
|
123
134
|
end
|
124
135
|
|
125
136
|
private
|
126
|
-
|
127
137
|
def connect
|
128
|
-
@connection =
|
138
|
+
@connection = self.class.new_client(@config)
|
129
139
|
configure_connection
|
130
140
|
end
|
131
141
|
|
@@ -141,6 +151,14 @@ module ActiveRecord
|
|
141
151
|
def get_full_version
|
142
152
|
@connection.server_info[:version]
|
143
153
|
end
|
154
|
+
|
155
|
+
def translate_exception(exception, message:, sql:, binds:)
|
156
|
+
if exception.is_a?(Mysql2::Error::TimeoutError) && !exception.error_number
|
157
|
+
ActiveRecord::AdapterTimeout.new(message, sql: sql, binds: binds)
|
158
|
+
else
|
159
|
+
super
|
160
|
+
end
|
161
|
+
end
|
144
162
|
end
|
145
163
|
end
|
146
164
|
end
|
@@ -0,0 +1,73 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module ActiveRecord
|
4
|
+
module ConnectionAdapters
|
5
|
+
class PoolConfig # :nodoc:
|
6
|
+
include Mutex_m
|
7
|
+
|
8
|
+
attr_reader :db_config, :connection_klass
|
9
|
+
attr_accessor :schema_cache
|
10
|
+
|
11
|
+
INSTANCES = ObjectSpace::WeakMap.new
|
12
|
+
private_constant :INSTANCES
|
13
|
+
|
14
|
+
class << self
|
15
|
+
def discard_pools!
|
16
|
+
INSTANCES.each_key(&:discard_pool!)
|
17
|
+
end
|
18
|
+
end
|
19
|
+
|
20
|
+
def initialize(connection_klass, db_config)
|
21
|
+
super()
|
22
|
+
@connection_klass = connection_klass
|
23
|
+
@db_config = db_config
|
24
|
+
@pool = nil
|
25
|
+
INSTANCES[self] = self
|
26
|
+
end
|
27
|
+
|
28
|
+
def connection_specification_name
|
29
|
+
if connection_klass.is_a?(String)
|
30
|
+
connection_klass
|
31
|
+
elsif connection_klass.primary_class?
|
32
|
+
"ActiveRecord::Base"
|
33
|
+
else
|
34
|
+
connection_klass.name
|
35
|
+
end
|
36
|
+
end
|
37
|
+
|
38
|
+
def disconnect!
|
39
|
+
ActiveSupport::ForkTracker.check!
|
40
|
+
|
41
|
+
return unless @pool
|
42
|
+
|
43
|
+
synchronize do
|
44
|
+
return unless @pool
|
45
|
+
|
46
|
+
@pool.automatic_reconnect = false
|
47
|
+
@pool.disconnect!
|
48
|
+
end
|
49
|
+
|
50
|
+
nil
|
51
|
+
end
|
52
|
+
|
53
|
+
def pool
|
54
|
+
ActiveSupport::ForkTracker.check!
|
55
|
+
|
56
|
+
@pool || synchronize { @pool ||= ConnectionAdapters::ConnectionPool.new(self) }
|
57
|
+
end
|
58
|
+
|
59
|
+
def discard_pool!
|
60
|
+
return unless @pool
|
61
|
+
|
62
|
+
synchronize do
|
63
|
+
return unless @pool
|
64
|
+
|
65
|
+
@pool.discard!
|
66
|
+
@pool = nil
|
67
|
+
end
|
68
|
+
end
|
69
|
+
end
|
70
|
+
end
|
71
|
+
end
|
72
|
+
|
73
|
+
ActiveSupport::ForkTracker.after_fork { ActiveRecord::ConnectionAdapters::PoolConfig.discard_pools! }
|
@@ -0,0 +1,43 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module ActiveRecord
|
4
|
+
module ConnectionAdapters
|
5
|
+
class PoolManager # :nodoc:
|
6
|
+
def initialize
|
7
|
+
@name_to_role_mapping = Hash.new { |h, k| h[k] = {} }
|
8
|
+
end
|
9
|
+
|
10
|
+
def shard_names
|
11
|
+
@name_to_role_mapping.values.flat_map { |shard_map| shard_map.keys }
|
12
|
+
end
|
13
|
+
|
14
|
+
def role_names
|
15
|
+
@name_to_role_mapping.keys
|
16
|
+
end
|
17
|
+
|
18
|
+
def pool_configs(role = nil)
|
19
|
+
if role
|
20
|
+
@name_to_role_mapping[role].values
|
21
|
+
else
|
22
|
+
@name_to_role_mapping.flat_map { |_, shard_map| shard_map.values }
|
23
|
+
end
|
24
|
+
end
|
25
|
+
|
26
|
+
def remove_role(role)
|
27
|
+
@name_to_role_mapping.delete(role)
|
28
|
+
end
|
29
|
+
|
30
|
+
def remove_pool_config(role, shard)
|
31
|
+
@name_to_role_mapping[role].delete(shard)
|
32
|
+
end
|
33
|
+
|
34
|
+
def get_pool_config(role, shard)
|
35
|
+
@name_to_role_mapping[role][shard]
|
36
|
+
end
|
37
|
+
|
38
|
+
def set_pool_config(role, shard, pool_config)
|
39
|
+
@name_to_role_mapping[role][shard] = pool_config
|
40
|
+
end
|
41
|
+
end
|
42
|
+
end
|
43
|
+
end
|
@@ -21,7 +21,30 @@ module ActiveRecord
|
|
21
21
|
alias :array? :array
|
22
22
|
|
23
23
|
def sql_type
|
24
|
-
super.
|
24
|
+
super.delete_suffix("[]")
|
25
|
+
end
|
26
|
+
|
27
|
+
def init_with(coder)
|
28
|
+
@serial = coder["serial"]
|
29
|
+
super
|
30
|
+
end
|
31
|
+
|
32
|
+
def encode_with(coder)
|
33
|
+
coder["serial"] = @serial
|
34
|
+
super
|
35
|
+
end
|
36
|
+
|
37
|
+
def ==(other)
|
38
|
+
other.is_a?(Column) &&
|
39
|
+
super &&
|
40
|
+
serial? == other.serial?
|
41
|
+
end
|
42
|
+
alias :eql? :==
|
43
|
+
|
44
|
+
def hash
|
45
|
+
Column.hash ^
|
46
|
+
super.hash ^
|
47
|
+
serial?.hash
|
25
48
|
end
|
26
49
|
end
|
27
50
|
end
|
@@ -9,65 +9,21 @@ module ActiveRecord
|
|
9
9
|
PostgreSQL::ExplainPrettyPrinter.new.pp(exec_query(sql, "EXPLAIN", binds))
|
10
10
|
end
|
11
11
|
|
12
|
-
# The internal PostgreSQL identifier of the money data type.
|
13
|
-
MONEY_COLUMN_TYPE_OID = 790 #:nodoc:
|
14
|
-
# The internal PostgreSQL identifier of the BYTEA data type.
|
15
|
-
BYTEA_COLUMN_TYPE_OID = 17 #:nodoc:
|
16
|
-
|
17
|
-
# create a 2D array representing the result set
|
18
|
-
def result_as_array(res) #:nodoc:
|
19
|
-
# check if we have any binary column and if they need escaping
|
20
|
-
ftypes = Array.new(res.nfields) do |i|
|
21
|
-
[i, res.ftype(i)]
|
22
|
-
end
|
23
|
-
|
24
|
-
rows = res.values
|
25
|
-
return rows unless ftypes.any? { |_, x|
|
26
|
-
x == BYTEA_COLUMN_TYPE_OID || x == MONEY_COLUMN_TYPE_OID
|
27
|
-
}
|
28
|
-
|
29
|
-
typehash = ftypes.group_by { |_, type| type }
|
30
|
-
binaries = typehash[BYTEA_COLUMN_TYPE_OID] || []
|
31
|
-
monies = typehash[MONEY_COLUMN_TYPE_OID] || []
|
32
|
-
|
33
|
-
rows.each do |row|
|
34
|
-
# unescape string passed BYTEA field (OID == 17)
|
35
|
-
binaries.each do |index, _|
|
36
|
-
row[index] = unescape_bytea(row[index])
|
37
|
-
end
|
38
|
-
|
39
|
-
# If this is a money type column and there are any currency symbols,
|
40
|
-
# then strip them off. Indeed it would be prettier to do this in
|
41
|
-
# PostgreSQLColumn.string_to_decimal but would break form input
|
42
|
-
# fields that call value_before_type_cast.
|
43
|
-
monies.each do |index, _|
|
44
|
-
data = row[index]
|
45
|
-
# Because money output is formatted according to the locale, there are two
|
46
|
-
# cases to consider (note the decimal separators):
|
47
|
-
# (1) $12,345,678.12
|
48
|
-
# (2) $12.345.678,12
|
49
|
-
case data
|
50
|
-
when /^-?\D+[\d,]+\.\d{2}$/ # (1)
|
51
|
-
data.gsub!(/[^-\d.]/, "")
|
52
|
-
when /^-?\D+[\d.]+,\d{2}$/ # (2)
|
53
|
-
data.gsub!(/[^-\d,]/, "").sub!(/,/, ".")
|
54
|
-
end
|
55
|
-
end
|
56
|
-
end
|
57
|
-
end
|
58
|
-
|
59
12
|
# Queries the database and returns the results in an Array-like object
|
60
13
|
def query(sql, name = nil) #:nodoc:
|
61
14
|
materialize_transactions
|
15
|
+
mark_transaction_written_if_write(sql)
|
62
16
|
|
63
17
|
log(sql, name) do
|
64
18
|
ActiveSupport::Dependencies.interlock.permit_concurrent_loads do
|
65
|
-
|
19
|
+
@connection.async_exec(sql).map_types!(@type_map_for_results).values
|
66
20
|
end
|
67
21
|
end
|
68
22
|
end
|
69
23
|
|
70
|
-
READ_QUERY = ActiveRecord::ConnectionAdapters::AbstractAdapter.build_read_query_regexp(
|
24
|
+
READ_QUERY = ActiveRecord::ConnectionAdapters::AbstractAdapter.build_read_query_regexp(
|
25
|
+
:close, :declare, :fetch, :move, :set, :show
|
26
|
+
) # :nodoc:
|
71
27
|
private_constant :READ_QUERY
|
72
28
|
|
73
29
|
def write_query?(sql) # :nodoc:
|
@@ -84,6 +40,7 @@ module ActiveRecord
|
|
84
40
|
end
|
85
41
|
|
86
42
|
materialize_transactions
|
43
|
+
mark_transaction_written_if_write(sql)
|
87
44
|
|
88
45
|
log(sql, name) do
|
89
46
|
ActiveSupport::Dependencies.interlock.permit_concurrent_loads do
|
@@ -99,9 +56,13 @@ module ActiveRecord
|
|
99
56
|
fields.each_with_index do |fname, i|
|
100
57
|
ftype = result.ftype i
|
101
58
|
fmod = result.fmod i
|
102
|
-
|
59
|
+
case type = get_oid_type(ftype, fmod, fname)
|
60
|
+
when Type::Integer, Type::Float, OID::Decimal, Type::String, Type::DateTime, Type::Boolean
|
61
|
+
# skip if a column has already been type casted by pg decoders
|
62
|
+
else types[fname] = type
|
63
|
+
end
|
103
64
|
end
|
104
|
-
|
65
|
+
build_result(columns: fields, rows: result.values, column_types: types)
|
105
66
|
end
|
106
67
|
end
|
107
68
|
|
@@ -145,7 +106,7 @@ module ActiveRecord
|
|
145
106
|
|
146
107
|
# Begins a transaction.
|
147
108
|
def begin_db_transaction
|
148
|
-
execute
|
109
|
+
execute("BEGIN", "TRANSACTION")
|
149
110
|
end
|
150
111
|
|
151
112
|
def begin_isolated_db_transaction(isolation)
|
@@ -155,17 +116,21 @@ module ActiveRecord
|
|
155
116
|
|
156
117
|
# Commits a transaction.
|
157
118
|
def commit_db_transaction
|
158
|
-
execute
|
119
|
+
execute("COMMIT", "TRANSACTION")
|
159
120
|
end
|
160
121
|
|
161
122
|
# Aborts a transaction.
|
162
123
|
def exec_rollback_db_transaction
|
163
|
-
execute
|
124
|
+
execute("ROLLBACK", "TRANSACTION")
|
164
125
|
end
|
165
126
|
|
166
127
|
private
|
167
|
-
def
|
168
|
-
|
128
|
+
def execute_batch(statements, name = nil)
|
129
|
+
execute(combine_multi_statements(statements))
|
130
|
+
end
|
131
|
+
|
132
|
+
def build_truncate_statements(table_names)
|
133
|
+
["TRUNCATE TABLE #{table_names.map(&method(:quote_table_name)).join(", ")}"]
|
169
134
|
end
|
170
135
|
|
171
136
|
# Returns the current ID of a table's sequence.
|
@@ -11,7 +11,9 @@ require "active_record/connection_adapters/postgresql/oid/decimal"
|
|
11
11
|
require "active_record/connection_adapters/postgresql/oid/enum"
|
12
12
|
require "active_record/connection_adapters/postgresql/oid/hstore"
|
13
13
|
require "active_record/connection_adapters/postgresql/oid/inet"
|
14
|
+
require "active_record/connection_adapters/postgresql/oid/interval"
|
14
15
|
require "active_record/connection_adapters/postgresql/oid/jsonb"
|
16
|
+
require "active_record/connection_adapters/postgresql/oid/macaddr"
|
15
17
|
require "active_record/connection_adapters/postgresql/oid/money"
|
16
18
|
require "active_record/connection_adapters/postgresql/oid/oid"
|
17
19
|
require "active_record/connection_adapters/postgresql/oid/point"
|
@@ -12,19 +12,17 @@ module ActiveRecord
|
|
12
12
|
end
|
13
13
|
|
14
14
|
def type_cast_for_schema(value)
|
15
|
-
subnet_mask = value.instance_variable_get(:@mask_addr)
|
16
|
-
|
17
15
|
# If the subnet mask is equal to /32, don't output it
|
18
|
-
if
|
16
|
+
if value.prefix == 32
|
19
17
|
"\"#{value}\""
|
20
18
|
else
|
21
|
-
"\"#{value}/#{
|
19
|
+
"\"#{value}/#{value.prefix}\""
|
22
20
|
end
|
23
21
|
end
|
24
22
|
|
25
23
|
def serialize(value)
|
26
24
|
if IPAddr === value
|
27
|
-
"#{value}/#{value.
|
25
|
+
"#{value}/#{value.prefix}"
|
28
26
|
else
|
29
27
|
value
|
30
28
|
end
|
@@ -10,8 +10,8 @@ module ActiveRecord
|
|
10
10
|
when "infinity" then ::Float::INFINITY
|
11
11
|
when "-infinity" then -::Float::INFINITY
|
12
12
|
when / BC$/
|
13
|
-
|
14
|
-
super(value.
|
13
|
+
value = value.sub(/^\d+/) { |year| format("%04d", -year.to_i + 1) }
|
14
|
+
super(value.delete_suffix!(" BC"))
|
15
15
|
else
|
16
16
|
super
|
17
17
|
end
|