cmoran92-activerecord-jdbc-adapter 1.2.1 → 1.2.1.1

data/activerecord-jdbc-adapter.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.summary = %q{JDBC adapter for ActiveRecord, for use within JRuby on Rails.}
   s.description = %q{activerecord-jdbc-adapter is a database adapter for Rails\' ActiveRecord
 component that can be used with JRuby[http://www.jruby.org/]. It allows use of
-virtually any JDBC-compliant database with your JRuby on Rails application. Includes patch by cmoran92 to eliminate duplicates when SELECTing DISTING with JOINS on MS SQL Server. }
+virtually any JDBC-compliant database with your JRuby on Rails application. Includes patch by cmoran92 to eliminate duplicates when SELECTing DISTINCT with JOINS on MS SQL Server. }
   s.files         = `git ls-files`.split("\n").reject {|v| v =~ /^(activerecord-jdbc[^-]|jdbc-)/}
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{|f| File.basename(f) }

data/lib/arjdbc/mssql/limit_helpers.rb

@@ -81,9 +81,14 @@ module ::ArJdbc
             end
             # We might want to add the condition that rest_of_query has at least one JOIN outside of signle quotes
             if select =~ /DISTINCT/
-              order.gsub!(/([a-z0-9_])+\./, 't.')
-              new_sql = "SELECT t.* FROM (SELECT ROW_NUMBER() OVER(#{order}) AS _row_num, t.* FROM (#{select} #{rest_of_query}"
-              new_sql << ") AS t) AS t WHERE t._row_num BETWEEN #{start_row.to_s} AND #{end_row.to_s}"
+              t_cols = rest_of_query.sub(/ FROM .*/, '').gsub(/\[?[A-Za-z0-9_]+\]?\./, 't.')
+              new_sql = "SELECT #{t_cols} FROM (
+                             SELECT ROW_NUMBER() OVER (ORDER BY (SELECT 1)) AS _row_num, #{t_cols} FROM (
+                                 SELECT DISTINCT #{t_cols} FROM (
+                                     SELECT ROW_NUMBER() OVER(#{order}) AS _row_num, #{rest_of_query}
+                                 ) AS t
+                             ) AS t
+                         ) AS t WHERE t._row_num BETWEEN #{start_row.to_s} AND #{end_row.to_s}"
             else
               new_sql = "#{select} t.* FROM (SELECT ROW_NUMBER() OVER(#{order}) AS _row_num, #{rest_of_query}"
               new_sql << ") AS t WHERE t._row_num BETWEEN #{start_row.to_s} AND #{end_row.to_s}"

data/lib/arjdbc/version.rb

@@ -1,6 +1,6 @@
 module ArJdbc
   module Version
-    VERSION = "1.2.1"
+    VERSION = "1.2.1.1"
   end
 end
 # Compatibility with older versions of ar-jdbc for other extensions out there

metadata

@@ -2,7 +2,7 @@
 name: cmoran92-activerecord-jdbc-adapter
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.2.1
+  version: 1.2.1.1
 platform: ruby
 authors: 
   - Nick Sieger, Ola Bini and JRuby contributors
@@ -10,12 +10,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-25 00:00:00 Z
+date: 2012-04-20 00:00:00 -04:00
+default_executable: 
 dependencies: []
 
 description: "activerecord-jdbc-adapter is a database adapter for Rails\\' ActiveRecord\n\
   component that can be used with JRuby[http://www.jruby.org/]. It allows use of\n\
-  virtually any JDBC-compliant database with your JRuby on Rails application. Includes patch by cmoran92 to eliminate duplicates when SELECTing DISTING with JOINS on MS SQL Server. "
+  virtually any JDBC-compliant database with your JRuby on Rails application. Includes patch by cmoran92 to eliminate duplicates when SELECTing DISTINCT with JOINS on MS SQL Server. "
 email: nick@nicksieger.com, ola.bini@gmail.com
 executables: []
 
@@ -226,6 +227,7 @@ files:
   - test/simple.rb
   - test/sqlite3_simple_test.rb
   - test/sybase_jtds_simple_test.rb
+has_rdoc: true
 homepage: https://github.com/jruby/activerecord-jdbc-adapter
 licenses: []
 
@@ -253,9 +255,78 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: jruby-extras
-rubygems_version: 1.8.15
+rubygems_version: 1.5.1
 signing_key: 
 specification_version: 3
 summary: JDBC adapter for ActiveRecord, for use within JRuby on Rails.
-test_files: []
-
+test_files: 
+  - test/abstract_db_create.rb
+  - test/activerecord/connection_adapters/type_conversion_test.rb
+  - test/activerecord/connections/native_jdbc_mysql/connection.rb
+  - test/activerecord/jall.sh
+  - test/activerecord/jtest.sh
+  - test/db/db2.rb
+  - test/db/derby.rb
+  - test/db/h2.rb
+  - test/db/hsqldb.rb
+  - test/db/informix.rb
+  - test/db/jdbc.rb
+  - test/db/jndi_config.rb
+  - test/db/logger.rb
+  - test/db/mssql.rb
+  - test/db/mysql.rb
+  - test/db/oracle.rb
+  - test/db/postgres.rb
+  - test/db/sqlite3.rb
+  - test/db2_simple_test.rb
+  - test/derby_migration_test.rb
+  - test/derby_multibyte_test.rb
+  - test/derby_simple_test.rb
+  - test/generic_jdbc_connection_test.rb
+  - test/h2_change_column_test.rb
+  - test/h2_simple_test.rb
+  - test/has_many_through.rb
+  - test/helper.rb
+  - test/hsqldb_simple_test.rb
+  - test/informix_simple_test.rb
+  - test/jdbc_common.rb
+  - test/jndi_callbacks_test.rb
+  - test/jndi_test.rb
+  - test/manualTestDatabase.rb
+  - test/models/add_not_null_column_to_table.rb
+  - test/models/auto_id.rb
+  - test/models/data_types.rb
+  - test/models/entry.rb
+  - test/models/mixed_case.rb
+  - test/models/reserved_word.rb
+  - test/models/string_id.rb
+  - test/models/thing.rb
+  - test/models/validates_uniqueness_of_string.rb
+  - test/mssql_db_create_test.rb
+  - test/mssql_identity_insert_test.rb
+  - test/mssql_legacy_types_test.rb
+  - test/mssql_limit_offset_test.rb
+  - test/mssql_multibyte_test.rb
+  - test/mssql_simple_test.rb
+  - test/mysql_db_create_test.rb
+  - test/mysql_index_length_test.rb
+  - test/mysql_info_test.rb
+  - test/mysql_multibyte_test.rb
+  - test/mysql_nonstandard_primary_key_test.rb
+  - test/mysql_simple_test.rb
+  - test/oracle_simple_test.rb
+  - test/oracle_specific_test.rb
+  - test/postgres_db_create_test.rb
+  - test/postgres_drop_db_test.rb
+  - test/postgres_information_schema_leak_test.rb
+  - test/postgres_mixed_case_test.rb
+  - test/postgres_native_type_mapping_test.rb
+  - test/postgres_nonseq_pkey_test.rb
+  - test/postgres_reserved_test.rb
+  - test/postgres_schema_search_path_test.rb
+  - test/postgres_simple_test.rb
+  - test/postgres_table_alias_length_test.rb
+  - test/postgres_type_conversion_test.rb
+  - test/simple.rb
+  - test/sqlite3_simple_test.rb
+  - test/sybase_jtds_simple_test.rb