Skip to content

Commit 8e33411

Browse files
authored
Merge pull request #171 from praveen-db2/master
Fix for github issue #167
2 parents e9a9cdc + 167e64b commit 8e33411

1 file changed

Lines changed: 13 additions & 6 deletions

File tree

IBM_DB_Adapter/ibm_db/lib/active_record/connection_adapters/ibm_db_adapter.rb

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,7 @@ def visit_TableDefinition(o)
133133

134134
statements.concat(o.check_constraints.map { |chk| accept chk }) if supports_check_constraints?
135135

136+
@conn.puts_log "visit_TableDefinition #{@conn.servertype}"
136137
if !@conn.servertype.instance_of? IBM_IDS
137138
statements.concat(o.unique_constraints.map { |exc| accept exc }) if supports_unique_constraints?
138139
end
@@ -4264,8 +4265,11 @@ def visit_Arel_Nodes_Limit(o, collector)
42644265
end
42654266

42664267
def visit_Arel_Nodes_Offset(o, collector)
4267-
collector << ' OFFSET '
4268-
visit o.expr, collector
4268+
@connection.puts_log "visit_Arel_Nodes_Offset #{@connection.servertype}"
4269+
if !@connection.servertype.instance_of? ActiveRecord::ConnectionAdapters::IBM_IDS
4270+
collector << ' OFFSET '
4271+
visit o.expr, collector
4272+
end
42694273
end
42704274

42714275
def visit_Arel_Nodes_ValuesList(o, collector)
@@ -4289,6 +4293,7 @@ def visit_Arel_Nodes_ValuesList(o, collector)
42894293
end
42904294

42914295
def visit_Arel_Nodes_SelectStatement(o, collector)
4296+
@connection.puts_log "visit_Arel_Nodes_SelectStatement #{@connection.servertype}"
42924297
if o.with
42934298
collector = visit o.with, collector
42944299
collector << ' '
@@ -4311,10 +4316,12 @@ def visit_Arel_Nodes_SelectStatement(o, collector)
43114316
visit_Arel_Nodes_Limit(o.limit, collector)
43124317
visit_Arel_Nodes_Offset(o.offset, collector)
43134318
elsif o.offset && o.limit.nil?
4314-
collector << ' OFFSET '
4315-
visit o.offset.expr, collector
4316-
collector << ' ROWS '
4317-
maybe_visit o.lock, collector
4319+
if !@connection.servertype.instance_of? ActiveRecord::ConnectionAdapters::IBM_IDS
4320+
collector << ' OFFSET '
4321+
visit o.offset.expr, collector
4322+
collector << ' ROWS '
4323+
maybe_visit o.lock, collector
4324+
end
43184325
else
43194326
visit_Arel_Nodes_SelectOptions(o, collector)
43204327
end

0 commit comments

Comments
 (0)