Skip to content

Commit 77b8688

Browse files
authored
Merge pull request #139 from praveen-db2/master
Fixed clidriver download issue on windows
2 parents c8fe0a4 + e84c581 commit 77b8688

3 files changed

Lines changed: 6 additions & 5 deletions

File tree

IBM_DB_Adapter/ibm_db/IBM_DB.gemspec

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ Gem::Specification.new do |spec|
3636

3737
if RUBY_PLATFORM =~ /mswin32/ || RUBY_PLATFORM =~ /mingw/
3838
spec.platform = Gem::Platform::CURRENT
39-
spec.add_dependency('archive-zip', '>= 0.7.0')
39+
spec.add_dependency('archive-zip', '>= 0.7.0')
40+
spec.extensions << 'ext/extconf.rb'
4041
else
4142
spec.files = candidates.delete_if { |item| item.include?("lib/mswin32") }
4243
puts ".. Check for the pre-built IBM_DB driver for this platform: #{RUBY_PLATFORM}"
@@ -48,7 +49,7 @@ Gem::Specification.new do |spec|
4849
puts ".. ibm_db driver was found: #{drv_lib.realpath}"
4950
else
5051
puts ".. ibm_db driver binary was not found. The driver native extension to be built during install."
51-
spec.extensions << 'ext/extconf.rb'
52+
spec.extensions << 'ext/extconf.rb'
5253
end
5354
end
5455

0 Bytes
Binary file not shown.

IBM_DB_Adapter/ibm_db/test/cases/calculations_test.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ def test_limit_is_kept
239239

240240
queries = capture_sql { Account.limit(1).count }
241241
assert_equal 1, queries.length
242-
assert_match(/LIMIT/, queries.first)
242+
assert_match(/FETCH FIRST/, queries.first)
243243
end
244244

245245
def test_offset_is_kept
@@ -255,14 +255,14 @@ def test_limit_with_offset_is_kept
255255

256256
queries = capture_sql { Account.limit(1).offset(1).count }
257257
assert_equal 1, queries.length
258-
assert_match(/LIMIT/, queries.first)
258+
assert_match(/FETCH FIRST/, queries.first)
259259
assert_match(/OFFSET/, queries.first)
260260
end
261261

262262
def test_no_limit_no_offset
263263
queries = capture_sql { Account.count }
264264
assert_equal 1, queries.length
265-
assert_no_match(/LIMIT/, queries.first)
265+
assert_no_match(/FETCH FIRST/, queries.first)
266266
assert_no_match(/OFFSET/, queries.first)
267267
end
268268

0 commit comments

Comments
 (0)