Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion ext/pg_text_decoder.c
Original file line number Diff line number Diff line change
Expand Up @@ -823,7 +823,7 @@ pg_text_dec_inet(t_pg_coder *conv, const char *val, int len, int tuple, int fiel
VALUE vmasks;
char dst[16];
char buf[64];
int af = strchr(val, '.') ? AF_INET : AF_INET6;
int af = strchr(val, ':') ? AF_INET6 : AF_INET;
int mask = -1;

if (len >= 64) {
Expand Down
4 changes: 4 additions & 0 deletions spec/pg/basic_type_map_for_results_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -351,6 +351,9 @@
'1234:3456:5678:789a:9abc:bced:edf0:f012/32',
'1234:3456:5678:789a:9abc:bced:edf0:f012/64',
'1234:3456:5678:789a:9abc:bced:edf0:f012/96',
'::ffff:1.2.3.4',
'::ffff:1.2.3.4/120',
'::1.2.3.4',
]
sql_vals = vals.map{|v| "CAST('#{v}' AS inet)"}
res = @conn.exec_params(("SELECT " + sql_vals.join(', ')), [], format )
Expand All @@ -374,6 +377,7 @@
'1234:3456:5678:789a::/64',
'1234:3456:5678:789a:9abc:bced::/96',
'1234:3456:5678:789a:9abc:bced:edf0:f012/128',
'::ffff:1.2.3.0/120',
]
sql_vals = vals.map { |v| "CAST('#{v}' AS cidr)" }
res = @conn.exec_params(("SELECT " + sql_vals.join(', ')), [], format )
Expand Down
Loading