activerecord-advantage-adapter 0.1.0 → 0.1.1

data/lib/active_record/connection_adapters/advantage_adapter.rb

@@ -55,6 +55,7 @@ module ActiveRecord
       connection_string = "data source=#{config[:database]};User ID=#{config[:username]};"
       connection_string += "Password=#{config[:password]};" unless config[:options].nil?
       connection_string += "#{config[:options]};" unless config[:options].nil?
+      connection_string += "DateFormat=YYYY-MM-DD;"
 
       db = ADS.instance.api.ads_new_connection()
 
@@ -447,7 +448,7 @@ SQL
         # Nullability is returned as 0 (no nulls allowed) or 1 (nulls allowed)
         # Alos, ActiveRecord expects an autoincrement column to have default value of NULL
         def table_structure(table_name)
-          sql = "SELECT COLUMN_NAME, IIF(COLUMN_DEF = 'NULL', null, COLUMN_DEF) as COLUMN_DEF, TYPE_NAME, NULLABLE from (EXECUTE PROCEDURE sp_GetColumns( NULL, NULL, '#{table_name}', NULL )) spgc;"
+          sql = "SELECT COLUMN_NAME, IIF(COLUMN_DEF = 'NULL', null, COLUMN_DEF) as COLUMN_DEF, TYPE_NAME, NULLABLE from (EXECUTE PROCEDURE sp_GetColumns( NULL, NULL, '#{table_name}', NULL )) spgc where table_cat <> 'system';"
           structure = execute(sql, :skip_logging)
           raise(ActiveRecord::StatementInvalid, "Could not find table '#{table_name}'") if structure == false
           structure

data/lib/arel/visitors/advantage.rb

@@ -24,7 +24,8 @@ module Arel
       def visit_Arel_Nodes_SelectCore o
         [
           "#{o.projections.map { |x| visit x }.join ', '}",
-          ("FROM #{visit o.froms}" if o.froms),
+          #("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),
@@ -36,4 +37,3 @@ end
 
 Arel::Visitors::VISITORS['advantage'] = Arel::Visitors::Advantage
 
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-advantage-adapter
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-17 00:00:00.000000000 Z
+date: 2012-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: advantage
-  requirement: &22592844 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: 0.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *22592844
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &22592400 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +37,12 @@ dependencies:
         version: 3.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *22592400
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.2.0
 description: ! '    ActiveRecord driver for Advantage
 
 '
@@ -73,7 +83,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.16
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: ActiveRecord driver for Advantage