activerecord-advantage-adapter 0.1.1 → 0.1.2

data/lib/arel/visitors/advantage.rb

@@ -1,39 +1,88 @@
-module Arel
-  module Visitors
-    class Advantage < Arel::Visitors::ToSql
-      private
-
-      def visit_Arel_Nodes_Offset o
-        "START AT #{visit(o.expr) + 1}"
-      end
-
-      def visit_Arel_Nodes_Limit(o)
-        "TOP #{visit o.expr}"
-      end
-
-      def visit_Arel_Nodes_SelectStatement(o)
-          [
-          "SELECT",
-          (visit(o.limit) if o.limit),
-          (visit(o.offset) if o.offset),
-          o.cores.map { |x| visit_Arel_Nodes_SelectCore x }.join,
-          ("ORDER BY #{o.orders.map { |x| visit x }.join(', ')}" unless o.orders.empty?),
-          ].compact.join ' '
-      end
-
-      def visit_Arel_Nodes_SelectCore o
-        [
-          "#{o.projections.map { |x| visit x }.join ', '}",
-          #("FROM #{visit o.froms}" if o.froms),
-          ("FROM #{visit o.source}" if o.source),
-          ("WHERE #{o.wheres.map { |x| visit x }.join ' AND ' }" unless o.wheres.empty?),
-          ("GROUP BY #{o.groups.map { |x| visit x }.join ', ' }" unless o.groups.empty?),
-          (visit(o.having) if o.having),
-        ].compact.join ' '
-      end
-    end
-  end
-end
-
-Arel::Visitors::VISITORS['advantage'] = Arel::Visitors::Advantage
-
+module Arel
+  module Visitors
+    class Advantage < Arel::Visitors::ToSql
+      private
+
+      if Rails::VERSION::MAJOR >= 4
+        # Rails 4 or above
+        def visit_Arel_Nodes_Offset(o, collector)
+          collector << "START AT "
+          visit (o.expr + 1), collector
+          collector << " "
+          collector
+        end
+
+        def visit_Arel_Nodes_Limit(o, collector)
+          collector << "TOP  "
+          visit o.expr, collector
+          collector << " "
+          collector
+        end
+
+        # copied from informix.rb
+        def visit_Arel_Nodes_SelectStatement(o, collector)
+          collector << "SELECT "
+          collector = maybe_visit o.limit, collector
+          collector = maybe_visit o.offset, collector
+          collector = o.cores.inject(collector) { |c, x|
+            visit_Arel_Nodes_SelectCore x, c
+          }
+          if o.orders.any?
+            collector << "ORDER BY "
+            collector = inject_join o.orders, collector, ", "
+          end
+          collector
+        end
+
+        def visit_Arel_Nodes_SelectCore(o, collector)
+          collector = inject_join o.projections, collector, ", "
+          if o.source && !o.source.empty?
+            collector << " FROM "
+            collector = visit o.source, collector
+          end
+
+          if o.wheres.any?
+            collector << " WHERE "
+            collector = inject_join o.wheres, collector, " AND "
+          end
+
+          if o.groups.any?
+            collector << "GROUP BY "
+            collector = inject_join o.groups, collector, ", "
+          end
+
+          collector
+        end
+      else
+        # Rails 3 or lower
+        def visit_Arel_Nodes_Offset(o)
+          "START AT #{visit(o.expr) + 1}"
+        end
+
+        def visit_Arel_Nodes_Limit(o)
+          "TOP #{visit o.expr}"
+        end
+
+        def visit_Arel_Nodes_SelectStatement(o)
+          [
+            "SELECT",
+            (visit(o.limit) if o.limit),
+            (visit(o.offset) if o.offset),
+            o.cores.map { |x| visit_Arel_Nodes_SelectCore x }.join,
+            ("ORDER BY #{o.orders.map { |x| visit x }.join(", ")}" unless o.orders.empty?),
+          ].compact.join " "
+        end
+
+        def visit_Arel_Nodes_SelectCore(o)
+          [
+            "#{o.projections.map { |x| visit x }.join ", "}",
+            ("FROM #{visit o.source}" if o.source),
+            ("WHERE #{o.wheres.map { |x| visit x }.join " AND "}" unless o.wheres.empty?),
+            ("GROUP BY #{o.groups.map { |x| visit x }.join ", "}" unless o.groups.empty?),
+            (visit(o.having) if o.having),
+          ].compact.join " "
+        end
+      end
+    end
+  end
+end

data/test/connection.rb

@@ -1,23 +1,23 @@
-print "Using native Advantage Interface\n"
-require_dependency 'models/course'
-require 'logger'
-
-ActiveRecord::Base.logger = Logger.new("debug.log")
-
-ActiveRecord::Base.configurations = {
-  'arunit' => {
-    :adapter  => 'advantage',
-    :database => 'c:/test/arunit.add',
-    :username => 'adssys',
-    :password => 
-  },
-  'arunit2' => {
-    :adapter  => 'advantage',
-    :database => 'c:/test/arunit2.add',
-    :username => 'adssys',
-    :password => 
-  }
-}
-
-ActiveRecord::Base.establish_connection 'arunit'
-Course.establish_connection 'arunit2'
+print "Using native Advantage Interface\n"
+require_dependency 'models/course'
+require 'logger'
+
+ActiveRecord::Base.logger = Logger.new("debug.log")
+
+ActiveRecord::Base.configurations = {
+  'arunit' => {
+    :adapter  => 'advantage',
+    :database => 'c:/test/arunit.add',
+    :username => 'adssys',
+    :password => 
+  },
+  'arunit2' => {
+    :adapter  => 'advantage',
+    :database => 'c:/test/arunit2.add',
+    :username => 'adssys',
+    :password => 
+  }
+}
+
+ActiveRecord::Base.establish_connection 'arunit'
+Course.establish_connection 'arunit2'

metadata

@@ -1,90 +1,117 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-advantage-adapter
 version: !ruby/object:Gem::Version
-  version: 0.1.1
-  prerelease: 
+  version: 0.1.2
 platform: ruby
 authors:
 - Edgar Sherman
+- Jon Adams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-19 00:00:00.000000000 Z
+date: 2020-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: advantage
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
-  type: :runtime
+        version: '1.17'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: '1.17'
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: advantage
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
-description: ! '    ActiveRecord driver for Advantage
-
-'
-email: advantage@sybase.com
+        version: 0.1.2
+description: ActiveRecord driver for the Advantage Database connector
+email:
+- advantage@sybase.com
+- t12nslookup@googlemail.com
 executables: []
 extensions: []
-extra_rdoc_files:
-- README
-- LICENSE
+extra_rdoc_files: []
 files:
+- LICENSE
+- README
+- activerecord-advantage-adapter.gemspec
 - lib/active_record/connection_adapters/advantage_adapter.rb
 - lib/arel/visitors/advantage.rb
 - test/connection.rb
-- README
-- LICENSE
 homepage: http://devzone.advantagedatabase.com
-licenses: []
+licenses:
+- Apache-2.0
+metadata:
+  allowed_push_host: https://rubygems.org
+  homepage_uri: http://devzone.advantagedatabase.com
+  source_code_uri: https://github.com/t12nslookup/activerecord-advantage-adapter/
+  changelog_uri: https://github.com/t12nslookup/activerecord-advantage-adapter/blob/master/CHANGELOG.md
 post_install_message: 
-rdoc_options:
-- --title
-- ActiveRecord Driver for Advantage
-- --main
-- README
-- --line-numbers
+rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 3.1.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: ActiveRecord driver for Advantage
 test_files: []