activerecord-jdbcsqlanywhere-adapter 1.0.1 → 1.1.0

data/activerecord-jdbcsqlanywhere-adapter.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
 
   s.required_rubygems_version = ">= 1.3.6"
 
-  s.add_dependency('activerecord-jdbc-adapter', "~> 1.1.1")
+  s.add_dependency('activerecord-jdbc-adapter', "~> 1.2.0")
   s.add_development_dependency "bundler", ">= 1.0.0"
 
   s.files        = `git ls-files`.split("\n") << 'lib/arjdbc/sqlanywhere/adapter_java.jar'

data/lib/activerecord-jdbcsqlanywhere-adapter.rb

@@ -1,5 +1,5 @@
 module ArJdbc
   module SybaseSQLAnywhere
-    VERSION = "1.0.1"
+    VERSION = "1.1.0"
   end
 end

data/lib/arel/visitors/sqlanywhere.rb

@@ -0,0 +1,38 @@
+module Arel
+  module Visitors
+    class SybaseSQLAnywhere < Arel::Visitors::ToSql
+
+      private
+      def visit_Arel_Nodes_SelectStatement o
+        [
+          (visit(o.with) if o.with),
+          o.cores.map { |x| visit_Arel_Nodes_SelectCore x, o.limit, o.offset }.join,
+          ("ORDER BY #{o.orders.map { |x| visit x }.join(', ')}" unless o.orders.empty?),
+          (visit(o.lock) if o.lock),
+        ].compact.join ' '
+      end
+
+      def visit_Arel_Nodes_SelectCore o, limit=nil, offset=nil
+        [
+          "SELECT",
+          (visit(o.set_quantifier) if o.set_quantifier),
+          (visit(o.top) if o.top),
+          (visit(limit) if limit),
+          (visit(offset) if offset),
+          ("#{o.projections.map { |x| visit x }.join ', '}" unless o.projections.empty?),
+          ("FROM #{visit(o.source)}" if o.source && !o.source.empty?),
+          ("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
+      
+      def visit_Arel_Nodes_Offset o
+        "START AT #{visit(o.expr).to_i+1}"
+      end
+      def visit_Arel_Nodes_Limit o
+        "TOP #{visit o.expr}"
+      end
+    end
+  end
+end

data/lib/arjdbc/sqlanywhere/adapter.rb

@@ -7,6 +7,11 @@ module ::ArJdbc
     def self.column_selector
       [/sqlanywhere/i, lambda {|cfg,col| col.extend(::ArJdbc::SybaseSQLAnywhere::Column)}]
     end
+
+    def self.arel2_visitors(config)
+      require 'arel/visitors/sqlanywhere'
+      {}.tap {|v| %w(sqlanywhere jdbcsqlanywhere).each {|x| v[x] = ::Arel::Visitors::SybaseSQLAnywhere } }
+    end
     
     module Column
       def init_column(name, default, *args)
@@ -15,6 +20,7 @@ module ::ArJdbc
 
       # Post process default value from JDBC into a Rails-friendly format (columns{-internal})
       def default_value(value)
+        return nil if value =~ /^autoincrement$/i
         # jdbc returns column default strings with actual single quotes around the value.
         return $1 if value =~ /^'(.*)'$/
 
@@ -99,8 +105,8 @@ module ::ArJdbc
     end
 
     def add_limit_offset!(sql, options)
-      if options[:limit] and options[:offset] and options[:offset] > 0
-        sql.sub!(/^\s*SELECT(\s+DISTINCT)?/i,  "SELECT\\1 TOP #{options[:limit]} START AT #{options[:offset]+1}")
+      if options[:limit] and options[:offset] and options[:offset].to_i > 0
+        sql.sub!(/^\s*SELECT(\s+DISTINCT)?/i,  "SELECT\\1 TOP #{options[:limit]} START AT #{options[:offset].to_i+1}")
       elsif sql !~ /^\s*SELECT (@@|COUNT\()/i
         sql.sub!(/^\s*SELECT(\s+DISTINCT)?/i) do
           "SELECT#{$1} TOP #{options[:limit]}"

data/test/sqlanywhere_limit_offset_test.rb

@@ -1,3 +1,4 @@
+require 'rubygems'
 require 'jdbc_common'
 require 'db/sqlanywhere'
 

data/test/sqlanywhere_simple_test.rb

@@ -1,3 +1,4 @@
+require 'rubygems'
 require 'jdbc_common'
 require 'db/sqlanywhere'
 

metadata

@@ -2,7 +2,7 @@
 name: activerecord-jdbcsqlanywhere-adapter
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors: 
   - Brian Olsen
@@ -10,7 +10,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-17 00:00:00 Z
+date: 2011-10-18 00:00:00 +02:00
+default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: activerecord-jdbc-adapter
@@ -20,7 +21,7 @@ dependencies:
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
-            version: 1.1.1
+            version: 1.2.0
     type: :runtime
     version_requirements: *id001
   - !ruby/object:Gem::Dependency 
@@ -51,6 +52,7 @@ files:
   - activerecord-jdbcsqlanywhere-adapter.gemspec
   - lib/active_record/connection_adapters/sqlanywhere_adapter.rb
   - lib/activerecord-jdbcsqlanywhere-adapter.rb
+  - lib/arel/visitors/sqlanywhere.rb
   - lib/arjdbc/discover.rb
   - lib/arjdbc/sqlanywhere.rb
   - lib/arjdbc/sqlanywhere/adapter.rb
@@ -63,6 +65,7 @@ files:
   - test/sqlanywhere_limit_offset_test.rb
   - test/sqlanywhere_simple_test.rb
   - lib/arjdbc/sqlanywhere/adapter_java.jar
+has_rdoc: true
 homepage: http://github.com/griff/activerecord-jdbcsqlanywhere-adapter
 licenses: []
 
@@ -86,7 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.5.1
 signing_key: 
 specification_version: 3
 summary: Sybase SQLAnywhere JDBC adapter for JRuby on Rails