firebird_adapter 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a58a1cfffe5d2db00db303b202c951edd8a9e7a69ce5f517f5f4f82a69ad750a
-  data.tar.gz: 2305b01bac0fc96270e04a40670cb856a09611f61d6f2926b71fedc885587708
+  metadata.gz: 9862bb89f1ee8b387ce778ea0289a0101b7ee385804b3e3e2af62a28415d522d
+  data.tar.gz: af120e7dba499c2c75114eb91fc82975e0e328222bd8a51e1609bf3aa87f9620
 SHA512:
-  metadata.gz: e9ebbe4323c35e43abe2d5340094a7ea239a21445a257a687f8a45e68538e5d7caa4f94600db1e95161d6cb7d2cf3cbb858580b2bca3761b8e9ab3e6ef2dc2d6
-  data.tar.gz: 6e9bd26350107d4c1f181254f46af87905fa57ae86f1db6ab9b85dcaec6739468c8b16419405c337434cd6045ae73072914bd15222f27d164653b0790da64648
+  metadata.gz: 1c2b392daa062e95906a2d138f12cd8fa4e21a76c6d3375ebc93b398fd30c150507d7f5c3264405f552c150aaa125c151cfa12f873f7ee86385e2117663c0be1
+  data.tar.gz: 980d8174f6ae3ee40286686fe1efee4e73dd1fd5e049e562ee915463196743ad8590951611ed473811092047861e4d9eb4b83216176692430661a2537e82973b

data/lib/active_record/extensions.rb

@@ -3,22 +3,4 @@ ActiveRecord::Calculations.module_eval do
     return super() if block_given?
     calculate(:count, column_name || 1)
   end
-end
-
-ActiveRecord::FinderMethods.module_eval do
-  def second
-    order(primary_key).limit(2).offset(2).to_a.first
-  end
-
-  def third
-    order(primary_key).limit(3).offset(3).to_a.first
-  end
-
-  def fourth
-    order(primary_key).limit(4).offset(4).to_a.first
-  end
-
-  def fifth
-    order(primary_key).limit(5).offset(5).to_a.first
-  end
-end
+end

data/lib/arel/visitors/firebird.rb

@@ -1,15 +1,63 @@
-class Arel::Visitors::Firebird  < Arel::Visitors::ToSql
+class Arel::Visitors::Firebird < Arel::Visitors::ToSql
 
-private
+  private
 
-  def visit_Arel_Nodes_Limit o, collector
-    collector << "ROWS "
-    visit o.expr, collector
+  def visit_Arel_Nodes_SelectCore(o, collector, select_statement)
+    collector << 'SELECT'
+
+    visit_Arel_Nodes_SelectOptions(select_statement, collector)
+
+    collector = maybe_visit o.top, collector
+
+    collector = maybe_visit o.set_quantifier, collector
+
+    collect_nodes_for o.projections, collector, SPACE
+
+    if o.source && !o.source.empty?
+      collector << ' FROM '
+      collector = visit o.source, collector
+    end
+
+    collect_nodes_for o.wheres, collector, WHERE, AND
+    collect_nodes_for o.groups, collector, GROUP_BY
+    unless o.havings.empty?
+      collector << ' HAVING '
+      inject_join o.havings, collector, AND
+    end
+    collect_nodes_for o.windows, collector, WINDOW
+
+    collector
   end
 
-  def visit_Arel_Nodes_Offset o, collector
-    collector << "TO "
+  def visit_Arel_Nodes_SelectStatement o, collector
+    if o.with
+      collector = visit o.with, collector
+      collector << SPACE
+    end
+
+    collector = o.cores.inject(collector) { |c,x|
+      visit_Arel_Nodes_SelectCore(x, c, o)
+    }
+
+    unless o.orders.empty?
+      collector << ORDER_BY
+      len = o.orders.length - 1
+      o.orders.each_with_index { |x, i|
+        collector = visit(x, collector)
+        collector << COMMA unless len == i
+      }
+    end
+
+    collector
+  end
+
+  def visit_Arel_Nodes_Limit(o, collector)
+    collector << 'FIRST '
     visit o.expr, collector
   end
 
-end
+  def visit_Arel_Nodes_Offset(o, collector)
+    collector << 'SKIP '
+    visit o.expr, collector
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: firebird_adapter
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Fábio Rodrigues
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-14 00:00:00.000000000 Z
+date: 2019-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails