Skip to content
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

Add precision to time, datetime, and timestamp field types #1394

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add precision to time, datetime, and timestamp field types #1394

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
18 changes: 15 additions & 3 deletions ext/mysql2/result.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,17 +287,29 @@ static VALUE rb_mysql_result_fetch_field_type(VALUE self, unsigned int idx) {
rb_field_type = rb_sprintf("double(%ld,%d)", field->length, field->decimals);
break;
case MYSQL_TYPE_TIME: // MYSQL_TIME
rb_field_type = rb_str_new_cstr("time");
if (field->decimals == 0) {
rb_field_type = rb_str_new_cstr("time");
} else {
rb_field_type = rb_sprintf("time(%d)", field->decimals);
}
break;
case MYSQL_TYPE_DATE: // MYSQL_TIME
case MYSQL_TYPE_NEWDATE: // MYSQL_TIME
rb_field_type = rb_str_new_cstr("date");
break;
case MYSQL_TYPE_DATETIME: // MYSQL_TIME
rb_field_type = rb_str_new_cstr("datetime");
if (field->decimals == 0) {
rb_field_type = rb_str_new_cstr("datetime");
} else {
rb_field_type = rb_sprintf("datetime(%d)", field->decimals);
}
break;
case MYSQL_TYPE_TIMESTAMP: // MYSQL_TIME
rb_field_type = rb_str_new_cstr("timestamp");
if (field->decimals == 0) {
rb_field_type = rb_str_new_cstr("timestamp");
} else {
rb_field_type = rb_sprintf("timestamp(%d)", field->decimals);
}
break;
case MYSQL_TYPE_DECIMAL: // char[]
case MYSQL_TYPE_NEWDECIMAL: // char[]
Expand Down
16 changes: 16 additions & 0 deletions spec/mysql2/result_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,22 @@
expect(result.field_types).to eql(expected_types)
end

it "should return precision for timestamps" do
result = @client.query(
"SELECT now(), " \
"cast(now() as datetime(3)), " \
"cast(now() as datetime(6))",
)

expected_types = %w[
timestamp
datetime(3)
datetime(6)
]

expect(result.field_types).to eql(expected_types)
end

it "should return json type on mysql 8.0" do
next unless /8.\d+.\d+/ =~ @client.server_info[:version]

Expand Down