Skip to content

Avoid type cast warning in build_coder_maps #330

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
larskanis merged 1 commit into from
Feb 7, 2020
Merged

Avoid type cast warning in build_coder_maps #330

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/pg/basic_type_mapping.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,13 +118,13 @@ def supports_ranges?(connection)
def build_coder_maps(connection)
if supports_ranges?(connection)
result = connection.exec <<-SQL
SELECT t.oid, t.typname, t.typelem, t.typdelim, t.typinput, r.rngsubtype
SELECT t.oid, t.typname::text, t.typelem, t.typdelim, t.typinput::text, r.rngsubtype
FROM pg_type as t
LEFT JOIN pg_range as r ON oid = rngtypid
SQL
else
result = connection.exec <<-SQL
SELECT t.oid, t.typname, t.typelem, t.typdelim, t.typinput
SELECT t.oid, t.typname::text, t.typelem, t.typdelim, t.typinput::text
FROM pg_type as t
SQL
end
Expand Down
20 changes: 3 additions & 17 deletions spec/pg/basic_type_mapping_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,6 @@ def restore_type(types)
end
end

def expect_to_typecase_result_value_warning
warning = 'Warning: no type cast defined for type "name" with oid 19. '\
"Please cast this type explicitly to TEXT to be safe for future changes.\n"\
'Warning: no type cast defined for type "regproc" with oid 24. '\
"Please cast this type explicitly to TEXT to be safe for future changes.\n"
expect { yield }.to output(warning).to_stderr
end

describe 'Basic type mapping' do

describe PG::BasicTypeMapForQueries do
Expand Down Expand Up @@ -318,9 +310,7 @@ def to_s
it "should convert format #{format} timestamps per TimestampUtc" do
restore_type("timestamp") do
PG::BasicTypeRegistry.register_type 0, 'timestamp', nil, PG::TextDecoder::TimestampUtc
expect_to_typecase_result_value_warning do
@conn.type_map_for_results = PG::BasicTypeMapForResults.new(@conn)
end
@conn.type_map_for_results = PG::BasicTypeMapForResults.new(@conn)
res = @conn.exec_params( "SELECT CAST('2013-07-31 23:58:59+02' AS TIMESTAMP WITHOUT TIME ZONE),
CAST('1913-12-31 23:58:59.1231-03' AS TIMESTAMP WITHOUT TIME ZONE),
CAST('4714-11-24 23:58:59.1231-03 BC' AS TIMESTAMP WITHOUT TIME ZONE),
Expand All @@ -342,9 +332,7 @@ def to_s
restore_type("timestamp") do
PG::BasicTypeRegistry.register_type 0, 'timestamp', nil, PG::TextDecoder::TimestampUtcToLocal
PG::BasicTypeRegistry.register_type 1, 'timestamp', nil, PG::BinaryDecoder::TimestampUtcToLocal
expect_to_typecase_result_value_warning do
@conn.type_map_for_results = PG::BasicTypeMapForResults.new(@conn)
end
@conn.type_map_for_results = PG::BasicTypeMapForResults.new(@conn)
res = @conn.exec_params( "SELECT CAST('2013-07-31 23:58:59+02' AS TIMESTAMP WITHOUT TIME ZONE),
CAST('1913-12-31 23:58:59.1231-03' AS TIMESTAMP WITHOUT TIME ZONE),
CAST('4714-11-24 23:58:59.1231-03 BC' AS TIMESTAMP WITHOUT TIME ZONE),
Expand All @@ -366,9 +354,7 @@ def to_s
restore_type("timestamp") do
PG::BasicTypeRegistry.register_type 0, 'timestamp', nil, PG::TextDecoder::TimestampLocal
PG::BasicTypeRegistry.register_type 1, 'timestamp', nil, PG::BinaryDecoder::TimestampLocal
expect_to_typecase_result_value_warning do
@conn.type_map_for_results = PG::BasicTypeMapForResults.new(@conn)
end
@conn.type_map_for_results = PG::BasicTypeMapForResults.new(@conn)
res = @conn.exec_params( "SELECT CAST('2013-07-31 23:58:59' AS TIMESTAMP WITHOUT TIME ZONE),
CAST('1913-12-31 23:58:59.1231' AS TIMESTAMP WITHOUT TIME ZONE),
CAST('4714-11-24 23:58:59.1231-03 BC' AS TIMESTAMP WITHOUT TIME ZONE),
Expand Down