activerecord 4.1.15 → 4.2.11.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 +5 -5
- data/CHANGELOG.md +1162 -1792
- data/README.rdoc +15 -10
- data/lib/active_record.rb +4 -0
- data/lib/active_record/aggregations.rb +15 -8
- data/lib/active_record/association_relation.rb +13 -0
- data/lib/active_record/associations.rb +158 -49
- data/lib/active_record/associations/alias_tracker.rb +3 -12
- data/lib/active_record/associations/association.rb +16 -4
- data/lib/active_record/associations/association_scope.rb +83 -38
- data/lib/active_record/associations/belongs_to_association.rb +28 -10
- data/lib/active_record/associations/builder/association.rb +15 -4
- data/lib/active_record/associations/builder/belongs_to.rb +7 -29
- data/lib/active_record/associations/builder/collection_association.rb +5 -1
- data/lib/active_record/associations/builder/has_and_belongs_to_many.rb +8 -13
- data/lib/active_record/associations/builder/has_many.rb +1 -1
- data/lib/active_record/associations/builder/has_one.rb +2 -2
- data/lib/active_record/associations/builder/singular_association.rb +8 -1
- data/lib/active_record/associations/collection_association.rb +63 -27
- data/lib/active_record/associations/collection_proxy.rb +29 -35
- data/lib/active_record/associations/foreign_association.rb +11 -0
- data/lib/active_record/associations/has_many_association.rb +83 -22
- data/lib/active_record/associations/has_many_through_association.rb +49 -26
- data/lib/active_record/associations/has_one_association.rb +1 -1
- data/lib/active_record/associations/join_dependency.rb +26 -13
- data/lib/active_record/associations/join_dependency/join_association.rb +25 -15
- data/lib/active_record/associations/join_dependency/join_part.rb +0 -1
- data/lib/active_record/associations/preloader.rb +36 -26
- data/lib/active_record/associations/preloader/association.rb +14 -11
- data/lib/active_record/associations/preloader/through_association.rb +4 -3
- data/lib/active_record/associations/singular_association.rb +17 -2
- data/lib/active_record/associations/through_association.rb +5 -12
- data/lib/active_record/attribute.rb +163 -0
- data/lib/active_record/attribute_assignment.rb +19 -11
- data/lib/active_record/attribute_decorators.rb +66 -0
- data/lib/active_record/attribute_methods.rb +56 -94
- data/lib/active_record/attribute_methods/before_type_cast.rb +7 -2
- data/lib/active_record/attribute_methods/dirty.rb +107 -43
- data/lib/active_record/attribute_methods/primary_key.rb +7 -8
- data/lib/active_record/attribute_methods/query.rb +1 -1
- data/lib/active_record/attribute_methods/read.rb +22 -59
- data/lib/active_record/attribute_methods/serialization.rb +16 -150
- data/lib/active_record/attribute_methods/time_zone_conversion.rb +38 -40
- data/lib/active_record/attribute_methods/write.rb +9 -24
- data/lib/active_record/attribute_set.rb +81 -0
- data/lib/active_record/attribute_set/builder.rb +106 -0
- data/lib/active_record/attributes.rb +147 -0
- data/lib/active_record/autosave_association.rb +19 -12
- data/lib/active_record/base.rb +13 -24
- data/lib/active_record/callbacks.rb +6 -6
- data/lib/active_record/connection_adapters/abstract/connection_pool.rb +84 -52
- data/lib/active_record/connection_adapters/abstract/database_statements.rb +52 -50
- data/lib/active_record/connection_adapters/abstract/query_cache.rb +1 -1
- data/lib/active_record/connection_adapters/abstract/quoting.rb +60 -60
- data/lib/active_record/connection_adapters/abstract/savepoints.rb +1 -1
- data/lib/active_record/connection_adapters/abstract/schema_creation.rb +39 -4
- data/lib/active_record/connection_adapters/abstract/schema_definitions.rb +138 -56
- data/lib/active_record/connection_adapters/abstract/schema_dumper.rb +14 -34
- data/lib/active_record/connection_adapters/abstract/schema_statements.rb +268 -71
- data/lib/active_record/connection_adapters/abstract/transaction.rb +125 -118
- data/lib/active_record/connection_adapters/abstract_adapter.rb +171 -59
- data/lib/active_record/connection_adapters/abstract_mysql_adapter.rb +293 -139
- data/lib/active_record/connection_adapters/column.rb +29 -240
- data/lib/active_record/connection_adapters/connection_specification.rb +15 -24
- data/lib/active_record/connection_adapters/mysql2_adapter.rb +16 -32
- data/lib/active_record/connection_adapters/mysql_adapter.rb +67 -144
- data/lib/active_record/connection_adapters/postgresql/array_parser.rb +15 -27
- data/lib/active_record/connection_adapters/postgresql/column.rb +20 -0
- data/lib/active_record/connection_adapters/postgresql/database_statements.rb +40 -25
- data/lib/active_record/connection_adapters/postgresql/oid.rb +29 -388
- data/lib/active_record/connection_adapters/postgresql/oid/array.rb +100 -0
- data/lib/active_record/connection_adapters/postgresql/oid/bit.rb +52 -0
- data/lib/active_record/connection_adapters/postgresql/oid/bit_varying.rb +13 -0
- data/lib/active_record/connection_adapters/postgresql/oid/bytea.rb +15 -0
- data/lib/active_record/connection_adapters/postgresql/oid/cidr.rb +46 -0
- data/lib/active_record/connection_adapters/postgresql/oid/date.rb +11 -0
- data/lib/active_record/connection_adapters/postgresql/oid/date_time.rb +36 -0
- data/lib/active_record/connection_adapters/postgresql/oid/decimal.rb +13 -0
- data/lib/active_record/connection_adapters/postgresql/oid/enum.rb +19 -0
- data/lib/active_record/connection_adapters/postgresql/oid/float.rb +21 -0
- data/lib/active_record/connection_adapters/postgresql/oid/hstore.rb +59 -0
- data/lib/active_record/connection_adapters/postgresql/oid/inet.rb +13 -0
- data/lib/active_record/connection_adapters/postgresql/oid/infinity.rb +13 -0
- data/lib/active_record/connection_adapters/postgresql/oid/integer.rb +11 -0
- data/lib/active_record/connection_adapters/postgresql/oid/json.rb +35 -0
- data/lib/active_record/connection_adapters/postgresql/oid/jsonb.rb +23 -0
- data/lib/active_record/connection_adapters/postgresql/oid/money.rb +43 -0
- data/lib/active_record/connection_adapters/postgresql/oid/point.rb +43 -0
- data/lib/active_record/connection_adapters/postgresql/oid/range.rb +79 -0
- data/lib/active_record/connection_adapters/postgresql/oid/specialized_string.rb +19 -0
- data/lib/active_record/connection_adapters/postgresql/oid/time.rb +11 -0
- data/lib/active_record/connection_adapters/postgresql/oid/type_map_initializer.rb +109 -0
- data/lib/active_record/connection_adapters/postgresql/oid/uuid.rb +21 -0
- data/lib/active_record/connection_adapters/postgresql/oid/vector.rb +26 -0
- data/lib/active_record/connection_adapters/postgresql/oid/xml.rb +28 -0
- data/lib/active_record/connection_adapters/postgresql/quoting.rb +46 -136
- data/lib/active_record/connection_adapters/postgresql/referential_integrity.rb +4 -4
- data/lib/active_record/connection_adapters/postgresql/schema_definitions.rb +152 -0
- data/lib/active_record/connection_adapters/postgresql/schema_statements.rb +131 -43
- data/lib/active_record/connection_adapters/postgresql/utils.rb +77 -0
- data/lib/active_record/connection_adapters/postgresql_adapter.rb +224 -477
- data/lib/active_record/connection_adapters/schema_cache.rb +14 -28
- data/lib/active_record/connection_adapters/sqlite3_adapter.rb +61 -75
- data/lib/active_record/connection_handling.rb +1 -1
- data/lib/active_record/core.rb +163 -39
- data/lib/active_record/counter_cache.rb +60 -6
- data/lib/active_record/enum.rb +9 -11
- data/lib/active_record/errors.rb +53 -30
- data/lib/active_record/explain.rb +1 -1
- data/lib/active_record/explain_subscriber.rb +1 -1
- data/lib/active_record/fixtures.rb +55 -69
- data/lib/active_record/gem_version.rb +4 -4
- data/lib/active_record/inheritance.rb +35 -10
- data/lib/active_record/integration.rb +4 -4
- data/lib/active_record/legacy_yaml_adapter.rb +30 -0
- data/lib/active_record/locking/optimistic.rb +46 -26
- data/lib/active_record/migration.rb +71 -46
- data/lib/active_record/migration/command_recorder.rb +19 -2
- data/lib/active_record/migration/join_table.rb +1 -1
- data/lib/active_record/model_schema.rb +52 -58
- data/lib/active_record/nested_attributes.rb +5 -5
- data/lib/active_record/no_touching.rb +1 -1
- data/lib/active_record/persistence.rb +46 -26
- data/lib/active_record/query_cache.rb +3 -3
- data/lib/active_record/querying.rb +10 -7
- data/lib/active_record/railtie.rb +18 -11
- data/lib/active_record/railties/databases.rake +50 -51
- data/lib/active_record/readonly_attributes.rb +0 -1
- data/lib/active_record/reflection.rb +273 -114
- data/lib/active_record/relation.rb +57 -25
- data/lib/active_record/relation/batches.rb +0 -2
- data/lib/active_record/relation/calculations.rb +41 -37
- data/lib/active_record/relation/finder_methods.rb +70 -47
- data/lib/active_record/relation/merger.rb +39 -29
- data/lib/active_record/relation/predicate_builder.rb +16 -8
- data/lib/active_record/relation/predicate_builder/array_handler.rb +32 -13
- data/lib/active_record/relation/predicate_builder/relation_handler.rb +1 -5
- data/lib/active_record/relation/query_methods.rb +114 -65
- data/lib/active_record/relation/spawn_methods.rb +3 -0
- data/lib/active_record/result.rb +18 -7
- data/lib/active_record/sanitization.rb +12 -2
- data/lib/active_record/schema.rb +0 -1
- data/lib/active_record/schema_dumper.rb +59 -28
- data/lib/active_record/schema_migration.rb +5 -4
- data/lib/active_record/scoping/default.rb +6 -4
- data/lib/active_record/scoping/named.rb +4 -0
- data/lib/active_record/serializers/xml_serializer.rb +3 -7
- data/lib/active_record/statement_cache.rb +95 -10
- data/lib/active_record/store.rb +5 -5
- data/lib/active_record/tasks/database_tasks.rb +61 -6
- data/lib/active_record/tasks/mysql_database_tasks.rb +32 -17
- data/lib/active_record/tasks/postgresql_database_tasks.rb +20 -9
- data/lib/active_record/timestamp.rb +9 -7
- data/lib/active_record/transactions.rb +53 -27
- data/lib/active_record/type.rb +23 -0
- data/lib/active_record/type/big_integer.rb +13 -0
- data/lib/active_record/type/binary.rb +50 -0
- data/lib/active_record/type/boolean.rb +31 -0
- data/lib/active_record/type/date.rb +50 -0
- data/lib/active_record/type/date_time.rb +54 -0
- data/lib/active_record/type/decimal.rb +64 -0
- data/lib/active_record/type/decimal_without_scale.rb +11 -0
- data/lib/active_record/type/decorator.rb +14 -0
- data/lib/active_record/type/float.rb +19 -0
- data/lib/active_record/type/hash_lookup_type_map.rb +23 -0
- data/lib/active_record/type/integer.rb +59 -0
- data/lib/active_record/type/mutable.rb +16 -0
- data/lib/active_record/type/numeric.rb +36 -0
- data/lib/active_record/type/serialized.rb +62 -0
- data/lib/active_record/type/string.rb +40 -0
- data/lib/active_record/type/text.rb +11 -0
- data/lib/active_record/type/time.rb +26 -0
- data/lib/active_record/type/time_value.rb +38 -0
- data/lib/active_record/type/type_map.rb +64 -0
- data/lib/active_record/type/unsigned_integer.rb +15 -0
- data/lib/active_record/type/value.rb +110 -0
- data/lib/active_record/validations.rb +25 -19
- data/lib/active_record/validations/associated.rb +5 -3
- data/lib/active_record/validations/presence.rb +5 -3
- data/lib/active_record/validations/uniqueness.rb +25 -29
- data/lib/rails/generators/active_record/migration/migration_generator.rb +8 -4
- data/lib/rails/generators/active_record/migration/templates/create_table_migration.rb +1 -1
- data/lib/rails/generators/active_record/model/templates/model.rb +1 -1
- metadata +66 -11
- data/lib/active_record/connection_adapters/postgresql/cast.rb +0 -168
@@ -0,0 +1,43 @@
|
|
1
|
+
module ActiveRecord
|
2
|
+
module ConnectionAdapters
|
3
|
+
module PostgreSQL
|
4
|
+
module OID # :nodoc:
|
5
|
+
class Point < Type::Value # :nodoc:
|
6
|
+
include Type::Mutable
|
7
|
+
|
8
|
+
def type
|
9
|
+
:point
|
10
|
+
end
|
11
|
+
|
12
|
+
def type_cast(value)
|
13
|
+
case value
|
14
|
+
when ::String
|
15
|
+
if value[0] == '(' && value[-1] == ')'
|
16
|
+
value = value[1...-1]
|
17
|
+
end
|
18
|
+
type_cast(value.split(','))
|
19
|
+
when ::Array
|
20
|
+
value.map { |v| Float(v) }
|
21
|
+
else
|
22
|
+
value
|
23
|
+
end
|
24
|
+
end
|
25
|
+
|
26
|
+
def type_cast_for_database(value)
|
27
|
+
if value.is_a?(::Array)
|
28
|
+
"(#{number_for_point(value[0])},#{number_for_point(value[1])})"
|
29
|
+
else
|
30
|
+
super
|
31
|
+
end
|
32
|
+
end
|
33
|
+
|
34
|
+
private
|
35
|
+
|
36
|
+
def number_for_point(number)
|
37
|
+
number.to_s.gsub(/\.0$/, '')
|
38
|
+
end
|
39
|
+
end
|
40
|
+
end
|
41
|
+
end
|
42
|
+
end
|
43
|
+
end
|
@@ -0,0 +1,79 @@
|
|
1
|
+
require 'active_support/core_ext/string/filters'
|
2
|
+
|
3
|
+
module ActiveRecord
|
4
|
+
module ConnectionAdapters
|
5
|
+
module PostgreSQL
|
6
|
+
module OID # :nodoc:
|
7
|
+
class Range < Type::Value # :nodoc:
|
8
|
+
attr_reader :subtype, :type
|
9
|
+
|
10
|
+
def initialize(subtype, type)
|
11
|
+
@subtype = subtype
|
12
|
+
@type = type
|
13
|
+
end
|
14
|
+
|
15
|
+
def type_cast_for_schema(value)
|
16
|
+
value.inspect.gsub('Infinity', '::Float::INFINITY')
|
17
|
+
end
|
18
|
+
|
19
|
+
def cast_value(value)
|
20
|
+
return if value == 'empty'
|
21
|
+
return value if value.is_a?(::Range)
|
22
|
+
|
23
|
+
extracted = extract_bounds(value)
|
24
|
+
from = type_cast_single extracted[:from]
|
25
|
+
to = type_cast_single extracted[:to]
|
26
|
+
|
27
|
+
if !infinity?(from) && extracted[:exclude_start]
|
28
|
+
if from.respond_to?(:succ)
|
29
|
+
from = from.succ
|
30
|
+
ActiveSupport::Deprecation.warn(<<-MSG.squish)
|
31
|
+
Excluding the beginning of a Range is only partialy supported
|
32
|
+
through `#succ`. This is not reliable and will be removed in
|
33
|
+
the future.
|
34
|
+
MSG
|
35
|
+
else
|
36
|
+
raise ArgumentError, "The Ruby Range object does not support excluding the beginning of a Range. (unsupported value: '#{value}')"
|
37
|
+
end
|
38
|
+
end
|
39
|
+
::Range.new(from, to, extracted[:exclude_end])
|
40
|
+
end
|
41
|
+
|
42
|
+
def type_cast_for_database(value)
|
43
|
+
if value.is_a?(::Range)
|
44
|
+
from = type_cast_single_for_database(value.begin)
|
45
|
+
to = type_cast_single_for_database(value.end)
|
46
|
+
"[#{from},#{to}#{value.exclude_end? ? ')' : ']'}"
|
47
|
+
else
|
48
|
+
super
|
49
|
+
end
|
50
|
+
end
|
51
|
+
|
52
|
+
private
|
53
|
+
|
54
|
+
def type_cast_single(value)
|
55
|
+
infinity?(value) ? value : @subtype.type_cast_from_database(value)
|
56
|
+
end
|
57
|
+
|
58
|
+
def type_cast_single_for_database(value)
|
59
|
+
infinity?(value) ? '' : @subtype.type_cast_for_database(value)
|
60
|
+
end
|
61
|
+
|
62
|
+
def extract_bounds(value)
|
63
|
+
from, to = value[1..-2].split(',')
|
64
|
+
{
|
65
|
+
from: (value[1] == ',' || from == '-infinity') ? @subtype.infinity(negative: true) : from,
|
66
|
+
to: (value[-2] == ',' || to == 'infinity') ? @subtype.infinity : to,
|
67
|
+
exclude_start: (value[0] == '('),
|
68
|
+
exclude_end: (value[-1] == ')')
|
69
|
+
}
|
70
|
+
end
|
71
|
+
|
72
|
+
def infinity?(value)
|
73
|
+
value.respond_to?(:infinite?) && value.infinite?
|
74
|
+
end
|
75
|
+
end
|
76
|
+
end
|
77
|
+
end
|
78
|
+
end
|
79
|
+
end
|
@@ -0,0 +1,19 @@
|
|
1
|
+
module ActiveRecord
|
2
|
+
module ConnectionAdapters
|
3
|
+
module PostgreSQL
|
4
|
+
module OID # :nodoc:
|
5
|
+
class SpecializedString < Type::String # :nodoc:
|
6
|
+
attr_reader :type
|
7
|
+
|
8
|
+
def initialize(type)
|
9
|
+
@type = type
|
10
|
+
end
|
11
|
+
|
12
|
+
def text?
|
13
|
+
false
|
14
|
+
end
|
15
|
+
end
|
16
|
+
end
|
17
|
+
end
|
18
|
+
end
|
19
|
+
end
|
@@ -0,0 +1,109 @@
|
|
1
|
+
module ActiveRecord
|
2
|
+
module ConnectionAdapters
|
3
|
+
module PostgreSQL
|
4
|
+
module OID # :nodoc:
|
5
|
+
# This class uses the data from PostgreSQL pg_type table to build
|
6
|
+
# the OID -> Type mapping.
|
7
|
+
# - OID is an integer representing the type.
|
8
|
+
# - Type is an OID::Type object.
|
9
|
+
# This class has side effects on the +store+ passed during initialization.
|
10
|
+
class TypeMapInitializer # :nodoc:
|
11
|
+
def initialize(store)
|
12
|
+
@store = store
|
13
|
+
end
|
14
|
+
|
15
|
+
def run(records)
|
16
|
+
nodes = records.reject { |row| @store.key? row['oid'].to_i }
|
17
|
+
mapped, nodes = nodes.partition { |row| @store.key? row['typname'] }
|
18
|
+
ranges, nodes = nodes.partition { |row| row['typtype'] == 'r'.freeze }
|
19
|
+
enums, nodes = nodes.partition { |row| row['typtype'] == 'e'.freeze }
|
20
|
+
domains, nodes = nodes.partition { |row| row['typtype'] == 'd'.freeze }
|
21
|
+
arrays, nodes = nodes.partition { |row| row['typinput'] == 'array_in'.freeze }
|
22
|
+
composites, nodes = nodes.partition { |row| row['typelem'].to_i != 0 }
|
23
|
+
|
24
|
+
mapped.each { |row| register_mapped_type(row) }
|
25
|
+
enums.each { |row| register_enum_type(row) }
|
26
|
+
domains.each { |row| register_domain_type(row) }
|
27
|
+
arrays.each { |row| register_array_type(row) }
|
28
|
+
ranges.each { |row| register_range_type(row) }
|
29
|
+
composites.each { |row| register_composite_type(row) }
|
30
|
+
end
|
31
|
+
|
32
|
+
def query_conditions_for_initial_load(type_map)
|
33
|
+
known_type_names = type_map.keys.map { |n| "'#{n}'" }
|
34
|
+
known_type_types = %w('r' 'e' 'd')
|
35
|
+
<<-SQL % [known_type_names.join(", "), known_type_types.join(", ")]
|
36
|
+
WHERE
|
37
|
+
t.typname IN (%s)
|
38
|
+
OR t.typtype IN (%s)
|
39
|
+
OR t.typinput = 'array_in(cstring,oid,integer)'::regprocedure
|
40
|
+
OR t.typelem != 0
|
41
|
+
SQL
|
42
|
+
end
|
43
|
+
|
44
|
+
private
|
45
|
+
def register_mapped_type(row)
|
46
|
+
alias_type row['oid'], row['typname']
|
47
|
+
end
|
48
|
+
|
49
|
+
def register_enum_type(row)
|
50
|
+
register row['oid'], OID::Enum.new
|
51
|
+
end
|
52
|
+
|
53
|
+
def register_array_type(row)
|
54
|
+
register_with_subtype(row['oid'], row['typelem'].to_i) do |subtype|
|
55
|
+
OID::Array.new(subtype, row['typdelim'])
|
56
|
+
end
|
57
|
+
end
|
58
|
+
|
59
|
+
def register_range_type(row)
|
60
|
+
register_with_subtype(row['oid'], row['rngsubtype'].to_i) do |subtype|
|
61
|
+
OID::Range.new(subtype, row['typname'].to_sym)
|
62
|
+
end
|
63
|
+
end
|
64
|
+
|
65
|
+
def register_domain_type(row)
|
66
|
+
if base_type = @store.lookup(row["typbasetype"].to_i)
|
67
|
+
register row['oid'], base_type
|
68
|
+
else
|
69
|
+
warn "unknown base type (OID: #{row["typbasetype"]}) for domain #{row["typname"]}."
|
70
|
+
end
|
71
|
+
end
|
72
|
+
|
73
|
+
def register_composite_type(row)
|
74
|
+
if subtype = @store.lookup(row['typelem'].to_i)
|
75
|
+
register row['oid'], OID::Vector.new(row['typdelim'], subtype)
|
76
|
+
end
|
77
|
+
end
|
78
|
+
|
79
|
+
def register(oid, oid_type = nil, &block)
|
80
|
+
oid = assert_valid_registration(oid, oid_type || block)
|
81
|
+
if block_given?
|
82
|
+
@store.register_type(oid, &block)
|
83
|
+
else
|
84
|
+
@store.register_type(oid, oid_type)
|
85
|
+
end
|
86
|
+
end
|
87
|
+
|
88
|
+
def alias_type(oid, target)
|
89
|
+
oid = assert_valid_registration(oid, target)
|
90
|
+
@store.alias_type(oid, target)
|
91
|
+
end
|
92
|
+
|
93
|
+
def register_with_subtype(oid, target_oid)
|
94
|
+
if @store.key?(target_oid)
|
95
|
+
register(oid) do |_, *args|
|
96
|
+
yield @store.lookup(target_oid, *args)
|
97
|
+
end
|
98
|
+
end
|
99
|
+
end
|
100
|
+
|
101
|
+
def assert_valid_registration(oid, oid_type)
|
102
|
+
raise ArgumentError, "can't register nil type for OID #{oid}" if oid_type.nil?
|
103
|
+
oid.to_i
|
104
|
+
end
|
105
|
+
end
|
106
|
+
end
|
107
|
+
end
|
108
|
+
end
|
109
|
+
end
|
@@ -0,0 +1,21 @@
|
|
1
|
+
module ActiveRecord
|
2
|
+
module ConnectionAdapters
|
3
|
+
module PostgreSQL
|
4
|
+
module OID # :nodoc:
|
5
|
+
class Uuid < Type::Value # :nodoc:
|
6
|
+
ACCEPTABLE_UUID = %r{\A\{?([a-fA-F0-9]{4}-?){8}\}?\z}x
|
7
|
+
|
8
|
+
alias_method :type_cast_for_database, :type_cast_from_database
|
9
|
+
|
10
|
+
def type
|
11
|
+
:uuid
|
12
|
+
end
|
13
|
+
|
14
|
+
def type_cast(value)
|
15
|
+
value.to_s[ACCEPTABLE_UUID, 0]
|
16
|
+
end
|
17
|
+
end
|
18
|
+
end
|
19
|
+
end
|
20
|
+
end
|
21
|
+
end
|
@@ -0,0 +1,26 @@
|
|
1
|
+
module ActiveRecord
|
2
|
+
module ConnectionAdapters
|
3
|
+
module PostgreSQL
|
4
|
+
module OID # :nodoc:
|
5
|
+
class Vector < Type::Value # :nodoc:
|
6
|
+
attr_reader :delim, :subtype
|
7
|
+
|
8
|
+
# +delim+ corresponds to the `typdelim` column in the pg_types
|
9
|
+
# table. +subtype+ is derived from the `typelem` column in the
|
10
|
+
# pg_types table.
|
11
|
+
def initialize(delim, subtype)
|
12
|
+
@delim = delim
|
13
|
+
@subtype = subtype
|
14
|
+
end
|
15
|
+
|
16
|
+
# FIXME: this should probably split on +delim+ and use +subtype+
|
17
|
+
# to cast the values. Unfortunately, the current Rails behavior
|
18
|
+
# is to just return the string.
|
19
|
+
def type_cast(value)
|
20
|
+
value
|
21
|
+
end
|
22
|
+
end
|
23
|
+
end
|
24
|
+
end
|
25
|
+
end
|
26
|
+
end
|
@@ -0,0 +1,28 @@
|
|
1
|
+
module ActiveRecord
|
2
|
+
module ConnectionAdapters
|
3
|
+
module PostgreSQL
|
4
|
+
module OID # :nodoc:
|
5
|
+
class Xml < Type::String # :nodoc:
|
6
|
+
def type
|
7
|
+
:xml
|
8
|
+
end
|
9
|
+
|
10
|
+
def type_cast_for_database(value)
|
11
|
+
return unless value
|
12
|
+
Data.new(super)
|
13
|
+
end
|
14
|
+
|
15
|
+
class Data # :nodoc:
|
16
|
+
def initialize(value)
|
17
|
+
@value = value
|
18
|
+
end
|
19
|
+
|
20
|
+
def to_s
|
21
|
+
@value
|
22
|
+
end
|
23
|
+
end
|
24
|
+
end
|
25
|
+
end
|
26
|
+
end
|
27
|
+
end
|
28
|
+
end
|
@@ -1,140 +1,17 @@
|
|
1
1
|
module ActiveRecord
|
2
2
|
module ConnectionAdapters
|
3
|
-
|
3
|
+
module PostgreSQL
|
4
4
|
module Quoting
|
5
5
|
# Escapes binary strings for bytea input to the database.
|
6
6
|
def escape_bytea(value)
|
7
|
-
|
7
|
+
@connection.escape_bytea(value) if value
|
8
8
|
end
|
9
9
|
|
10
10
|
# Unescapes bytea output from a database to the binary string it represents.
|
11
11
|
# NOTE: This is NOT an inverse of escape_bytea! This is only to be used
|
12
12
|
# on escaped binary output from database drive.
|
13
13
|
def unescape_bytea(value)
|
14
|
-
|
15
|
-
end
|
16
|
-
|
17
|
-
# Quotes PostgreSQL-specific data types for SQL input.
|
18
|
-
def quote(value, column = nil) #:nodoc:
|
19
|
-
return super unless column && column.type
|
20
|
-
|
21
|
-
sql_type = type_to_sql(column.type, column.limit, column.precision, column.scale)
|
22
|
-
|
23
|
-
case value
|
24
|
-
when Range
|
25
|
-
if /range$/ =~ sql_type
|
26
|
-
escaped = quote_string(PostgreSQLColumn.range_to_string(value))
|
27
|
-
"'#{escaped}'::#{sql_type}"
|
28
|
-
else
|
29
|
-
super
|
30
|
-
end
|
31
|
-
when Array
|
32
|
-
case sql_type
|
33
|
-
when 'point' then super(PostgreSQLColumn.point_to_string(value))
|
34
|
-
when 'json' then super(PostgreSQLColumn.json_to_string(value))
|
35
|
-
else
|
36
|
-
if column.array
|
37
|
-
"'#{PostgreSQLColumn.array_to_string(value, column, self).gsub(/'/, "''")}'"
|
38
|
-
else
|
39
|
-
super
|
40
|
-
end
|
41
|
-
end
|
42
|
-
when Hash
|
43
|
-
case sql_type
|
44
|
-
when 'hstore' then super(PostgreSQLColumn.hstore_to_string(value), column)
|
45
|
-
when 'json' then super(PostgreSQLColumn.json_to_string(value), column)
|
46
|
-
else super
|
47
|
-
end
|
48
|
-
when IPAddr
|
49
|
-
case sql_type
|
50
|
-
when 'inet', 'cidr' then super(PostgreSQLColumn.cidr_to_string(value), column)
|
51
|
-
else super
|
52
|
-
end
|
53
|
-
when Float
|
54
|
-
if value.infinite? && column.type == :datetime
|
55
|
-
"'#{value.to_s.downcase}'"
|
56
|
-
elsif value.infinite? || value.nan?
|
57
|
-
"'#{value.to_s}'"
|
58
|
-
else
|
59
|
-
super
|
60
|
-
end
|
61
|
-
when Numeric
|
62
|
-
if sql_type == 'money' || [:string, :text].include?(column.type)
|
63
|
-
# Not truly string input, so doesn't require (or allow) escape string syntax.
|
64
|
-
"'#{value}'"
|
65
|
-
else
|
66
|
-
super
|
67
|
-
end
|
68
|
-
when String
|
69
|
-
case sql_type
|
70
|
-
when 'bytea' then "'#{escape_bytea(value)}'"
|
71
|
-
when 'xml' then "xml '#{quote_string(value)}'"
|
72
|
-
when /^bit/
|
73
|
-
case value
|
74
|
-
when /\A[01]*\Z/ then "B'#{value}'" # Bit-string notation
|
75
|
-
when /\A[0-9A-F]*\Z/i then "X'#{value}'" # Hexadecimal notation
|
76
|
-
end
|
77
|
-
else
|
78
|
-
super
|
79
|
-
end
|
80
|
-
else
|
81
|
-
super
|
82
|
-
end
|
83
|
-
end
|
84
|
-
|
85
|
-
def type_cast(value, column, array_member = false)
|
86
|
-
return super(value, column) unless column
|
87
|
-
|
88
|
-
case value
|
89
|
-
when Range
|
90
|
-
if /range$/ =~ column.sql_type
|
91
|
-
PostgreSQLColumn.range_to_string(value)
|
92
|
-
else
|
93
|
-
super(value, column)
|
94
|
-
end
|
95
|
-
when NilClass
|
96
|
-
if column.array && array_member
|
97
|
-
'NULL'
|
98
|
-
elsif column.array
|
99
|
-
value
|
100
|
-
else
|
101
|
-
super(value, column)
|
102
|
-
end
|
103
|
-
when Array
|
104
|
-
case column.sql_type
|
105
|
-
when 'point' then PostgreSQLColumn.point_to_string(value)
|
106
|
-
when 'json' then PostgreSQLColumn.json_to_string(value)
|
107
|
-
else
|
108
|
-
if column.array
|
109
|
-
PostgreSQLColumn.array_to_string(value, column, self)
|
110
|
-
else
|
111
|
-
super(value, column)
|
112
|
-
end
|
113
|
-
end
|
114
|
-
when String
|
115
|
-
if 'bytea' == column.sql_type
|
116
|
-
# Return a bind param hash with format as binary.
|
117
|
-
# See http://deveiate.org/code/pg/PGconn.html#method-i-exec_prepared-doc
|
118
|
-
# for more information
|
119
|
-
{ value: value, format: 1 }
|
120
|
-
else
|
121
|
-
super(value, column)
|
122
|
-
end
|
123
|
-
when Hash
|
124
|
-
case column.sql_type
|
125
|
-
when 'hstore' then PostgreSQLColumn.hstore_to_string(value, array_member)
|
126
|
-
when 'json' then PostgreSQLColumn.json_to_string(value)
|
127
|
-
else super(value, column)
|
128
|
-
end
|
129
|
-
when IPAddr
|
130
|
-
if %w(inet cidr).include? column.sql_type
|
131
|
-
PostgreSQLColumn.cidr_to_string(value)
|
132
|
-
else
|
133
|
-
super(value, column)
|
134
|
-
end
|
135
|
-
else
|
136
|
-
super(value, column)
|
137
|
-
end
|
14
|
+
@connection.unescape_bytea(value) if value
|
138
15
|
end
|
139
16
|
|
140
17
|
# Quotes strings for use in SQL input.
|
@@ -151,14 +28,7 @@ module ActiveRecord
|
|
151
28
|
# - "schema.name".table_name
|
152
29
|
# - "schema.name"."table.name"
|
153
30
|
def quote_table_name(name)
|
154
|
-
|
155
|
-
|
156
|
-
unless name_part
|
157
|
-
quote_column_name(schema)
|
158
|
-
else
|
159
|
-
table_name, name_part = extract_pg_identifier_from_name(name_part)
|
160
|
-
"#{quote_column_name(schema)}.#{quote_column_name(table_name)}"
|
161
|
-
end
|
31
|
+
Utils.extract_schema_qualified_name(name.to_s).quoted
|
162
32
|
end
|
163
33
|
|
164
34
|
def quote_table_name_for_assignment(table, attr)
|
@@ -178,8 +48,9 @@ module ActiveRecord
|
|
178
48
|
result = "#{result}.#{sprintf("%06d", value.usec)}"
|
179
49
|
end
|
180
50
|
|
181
|
-
if value.year
|
182
|
-
|
51
|
+
if value.year <= 0
|
52
|
+
bce_year = format("%04d", -value.year + 1)
|
53
|
+
result = result.sub(/^-?\d+/, bce_year) + " BC"
|
183
54
|
end
|
184
55
|
result
|
185
56
|
end
|
@@ -192,6 +63,45 @@ module ActiveRecord
|
|
192
63
|
quote(value, column)
|
193
64
|
end
|
194
65
|
end
|
66
|
+
|
67
|
+
private
|
68
|
+
|
69
|
+
def _quote(value)
|
70
|
+
case value
|
71
|
+
when Type::Binary::Data
|
72
|
+
"'#{escape_bytea(value.to_s)}'"
|
73
|
+
when OID::Xml::Data
|
74
|
+
"xml '#{quote_string(value.to_s)}'"
|
75
|
+
when OID::Bit::Data
|
76
|
+
if value.binary?
|
77
|
+
"B'#{value}'"
|
78
|
+
elsif value.hex?
|
79
|
+
"X'#{value}'"
|
80
|
+
end
|
81
|
+
when Float
|
82
|
+
if value.infinite? || value.nan?
|
83
|
+
"'#{value}'"
|
84
|
+
else
|
85
|
+
super
|
86
|
+
end
|
87
|
+
else
|
88
|
+
super
|
89
|
+
end
|
90
|
+
end
|
91
|
+
|
92
|
+
def _type_cast(value)
|
93
|
+
case value
|
94
|
+
when Type::Binary::Data
|
95
|
+
# Return a bind param hash with format as binary.
|
96
|
+
# See http://deveiate.org/code/pg/PGconn.html#method-i-exec_prepared-doc
|
97
|
+
# for more information
|
98
|
+
{ value: value.to_s, format: 1 }
|
99
|
+
when OID::Xml::Data, OID::Bit::Data
|
100
|
+
value.to_s
|
101
|
+
else
|
102
|
+
super
|
103
|
+
end
|
104
|
+
end
|
195
105
|
end
|
196
106
|
end
|
197
107
|
end
|