Skip to content

Commit e0fa623

Browse files
rzanekares
authored andcommitted
Use ampersand literal in limit offset sub to fix FIRST 1/SKIP 1
1 parent b30c4b0 commit e0fa623

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

lib/arel/visitors/firebird.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ def visit_Arel_Nodes_SelectStatement o, a = nil
1313
sql = o.cores.map { |x| do_visit_select_core x, a }.join
1414
sql << " ORDER BY #{o.orders.map { |x| do_visit x, a }.join(', ')}" unless o.orders.empty?
1515

16-
sql.sub!(/\A(\s*SELECT\s)/i, "\&#{lim_off} ") unless lim_off.empty?
16+
sql.sub!(/\A(\s*SELECT\s)/i, '\&' + lim_off + ' ') unless lim_off.empty?
1717
sql
1818
end
1919

test/db/firebird.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@
1414
config = { :adapter => 'firebird' }
1515
config[:username] = ENV['FB_USER'] || 'sysdba'
1616
config[:password] = ENV['FB_PASS'] || 'masterkey'
17-
config[:database] = ENV['FB_DATABASE'] || './test.fbd'
17+
config[:database] = ENV['FB_DATABASE'] || './test.fdb'
1818

1919
ActiveRecord::Base.establish_connection(config)

0 commit comments

Comments
 (0)