Skip to content

Add DB col type 98 for int for LOGINPROPERTY function. #321

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
merged 4 commits into from
Dec 11, 2016
Merged

Add DB col type 98 for int for LOGINPROPERTY function. #321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6294114
Add DB col type `98` for int for `LOGINPROPERTY` function.
metaskills Nov 27, 2016
9795cd0
Assume `LOGINPROPERTY` returns 4byte integer.
metaskills Nov 28, 2016
04c5edc
Move SYBVARIANT to bottom of rb_tinytds_result_fetch_row.
metaskills Nov 29, 2016
1599ca9
Update CHANGELOG.
metaskills Dec 11, 2016
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
1 change: 1 addition & 0 deletions CHANGELOG
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
* 1.0.6 *

* Handle SYBVARIANT types from SQL function. Fixes #317. Fixed #321.
* Fix `use_utf16` optoin for booleans. Fixes #314
* Add `-q` check for bin puts. Fixes #318
* Use FreeTDS 1.00.21.
Expand Down
9 changes: 9 additions & 0 deletions ext/tiny_tds/result.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,6 +325,15 @@ static VALUE rb_tinytds_result_fetch_row(VALUE self, ID timezone, int symbolize_
case SYBTEXT:
val = ENCODED_STR_NEW(data, data_len);
break;
case 98: { // SYBVARIANT
if (data_len == 4) {
val = INT2NUM(*(DBINT *)data);
break;
} else {
val = ENCODED_STR_NEW(data, data_len);
break;
}
}
default:
val = ENCODED_STR_NEW(data, data_len);
break;
Expand Down
5 changes: 5 additions & 0 deletions test/result_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,6 +335,11 @@ class ResultTest < TinyTds::TestCase
assert_nil result.return_code
end

it 'with LOGINPROPERTY function' do
v = @client.execute("SELECT LOGINPROPERTY('sa', 'IsLocked') as v").first['v']
v.must_equal 0
end

describe 'with multiple result sets' do

before do
Expand Down