activerecord 5.2.8.1 → 6.1.7.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/CHANGELOG.md +1347 -624
- data/MIT-LICENSE +3 -1
- data/README.rdoc +7 -5
- data/examples/performance.rb +1 -1
- data/lib/active_record/aggregations.rb +9 -8
- data/lib/active_record/association_relation.rb +30 -10
- data/lib/active_record/associations/alias_tracker.rb +19 -16
- data/lib/active_record/associations/association.rb +100 -41
- data/lib/active_record/associations/association_scope.rb +23 -21
- data/lib/active_record/associations/belongs_to_association.rb +55 -48
- data/lib/active_record/associations/belongs_to_polymorphic_association.rb +7 -6
- data/lib/active_record/associations/builder/association.rb +45 -22
- data/lib/active_record/associations/builder/belongs_to.rb +29 -59
- data/lib/active_record/associations/builder/collection_association.rb +8 -17
- data/lib/active_record/associations/builder/has_and_belongs_to_many.rb +17 -41
- data/lib/active_record/associations/builder/has_many.rb +8 -2
- data/lib/active_record/associations/builder/has_one.rb +33 -2
- data/lib/active_record/associations/builder/singular_association.rb +3 -1
- data/lib/active_record/associations/collection_association.rb +44 -34
- data/lib/active_record/associations/collection_proxy.rb +25 -21
- data/lib/active_record/associations/foreign_association.rb +20 -0
- data/lib/active_record/associations/has_many_association.rb +26 -13
- data/lib/active_record/associations/has_many_through_association.rb +24 -18
- data/lib/active_record/associations/has_one_association.rb +43 -31
- data/lib/active_record/associations/has_one_through_association.rb +5 -5
- data/lib/active_record/associations/join_dependency/join_association.rb +44 -22
- data/lib/active_record/associations/join_dependency/join_part.rb +5 -5
- data/lib/active_record/associations/join_dependency.rb +91 -60
- data/lib/active_record/associations/preloader/association.rb +69 -43
- data/lib/active_record/associations/preloader/through_association.rb +49 -40
- data/lib/active_record/associations/preloader.rb +47 -34
- data/lib/active_record/associations/singular_association.rb +3 -17
- data/lib/active_record/associations/through_association.rb +1 -1
- data/lib/active_record/associations.rb +137 -25
- data/lib/active_record/attribute_assignment.rb +17 -19
- data/lib/active_record/attribute_methods/before_type_cast.rb +13 -7
- data/lib/active_record/attribute_methods/dirty.rb +101 -40
- data/lib/active_record/attribute_methods/primary_key.rb +20 -25
- data/lib/active_record/attribute_methods/query.rb +4 -8
- data/lib/active_record/attribute_methods/read.rb +14 -56
- data/lib/active_record/attribute_methods/serialization.rb +12 -7
- data/lib/active_record/attribute_methods/time_zone_conversion.rb +12 -15
- data/lib/active_record/attribute_methods/write.rb +18 -34
- data/lib/active_record/attribute_methods.rb +81 -143
- data/lib/active_record/attributes.rb +46 -9
- data/lib/active_record/autosave_association.rb +57 -42
- data/lib/active_record/base.rb +4 -17
- data/lib/active_record/callbacks.rb +158 -43
- data/lib/active_record/coders/yaml_column.rb +16 -7
- data/lib/active_record/connection_adapters/abstract/connection_pool.rb +272 -130
- data/lib/active_record/connection_adapters/abstract/database_limits.rb +7 -36
- data/lib/active_record/connection_adapters/abstract/database_statements.rb +167 -146
- data/lib/active_record/connection_adapters/abstract/query_cache.rb +18 -14
- data/lib/active_record/connection_adapters/abstract/quoting.rb +107 -47
- data/lib/active_record/connection_adapters/abstract/savepoints.rb +3 -3
- data/lib/active_record/connection_adapters/abstract/schema_creation.rb +153 -110
- data/lib/active_record/connection_adapters/abstract/schema_definitions.rb +211 -90
- data/lib/active_record/connection_adapters/abstract/schema_dumper.rb +2 -4
- data/lib/active_record/connection_adapters/abstract/schema_statements.rb +385 -144
- data/lib/active_record/connection_adapters/abstract/transaction.rb +167 -69
- data/lib/active_record/connection_adapters/abstract_adapter.rb +229 -99
- data/lib/active_record/connection_adapters/abstract_mysql_adapter.rb +243 -275
- data/lib/active_record/connection_adapters/column.rb +30 -12
- data/lib/active_record/connection_adapters/deduplicable.rb +29 -0
- data/lib/active_record/connection_adapters/legacy_pool_manager.rb +35 -0
- data/lib/active_record/connection_adapters/mysql/column.rb +1 -1
- data/lib/active_record/connection_adapters/mysql/database_statements.rb +88 -32
- data/lib/active_record/connection_adapters/mysql/explain_pretty_printer.rb +1 -2
- data/lib/active_record/connection_adapters/mysql/quoting.rb +59 -7
- data/lib/active_record/connection_adapters/mysql/schema_creation.rb +34 -10
- data/lib/active_record/connection_adapters/mysql/schema_definitions.rb +48 -32
- data/lib/active_record/connection_adapters/mysql/schema_dumper.rb +18 -7
- data/lib/active_record/connection_adapters/mysql/schema_statements.rb +142 -19
- data/lib/active_record/connection_adapters/mysql/type_metadata.rb +14 -9
- data/lib/active_record/connection_adapters/mysql2_adapter.rb +53 -18
- data/lib/active_record/connection_adapters/pool_config.rb +73 -0
- data/lib/active_record/connection_adapters/pool_manager.rb +47 -0
- data/lib/active_record/connection_adapters/postgresql/column.rb +37 -28
- data/lib/active_record/connection_adapters/postgresql/database_statements.rb +40 -54
- data/lib/active_record/connection_adapters/postgresql/oid/array.rb +1 -2
- data/lib/active_record/connection_adapters/postgresql/oid/bit.rb +1 -4
- 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 +1 -2
- data/lib/active_record/connection_adapters/postgresql/oid/interval.rb +49 -0
- data/lib/active_record/connection_adapters/postgresql/oid/legacy_point.rb +3 -4
- data/lib/active_record/connection_adapters/postgresql/oid/macaddr.rb +25 -0
- data/lib/active_record/connection_adapters/postgresql/oid/oid.rb +1 -1
- data/lib/active_record/connection_adapters/postgresql/oid/point.rb +3 -4
- data/lib/active_record/connection_adapters/postgresql/oid/range.rb +25 -7
- data/lib/active_record/connection_adapters/postgresql/oid/specialized_string.rb +1 -1
- data/lib/active_record/connection_adapters/postgresql/oid/type_map_initializer.rb +9 -7
- data/lib/active_record/connection_adapters/postgresql/oid/uuid.rb +15 -3
- data/lib/active_record/connection_adapters/postgresql/oid.rb +2 -0
- data/lib/active_record/connection_adapters/postgresql/quoting.rb +73 -10
- data/lib/active_record/connection_adapters/postgresql/referential_integrity.rb +2 -2
- data/lib/active_record/connection_adapters/postgresql/schema_creation.rb +19 -4
- data/lib/active_record/connection_adapters/postgresql/schema_definitions.rb +107 -91
- data/lib/active_record/connection_adapters/postgresql/schema_dumper.rb +0 -1
- data/lib/active_record/connection_adapters/postgresql/schema_statements.rb +120 -100
- data/lib/active_record/connection_adapters/postgresql/type_metadata.rb +31 -26
- data/lib/active_record/connection_adapters/postgresql/utils.rb +0 -1
- data/lib/active_record/connection_adapters/postgresql_adapter.rb +225 -121
- data/lib/active_record/connection_adapters/schema_cache.rb +159 -21
- data/lib/active_record/connection_adapters/sql_type_metadata.rb +17 -6
- data/lib/active_record/connection_adapters/sqlite3/database_statements.rb +146 -0
- data/lib/active_record/connection_adapters/sqlite3/quoting.rb +42 -7
- data/lib/active_record/connection_adapters/sqlite3/schema_creation.rb +5 -1
- data/lib/active_record/connection_adapters/sqlite3/schema_statements.rb +77 -13
- data/lib/active_record/connection_adapters/sqlite3_adapter.rb +174 -186
- data/lib/active_record/connection_adapters/statement_pool.rb +0 -1
- data/lib/active_record/connection_adapters.rb +52 -0
- data/lib/active_record/connection_handling.rb +293 -33
- data/lib/active_record/core.rb +341 -99
- data/lib/active_record/counter_cache.rb +8 -30
- data/lib/active_record/database_configurations/connection_url_resolver.rb +99 -0
- data/lib/active_record/database_configurations/database_config.rb +80 -0
- data/lib/active_record/database_configurations/hash_config.rb +96 -0
- data/lib/active_record/database_configurations/url_config.rb +53 -0
- data/lib/active_record/database_configurations.rb +273 -0
- 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 +3 -4
- data/lib/active_record/enum.rb +108 -36
- data/lib/active_record/errors.rb +62 -19
- data/lib/active_record/explain.rb +10 -6
- 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 +32 -0
- data/lib/active_record/fixture_set/render_context.rb +17 -0
- data/lib/active_record/fixture_set/table_row.rb +152 -0
- data/lib/active_record/fixture_set/table_rows.rb +46 -0
- data/lib/active_record/fixtures.rb +200 -481
- data/lib/active_record/gem_version.rb +4 -4
- data/lib/active_record/inheritance.rb +53 -24
- data/lib/active_record/insert_all.rb +212 -0
- data/lib/active_record/integration.rb +67 -17
- data/lib/active_record/internal_metadata.rb +28 -9
- data/lib/active_record/legacy_yaml_adapter.rb +7 -3
- data/lib/active_record/locking/optimistic.rb +37 -23
- data/lib/active_record/locking/pessimistic.rb +9 -5
- data/lib/active_record/log_subscriber.rb +35 -35
- data/lib/active_record/middleware/database_selector/resolver/session.rb +48 -0
- data/lib/active_record/middleware/database_selector/resolver.rb +92 -0
- data/lib/active_record/middleware/database_selector.rb +77 -0
- data/lib/active_record/migration/command_recorder.rb +96 -44
- data/lib/active_record/migration/compatibility.rb +145 -64
- data/lib/active_record/migration/join_table.rb +0 -1
- data/lib/active_record/migration.rb +206 -157
- data/lib/active_record/model_schema.rb +148 -22
- data/lib/active_record/nested_attributes.rb +4 -7
- data/lib/active_record/no_touching.rb +8 -1
- data/lib/active_record/null_relation.rb +0 -1
- data/lib/active_record/persistence.rb +267 -59
- data/lib/active_record/query_cache.rb +21 -4
- data/lib/active_record/querying.rb +40 -23
- data/lib/active_record/railtie.rb +113 -74
- data/lib/active_record/railties/console_sandbox.rb +2 -4
- data/lib/active_record/railties/controller_runtime.rb +30 -35
- data/lib/active_record/railties/databases.rake +411 -80
- data/lib/active_record/readonly_attributes.rb +4 -0
- data/lib/active_record/reflection.rb +109 -93
- data/lib/active_record/relation/batches/batch_enumerator.rb +25 -9
- data/lib/active_record/relation/batches.rb +44 -35
- data/lib/active_record/relation/calculations.rb +157 -90
- data/lib/active_record/relation/delegation.rb +35 -50
- data/lib/active_record/relation/finder_methods.rb +64 -39
- data/lib/active_record/relation/from_clause.rb +5 -1
- data/lib/active_record/relation/merger.rb +32 -40
- data/lib/active_record/relation/predicate_builder/array_handler.rb +13 -13
- data/lib/active_record/relation/predicate_builder/association_query_value.rb +5 -9
- data/lib/active_record/relation/predicate_builder/basic_object_handler.rb +1 -2
- data/lib/active_record/relation/predicate_builder/polymorphic_array_value.rb +11 -10
- data/lib/active_record/relation/predicate_builder/range_handler.rb +3 -23
- data/lib/active_record/relation/predicate_builder/relation_handler.rb +1 -1
- data/lib/active_record/relation/predicate_builder.rb +62 -45
- data/lib/active_record/relation/query_attribute.rb +13 -8
- data/lib/active_record/relation/query_methods.rb +478 -187
- data/lib/active_record/relation/record_fetch_warning.rb +3 -3
- data/lib/active_record/relation/spawn_methods.rb +9 -9
- data/lib/active_record/relation/where_clause.rb +115 -62
- data/lib/active_record/relation.rb +379 -115
- data/lib/active_record/result.rb +64 -38
- data/lib/active_record/runtime_registry.rb +2 -2
- data/lib/active_record/sanitization.rb +22 -41
- data/lib/active_record/schema.rb +2 -11
- data/lib/active_record/schema_dumper.rb +54 -9
- data/lib/active_record/schema_migration.rb +7 -9
- data/lib/active_record/scoping/default.rb +4 -8
- data/lib/active_record/scoping/named.rb +17 -24
- data/lib/active_record/scoping.rb +8 -9
- 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 +49 -6
- data/lib/active_record/store.rb +94 -10
- data/lib/active_record/suppressor.rb +2 -2
- data/lib/active_record/table_metadata.rb +42 -43
- data/lib/active_record/tasks/database_tasks.rb +277 -81
- data/lib/active_record/tasks/mysql_database_tasks.rb +37 -39
- data/lib/active_record/tasks/postgresql_database_tasks.rb +27 -32
- data/lib/active_record/tasks/sqlite_database_tasks.rb +14 -17
- data/lib/active_record/test_databases.rb +24 -0
- data/lib/active_record/test_fixtures.rb +291 -0
- data/lib/active_record/timestamp.rb +43 -32
- data/lib/active_record/touch_later.rb +23 -22
- data/lib/active_record/transactions.rb +62 -118
- data/lib/active_record/translation.rb +1 -1
- data/lib/active_record/type/adapter_specific_registry.rb +3 -13
- 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.rb +10 -5
- data/lib/active_record/type_caster/connection.rb +15 -15
- data/lib/active_record/type_caster/map.rb +8 -8
- 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 +38 -30
- data/lib/active_record/validations.rb +4 -3
- data/lib/active_record.rb +13 -12
- data/lib/arel/alias_predication.rb +9 -0
- data/lib/arel/attributes/attribute.rb +41 -0
- data/lib/arel/collectors/bind.rb +29 -0
- data/lib/arel/collectors/composite.rb +39 -0
- data/lib/arel/collectors/plain_string.rb +20 -0
- data/lib/arel/collectors/sql_string.rb +27 -0
- data/lib/arel/collectors/substitute_binds.rb +35 -0
- data/lib/arel/crud.rb +42 -0
- data/lib/arel/delete_manager.rb +18 -0
- data/lib/arel/errors.rb +9 -0
- data/lib/arel/expressions.rb +29 -0
- data/lib/arel/factory_methods.rb +49 -0
- data/lib/arel/insert_manager.rb +49 -0
- data/lib/arel/math.rb +45 -0
- data/lib/arel/nodes/and.rb +32 -0
- data/lib/arel/nodes/ascending.rb +23 -0
- data/lib/arel/nodes/binary.rb +126 -0
- data/lib/arel/nodes/bind_param.rb +44 -0
- data/lib/arel/nodes/case.rb +55 -0
- data/lib/arel/nodes/casted.rb +62 -0
- data/lib/arel/nodes/comment.rb +29 -0
- data/lib/arel/nodes/count.rb +12 -0
- data/lib/arel/nodes/delete_statement.rb +45 -0
- data/lib/arel/nodes/descending.rb +23 -0
- data/lib/arel/nodes/equality.rb +15 -0
- data/lib/arel/nodes/extract.rb +24 -0
- data/lib/arel/nodes/false.rb +16 -0
- data/lib/arel/nodes/full_outer_join.rb +8 -0
- data/lib/arel/nodes/function.rb +44 -0
- data/lib/arel/nodes/grouping.rb +11 -0
- data/lib/arel/nodes/homogeneous_in.rb +76 -0
- data/lib/arel/nodes/in.rb +15 -0
- data/lib/arel/nodes/infix_operation.rb +92 -0
- data/lib/arel/nodes/inner_join.rb +8 -0
- data/lib/arel/nodes/insert_statement.rb +37 -0
- data/lib/arel/nodes/join_source.rb +20 -0
- data/lib/arel/nodes/matches.rb +18 -0
- data/lib/arel/nodes/named_function.rb +23 -0
- data/lib/arel/nodes/node.rb +51 -0
- data/lib/arel/nodes/node_expression.rb +13 -0
- data/lib/arel/nodes/ordering.rb +27 -0
- data/lib/arel/nodes/outer_join.rb +8 -0
- data/lib/arel/nodes/over.rb +15 -0
- data/lib/arel/nodes/regexp.rb +16 -0
- data/lib/arel/nodes/right_outer_join.rb +8 -0
- data/lib/arel/nodes/select_core.rb +67 -0
- data/lib/arel/nodes/select_statement.rb +41 -0
- data/lib/arel/nodes/sql_literal.rb +19 -0
- data/lib/arel/nodes/string_join.rb +11 -0
- data/lib/arel/nodes/table_alias.rb +31 -0
- data/lib/arel/nodes/terminal.rb +16 -0
- data/lib/arel/nodes/true.rb +16 -0
- data/lib/arel/nodes/unary.rb +44 -0
- data/lib/arel/nodes/unary_operation.rb +20 -0
- data/lib/arel/nodes/unqualified_column.rb +22 -0
- data/lib/arel/nodes/update_statement.rb +41 -0
- data/lib/arel/nodes/values_list.rb +9 -0
- data/lib/arel/nodes/window.rb +126 -0
- data/lib/arel/nodes/with.rb +11 -0
- data/lib/arel/nodes.rb +70 -0
- data/lib/arel/order_predications.rb +13 -0
- data/lib/arel/predications.rb +250 -0
- data/lib/arel/select_manager.rb +270 -0
- data/lib/arel/table.rb +118 -0
- data/lib/arel/tree_manager.rb +72 -0
- data/lib/arel/update_manager.rb +34 -0
- data/lib/arel/visitors/dot.rb +308 -0
- data/lib/arel/visitors/mysql.rb +93 -0
- data/lib/arel/visitors/postgresql.rb +120 -0
- data/lib/arel/visitors/sqlite.rb +38 -0
- data/lib/arel/visitors/to_sql.rb +899 -0
- data/lib/arel/visitors/visitor.rb +45 -0
- data/lib/arel/visitors.rb +13 -0
- data/lib/arel/window_predications.rb +9 -0
- data/lib/arel.rb +54 -0
- data/lib/rails/generators/active_record/application_record/application_record_generator.rb +0 -1
- data/lib/rails/generators/active_record/migration/migration_generator.rb +3 -5
- data/lib/rails/generators/active_record/migration/templates/create_table_migration.rb.tt +3 -1
- data/lib/rails/generators/active_record/migration/templates/migration.rb.tt +7 -5
- data/lib/rails/generators/active_record/migration.rb +19 -2
- data/lib/rails/generators/active_record/model/model_generator.rb +39 -2
- data/lib/rails/generators/active_record/model/templates/abstract_base_class.rb.tt +7 -0
- data/lib/rails/generators/active_record/model/templates/model.rb.tt +10 -1
- metadata +118 -32
- data/lib/active_record/attribute_decorators.rb +0 -90
- data/lib/active_record/collection_cache_key.rb +0 -53
- data/lib/active_record/connection_adapters/connection_specification.rb +0 -287
- data/lib/active_record/connection_adapters/determine_if_preparable_visitor.rb +0 -33
- data/lib/active_record/define_callbacks.rb +0 -22
- data/lib/active_record/relation/predicate_builder/base_handler.rb +0 -19
- data/lib/active_record/relation/where_clause_factory.rb +0 -34
@@ -10,6 +10,10 @@ module ActiveRecord
|
|
10
10
|
spec[:unsigned] = "true" if column.unsigned?
|
11
11
|
spec[:auto_increment] = "true" if column.auto_increment?
|
12
12
|
|
13
|
+
if /\A(?<size>tiny|medium|long)(?:text|blob)/ =~ column.sql_type
|
14
|
+
spec = { size: size.to_sym.inspect }.merge!(spec)
|
15
|
+
end
|
16
|
+
|
13
17
|
if @connection.supports_virtual_columns? && column.virtual?
|
14
18
|
spec[:as] = extract_expression_for_virtual_column(column)
|
15
19
|
spec[:stored] = "true" if /\b(?:STORED|PERSISTENT)\b/.match?(column.extra)
|
@@ -37,19 +41,23 @@ module ActiveRecord
|
|
37
41
|
case column.sql_type
|
38
42
|
when /\Atimestamp\b/
|
39
43
|
:timestamp
|
40
|
-
when
|
41
|
-
|
44
|
+
when /\A(?:enum|set)\b/
|
45
|
+
column.sql_type
|
42
46
|
else
|
43
47
|
super
|
44
48
|
end
|
45
49
|
end
|
46
50
|
|
51
|
+
def schema_limit(column)
|
52
|
+
super unless /\A(?:tiny|medium|long)?(?:text|blob)\b/.match?(column.sql_type)
|
53
|
+
end
|
54
|
+
|
47
55
|
def schema_precision(column)
|
48
56
|
super unless /\A(?:date)?time(?:stamp)?\b/.match?(column.sql_type) && column.precision == 0
|
49
57
|
end
|
50
58
|
|
51
59
|
def schema_collation(column)
|
52
|
-
if column.collation
|
60
|
+
if column.collation
|
53
61
|
@table_collation_cache ||= {}
|
54
62
|
@table_collation_cache[table_name] ||=
|
55
63
|
@connection.exec_query("SHOW TABLE STATUS LIKE #{@connection.quote(table_name)}", "SCHEMA").first["Collation"]
|
@@ -58,20 +66,23 @@ module ActiveRecord
|
|
58
66
|
end
|
59
67
|
|
60
68
|
def extract_expression_for_virtual_column(column)
|
61
|
-
if @connection.mariadb? && @connection.
|
62
|
-
create_table_info = @connection.send(:create_table_info,
|
69
|
+
if @connection.mariadb? && @connection.database_version < "10.2.5"
|
70
|
+
create_table_info = @connection.send(:create_table_info, table_name)
|
63
71
|
column_name = @connection.quote_column_name(column.name)
|
64
72
|
if %r/#{column_name} #{Regexp.quote(column.sql_type)}(?: COLLATE \w+)? AS \((?<expression>.+?)\) #{column.extra}/ =~ create_table_info
|
65
73
|
$~[:expression].inspect
|
66
74
|
end
|
67
75
|
else
|
68
|
-
scope = @connection.send(:quoted_scope,
|
76
|
+
scope = @connection.send(:quoted_scope, table_name)
|
69
77
|
column_name = @connection.quote(column.name)
|
70
78
|
sql = "SELECT generation_expression FROM information_schema.columns" \
|
71
79
|
" WHERE table_schema = #{scope[:schema]}" \
|
72
80
|
" AND table_name = #{scope[:name]}" \
|
73
81
|
" AND column_name = #{column_name}"
|
74
|
-
|
82
|
+
# Calling .inspect leads into issues with the query result
|
83
|
+
# which already returns escaped quotes.
|
84
|
+
# We remove the escape sequence from the result in order to deal with double escaping issues.
|
85
|
+
@connection.query_value(sql, "SCHEMA").gsub("\\'", "'").inspect
|
75
86
|
end
|
76
87
|
end
|
77
88
|
end
|
@@ -35,25 +35,55 @@ module ActiveRecord
|
|
35
35
|
]
|
36
36
|
end
|
37
37
|
|
38
|
-
|
39
|
-
|
40
|
-
|
38
|
+
if row[:Expression]
|
39
|
+
expression = row[:Expression]
|
40
|
+
expression = +"(#{expression})" unless expression.start_with?("(")
|
41
|
+
indexes.last[-2] << expression
|
42
|
+
indexes.last[-1][:expressions] ||= {}
|
43
|
+
indexes.last[-1][:expressions][expression] = expression
|
44
|
+
indexes.last[-1][:orders][expression] = :desc if row[:Collation] == "D"
|
45
|
+
else
|
46
|
+
indexes.last[-2] << row[:Column_name]
|
47
|
+
indexes.last[-1][:lengths][row[:Column_name]] = row[:Sub_part].to_i if row[:Sub_part]
|
48
|
+
indexes.last[-1][:orders][row[:Column_name]] = :desc if row[:Collation] == "D"
|
49
|
+
end
|
41
50
|
end
|
42
51
|
end
|
43
52
|
|
44
|
-
indexes.map
|
53
|
+
indexes.map do |index|
|
54
|
+
options = index.pop
|
55
|
+
|
56
|
+
if expressions = options.delete(:expressions)
|
57
|
+
orders = options.delete(:orders)
|
58
|
+
lengths = options.delete(:lengths)
|
59
|
+
|
60
|
+
columns = index[-1].map { |name|
|
61
|
+
[ name.to_sym, expressions[name] || +quote_column_name(name) ]
|
62
|
+
}.to_h
|
63
|
+
|
64
|
+
index[-1] = add_options_for_index_columns(
|
65
|
+
columns, order: orders, length: lengths
|
66
|
+
).values.join(", ")
|
67
|
+
end
|
68
|
+
|
69
|
+
IndexDefinition.new(*index, **options)
|
70
|
+
end
|
45
71
|
end
|
46
72
|
|
47
|
-
def remove_column(table_name, column_name, type = nil, options
|
73
|
+
def remove_column(table_name, column_name, type = nil, **options)
|
48
74
|
if foreign_key_exists?(table_name, column: column_name)
|
49
75
|
remove_foreign_key(table_name, column: column_name)
|
50
76
|
end
|
51
77
|
super
|
52
78
|
end
|
53
79
|
|
80
|
+
def create_table(table_name, options: default_row_format, **)
|
81
|
+
super
|
82
|
+
end
|
83
|
+
|
54
84
|
def internal_string_options_for_primary_key
|
55
85
|
super.tap do |options|
|
56
|
-
if CHARSETS_OF_4BYTES_MAXLEN.include?(charset)
|
86
|
+
if !row_format_dynamic_by_default? && CHARSETS_OF_4BYTES_MAXLEN.include?(charset)
|
57
87
|
options[:collation] = collation.sub(/\A[^_]+/, "utf8")
|
58
88
|
end
|
59
89
|
end
|
@@ -67,23 +97,79 @@ module ActiveRecord
|
|
67
97
|
MySQL::SchemaDumper.create(self, options)
|
68
98
|
end
|
69
99
|
|
100
|
+
# Maps logical Rails types to MySQL-specific data types.
|
101
|
+
def type_to_sql(type, limit: nil, precision: nil, scale: nil, size: limit_to_size(limit, type), unsigned: nil, **)
|
102
|
+
sql =
|
103
|
+
case type.to_s
|
104
|
+
when "integer"
|
105
|
+
integer_to_sql(limit)
|
106
|
+
when "text"
|
107
|
+
type_with_size_to_sql("text", size)
|
108
|
+
when "blob"
|
109
|
+
type_with_size_to_sql("blob", size)
|
110
|
+
when "binary"
|
111
|
+
if (0..0xfff) === limit
|
112
|
+
"varbinary(#{limit})"
|
113
|
+
else
|
114
|
+
type_with_size_to_sql("blob", size)
|
115
|
+
end
|
116
|
+
else
|
117
|
+
super
|
118
|
+
end
|
119
|
+
|
120
|
+
sql = "#{sql} unsigned" if unsigned && type != :primary_key
|
121
|
+
sql
|
122
|
+
end
|
123
|
+
|
124
|
+
def table_alias_length
|
125
|
+
256 # https://dev.mysql.com/doc/refman/en/identifiers.html
|
126
|
+
end
|
127
|
+
|
70
128
|
private
|
71
129
|
CHARSETS_OF_4BYTES_MAXLEN = ["utf8mb4", "utf16", "utf16le", "utf32"]
|
72
130
|
|
131
|
+
def row_format_dynamic_by_default?
|
132
|
+
if mariadb?
|
133
|
+
database_version >= "10.2.2"
|
134
|
+
else
|
135
|
+
database_version >= "5.7.9"
|
136
|
+
end
|
137
|
+
end
|
138
|
+
|
139
|
+
def default_row_format
|
140
|
+
return if row_format_dynamic_by_default?
|
141
|
+
|
142
|
+
unless defined?(@default_row_format)
|
143
|
+
if query_value("SELECT @@innodb_file_per_table = 1 AND @@innodb_file_format = 'Barracuda'") == 1
|
144
|
+
@default_row_format = "ROW_FORMAT=DYNAMIC"
|
145
|
+
else
|
146
|
+
@default_row_format = nil
|
147
|
+
end
|
148
|
+
end
|
149
|
+
|
150
|
+
@default_row_format
|
151
|
+
end
|
152
|
+
|
73
153
|
def schema_creation
|
74
154
|
MySQL::SchemaCreation.new(self)
|
75
155
|
end
|
76
156
|
|
77
|
-
def create_table_definition(
|
78
|
-
MySQL::TableDefinition.new(
|
157
|
+
def create_table_definition(name, **options)
|
158
|
+
MySQL::TableDefinition.new(self, name, **options)
|
79
159
|
end
|
80
160
|
|
81
161
|
def new_column_from_field(table_name, field)
|
82
162
|
type_metadata = fetch_type_metadata(field[:Type], field[:Extra])
|
83
|
-
|
84
|
-
|
85
|
-
|
86
|
-
default, default_function =
|
163
|
+
default, default_function = field[:Default], nil
|
164
|
+
|
165
|
+
if type_metadata.type == :datetime && /\ACURRENT_TIMESTAMP(?:\([0-6]?\))?\z/i.match?(default)
|
166
|
+
default, default_function = nil, default
|
167
|
+
elsif type_metadata.extra == "DEFAULT_GENERATED"
|
168
|
+
default = +"(#{default})" unless default.start_with?("(")
|
169
|
+
default, default_function = nil, default
|
170
|
+
elsif type_metadata.type == :text && default
|
171
|
+
# strip and unescape quotes
|
172
|
+
default = default[1...-1].gsub("\\'", "'")
|
87
173
|
end
|
88
174
|
|
89
175
|
MySQL::Column.new(
|
@@ -91,9 +177,8 @@ module ActiveRecord
|
|
91
177
|
default,
|
92
178
|
type_metadata,
|
93
179
|
field[:Null] == "YES",
|
94
|
-
table_name,
|
95
180
|
default_function,
|
96
|
-
field[:Collation],
|
181
|
+
collation: field[:Collation],
|
97
182
|
comment: field[:Comment].presence
|
98
183
|
)
|
99
184
|
end
|
@@ -114,17 +199,21 @@ module ActiveRecord
|
|
114
199
|
end
|
115
200
|
|
116
201
|
def add_options_for_index_columns(quoted_columns, **options)
|
117
|
-
quoted_columns = add_index_length(quoted_columns, options)
|
202
|
+
quoted_columns = add_index_length(quoted_columns, **options)
|
118
203
|
super
|
119
204
|
end
|
120
205
|
|
121
206
|
def data_source_sql(name = nil, type: nil)
|
122
207
|
scope = quoted_scope(name, type: type)
|
123
208
|
|
124
|
-
sql = "SELECT table_name FROM information_schema.tables"
|
125
|
-
sql << " WHERE table_schema = #{scope[:schema]}"
|
126
|
-
|
127
|
-
|
209
|
+
sql = +"SELECT table_name FROM (SELECT table_name, table_type FROM information_schema.tables "
|
210
|
+
sql << " WHERE table_schema = #{scope[:schema]}) _subquery"
|
211
|
+
if scope[:type] || scope[:name]
|
212
|
+
conditions = []
|
213
|
+
conditions << "_subquery.table_type = #{scope[:type]}" if scope[:type]
|
214
|
+
conditions << "_subquery.table_name = #{scope[:name]}" if scope[:name]
|
215
|
+
sql << " WHERE #{conditions.join(" AND ")}"
|
216
|
+
end
|
128
217
|
sql
|
129
218
|
end
|
130
219
|
|
@@ -142,6 +231,40 @@ module ActiveRecord
|
|
142
231
|
schema, name = nil, schema unless name
|
143
232
|
[schema, name]
|
144
233
|
end
|
234
|
+
|
235
|
+
def type_with_size_to_sql(type, size)
|
236
|
+
case size&.to_s
|
237
|
+
when nil, "tiny", "medium", "long"
|
238
|
+
"#{size}#{type}"
|
239
|
+
else
|
240
|
+
raise ArgumentError,
|
241
|
+
"#{size.inspect} is invalid :size value. Only :tiny, :medium, and :long are allowed."
|
242
|
+
end
|
243
|
+
end
|
244
|
+
|
245
|
+
def limit_to_size(limit, type)
|
246
|
+
case type.to_s
|
247
|
+
when "text", "blob", "binary"
|
248
|
+
case limit
|
249
|
+
when 0..0xff; "tiny"
|
250
|
+
when nil, 0x100..0xffff; nil
|
251
|
+
when 0x10000..0xffffff; "medium"
|
252
|
+
when 0x1000000..0xffffffff; "long"
|
253
|
+
else raise ArgumentError, "No #{type} type has byte size #{limit}"
|
254
|
+
end
|
255
|
+
end
|
256
|
+
end
|
257
|
+
|
258
|
+
def integer_to_sql(limit)
|
259
|
+
case limit
|
260
|
+
when 1; "tinyint"
|
261
|
+
when 2; "smallint"
|
262
|
+
when 3; "mediumint"
|
263
|
+
when nil, 4; "int"
|
264
|
+
when 5..8; "bigint"
|
265
|
+
else raise ArgumentError, "No integer type has byte size #{limit}. Use a decimal with scale 0 instead."
|
266
|
+
end
|
267
|
+
end
|
145
268
|
end
|
146
269
|
end
|
147
270
|
end
|
@@ -6,28 +6,33 @@ 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
|
-
@type_metadata = type_metadata
|
14
15
|
@extra = extra
|
15
16
|
end
|
16
17
|
|
17
18
|
def ==(other)
|
18
|
-
other.is_a?(
|
19
|
-
|
19
|
+
other.is_a?(TypeMetadata) &&
|
20
|
+
__getobj__ == other.__getobj__ &&
|
21
|
+
extra == other.extra
|
20
22
|
end
|
21
23
|
alias eql? ==
|
22
24
|
|
23
25
|
def hash
|
24
|
-
|
26
|
+
TypeMetadata.hash ^
|
27
|
+
__getobj__.hash ^
|
28
|
+
extra.hash
|
25
29
|
end
|
26
30
|
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
+
private
|
32
|
+
def deduplicated
|
33
|
+
__setobj__(__getobj__.deduplicate)
|
34
|
+
@extra = -extra if extra
|
35
|
+
super
|
31
36
|
end
|
32
37
|
end
|
33
38
|
end
|
@@ -3,7 +3,7 @@
|
|
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
|
@@ -14,36 +14,53 @@ module ActiveRecord
|
|
14
14
|
config[:flags] ||= 0
|
15
15
|
|
16
16
|
if config[:flags].kind_of? Array
|
17
|
-
config[:flags].push "FOUND_ROWS"
|
17
|
+
config[:flags].push "FOUND_ROWS"
|
18
18
|
else
|
19
19
|
config[:flags] |= Mysql2::Client::FOUND_ROWS
|
20
20
|
end
|
21
21
|
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
raise
|
29
|
-
end
|
22
|
+
ConnectionAdapters::Mysql2Adapter.new(
|
23
|
+
ConnectionAdapters::Mysql2Adapter.new_client(config),
|
24
|
+
logger,
|
25
|
+
nil,
|
26
|
+
config,
|
27
|
+
)
|
30
28
|
end
|
31
29
|
end
|
32
30
|
|
33
31
|
module ConnectionAdapters
|
34
32
|
class Mysql2Adapter < AbstractMysqlAdapter
|
35
|
-
|
33
|
+
ER_BAD_DB_ERROR = 1049
|
34
|
+
ADAPTER_NAME = "Mysql2"
|
36
35
|
|
37
36
|
include MySQL::DatabaseStatements
|
38
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
|
+
|
39
50
|
def initialize(connection, logger, connection_options, config)
|
40
|
-
|
41
|
-
|
51
|
+
superclass_config = config.reverse_merge(prepared_statements: false)
|
52
|
+
super(connection, logger, connection_options, superclass_config)
|
42
53
|
configure_connection
|
43
54
|
end
|
44
55
|
|
56
|
+
def self.database_exists?(config)
|
57
|
+
!!ActiveRecord::Base.mysql2_connection(config)
|
58
|
+
rescue ActiveRecord::NoDatabaseError
|
59
|
+
false
|
60
|
+
end
|
61
|
+
|
45
62
|
def supports_json?
|
46
|
-
!mariadb? &&
|
63
|
+
!mariadb? && database_version >= "5.7.8"
|
47
64
|
end
|
48
65
|
|
49
66
|
def supports_comments?
|
@@ -58,6 +75,10 @@ module ActiveRecord
|
|
58
75
|
true
|
59
76
|
end
|
60
77
|
|
78
|
+
def supports_lazy_transactions?
|
79
|
+
true
|
80
|
+
end
|
81
|
+
|
61
82
|
# HELPER METHODS ===========================================
|
62
83
|
|
63
84
|
def each_hash(result) # :nodoc:
|
@@ -80,6 +101,8 @@ module ActiveRecord
|
|
80
101
|
|
81
102
|
def quote_string(string)
|
82
103
|
@connection.escape(string)
|
104
|
+
rescue Mysql2::Error => error
|
105
|
+
raise translate_exception(error, message: error.message, sql: "<escape>", binds: [])
|
83
106
|
end
|
84
107
|
|
85
108
|
#--
|
@@ -105,24 +128,36 @@ module ActiveRecord
|
|
105
128
|
end
|
106
129
|
|
107
130
|
def discard! # :nodoc:
|
131
|
+
super
|
108
132
|
@connection.automatic_close = false
|
109
133
|
@connection = nil
|
110
134
|
end
|
111
135
|
|
112
136
|
private
|
113
|
-
|
114
137
|
def connect
|
115
|
-
@connection =
|
138
|
+
@connection = self.class.new_client(@config)
|
116
139
|
configure_connection
|
117
140
|
end
|
118
141
|
|
119
142
|
def configure_connection
|
120
|
-
@connection.query_options
|
143
|
+
@connection.query_options[:as] = :array
|
121
144
|
super
|
122
145
|
end
|
123
146
|
|
124
147
|
def full_version
|
125
|
-
|
148
|
+
schema_cache.database_version.full_version_string
|
149
|
+
end
|
150
|
+
|
151
|
+
def get_full_version
|
152
|
+
@connection.server_info[:version]
|
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
|
126
161
|
end
|
127
162
|
end
|
128
163
|
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,47 @@
|
|
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
|
+
if pool_config
|
40
|
+
@name_to_role_mapping[role][shard] = pool_config
|
41
|
+
else
|
42
|
+
raise ArgumentError, "The `pool_config` for the :#{role} role and :#{shard} shard was `nil`. Please check your configuration. If you want your writing role to be something other than `:writing` set `config.active_record.writing_role` in your application configuration. The same setting should be applied for the `reading_role` if applicable."
|
43
|
+
end
|
44
|
+
end
|
45
|
+
end
|
46
|
+
end
|
47
|
+
end
|
@@ -2,43 +2,52 @@
|
|
2
2
|
|
3
3
|
module ActiveRecord
|
4
4
|
module ConnectionAdapters
|
5
|
-
|
6
|
-
|
7
|
-
|
8
|
-
alias :array? :array
|
9
|
-
|
10
|
-
def initialize(*, max_identifier_length: 63, **)
|
11
|
-
super
|
12
|
-
@max_identifier_length = max_identifier_length
|
13
|
-
end
|
5
|
+
module PostgreSQL
|
6
|
+
class Column < ConnectionAdapters::Column # :nodoc:
|
7
|
+
delegate :oid, :fmod, to: :sql_type_metadata
|
14
8
|
|
15
|
-
|
16
|
-
|
9
|
+
def initialize(*, serial: nil, **)
|
10
|
+
super
|
11
|
+
@serial = serial
|
12
|
+
end
|
17
13
|
|
18
|
-
|
19
|
-
|
14
|
+
def serial?
|
15
|
+
@serial
|
20
16
|
end
|
21
|
-
end
|
22
17
|
|
23
|
-
|
24
|
-
|
18
|
+
def array
|
19
|
+
sql_type_metadata.sql_type.end_with?("[]")
|
20
|
+
end
|
21
|
+
alias :array? :array
|
22
|
+
|
23
|
+
def sql_type
|
24
|
+
super.delete_suffix("[]")
|
25
|
+
end
|
25
26
|
|
26
|
-
|
27
|
-
|
28
|
-
|
27
|
+
def init_with(coder)
|
28
|
+
@serial = coder["serial"]
|
29
|
+
super
|
30
|
+
end
|
29
31
|
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
end
|
32
|
+
def encode_with(coder)
|
33
|
+
coder["serial"] = @serial
|
34
|
+
super
|
35
|
+
end
|
35
36
|
|
36
|
-
|
37
|
-
|
38
|
-
|
37
|
+
def ==(other)
|
38
|
+
other.is_a?(Column) &&
|
39
|
+
super &&
|
40
|
+
serial? == other.serial?
|
41
|
+
end
|
42
|
+
alias :eql? :==
|
39
43
|
|
40
|
-
|
44
|
+
def hash
|
45
|
+
Column.hash ^
|
46
|
+
super.hash ^
|
47
|
+
serial?.hash
|
41
48
|
end
|
49
|
+
end
|
42
50
|
end
|
51
|
+
PostgreSQLColumn = PostgreSQL::Column # :nodoc:
|
43
52
|
end
|
44
53
|
end
|