activerecord-jdbc-adapter 1.2.8 → 1.2.9

metadata

@@ -2,7 +2,7 @@
 name: activerecord-jdbc-adapter
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.2.8
+  version: 1.2.9
 platform: ruby
 authors: 
   - Nick Sieger, Ola Bini and JRuby contributors
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-03-13 00:00:00 Z
+date: 2013-03-20 00:00:00 Z
 dependencies: []
 
 description: |-
@@ -127,7 +127,8 @@ files:
   - lib/arjdbc/mssql/connection_methods.rb
   - lib/arjdbc/mssql/limit_helpers.rb
   - lib/arjdbc/mssql/lock_helpers.rb
-  - lib/arjdbc/mssql/tsql_helper.rb
+  - lib/arjdbc/mssql/tsql_methods.rb
+  - lib/arjdbc/mssql/utils.rb
   - lib/arjdbc/mysql.rb
   - lib/arjdbc/mysql/adapter.rb
   - lib/arjdbc/mysql/connection_methods.rb
@@ -172,6 +173,8 @@ files:
   - src/java/arjdbc/jdbc/JdbcConnectionFactory.java
   - src/java/arjdbc/jdbc/RubyJdbcConnection.java
   - src/java/arjdbc/jdbc/SQLBlock.java
+  - src/java/arjdbc/mssql/MSSQLModule.java
+  - src/java/arjdbc/mssql/MSSQLRubyJdbcConnection.java
   - src/java/arjdbc/mssql/MssqlRubyJdbcConnection.java
   - src/java/arjdbc/mysql/MySQLModule.java
   - src/java/arjdbc/mysql/MySQLRubyJdbcConnection.java
@@ -253,6 +256,7 @@ files:
   - test/models/thing.rb
   - test/models/topic.rb
   - test/models/validates_uniqueness_of_string.rb
+  - test/mssql_binary_test.rb
   - test/mssql_db_create_test.rb
   - test/mssql_identity_insert_test.rb
   - test/mssql_ignore_system_views_test.rb
@@ -261,10 +265,10 @@ files:
   - test/mssql_multibyte_test.rb
   - test/mssql_null_test.rb
   - test/mssql_reset_column_information_test.rb
-  - test/mssql_row_locking_sql_test.rb
   - test/mssql_row_locking_test.rb
   - test/mssql_serialize_test.rb
   - test/mssql_simple_test.rb
+  - test/mssql_test.rb
   - test/mysql_binary_test.rb
   - test/mysql_db_create_test.rb
   - test/mysql_index_length_test.rb
@@ -302,6 +306,7 @@ files:
   - test/serialize.rb
   - test/simple.rb
   - test/sqlite3_reset_column_information_test.rb
+  - test/sqlite3_schema_dump_test.rb
   - test/sqlite3_serialize_test.rb
   - test/sqlite3_simple_test.rb
   - test/sqlite3_type_conversion_test.rb

data/lib/arjdbc/mssql/tsql_helper.rb

@@ -1,53 +0,0 @@
-# Common methods for handling TSQL databases.
-module TSqlMethods
-
-  def type_to_sql(type, limit = nil, precision = nil, scale = nil) #:nodoc:
-    limit = nil if %w(text binary).include? type.to_s
-    return 'uniqueidentifier' if (type.to_s == 'uniqueidentifier')
-    return super unless type.to_s == 'integer'
-
-    if limit.nil? || limit == 4
-      'int'
-    elsif limit == 2
-      'smallint'
-    elsif limit == 1
-      'tinyint'
-    else
-      'bigint'
-    end
-  end
-
-  def add_limit_offset!(sql, options)
-    if options[:limit] and options[:offset]
-      total_rows = select_all("SELECT count(*) as TotalRows from (#{sql.gsub(/\bSELECT(\s+DISTINCT)?\b/i, "SELECT\\1 TOP 1000000000")}) tally")[0]["TotalRows"].to_i
-      if (options[:limit] + options[:offset]) >= total_rows
-        options[:limit] = (total_rows - options[:offset] >= 0) ? (total_rows - options[:offset]) : 0
-      end
-      sql.sub!(/^\s*SELECT(\s+DISTINCT)?/i, "SELECT * FROM (SELECT TOP #{options[:limit]} * FROM (SELECT\\1 TOP #{options[:limit] + options[:offset]} ")
-      sql << ") AS tmp1"
-      if options[:order]
-        options[:order] = options[:order].split(',').map do |field|
-          parts = field.split(" ")
-          tc = parts[0]
-          if sql =~ /\.\[/ and tc =~ /\./ # if column quoting used in query
-            tc.gsub!(/\./, '\\.\\[')
-            tc << '\\]'
-          end
-          if sql =~ /#{tc} AS (t\d_r\d\d?)/
-              parts[0] = $1
-          elsif parts[0] =~ /\w+\.(\w+)/
-            parts[0] = $1
-          end
-          parts.join(' ')
-        end.join(', ')
-        sql << " ORDER BY #{change_order_direction(options[:order])}) AS tmp2 ORDER BY #{options[:order]}"
-      else
-        sql << " ) AS tmp2"
-      end
-    elsif sql !~ /^\s*SELECT (@@|COUNT\()/i
-      sql.sub!(/^\s*SELECT(\s+DISTINCT)?/i) do
-        "SELECT#{$1} TOP #{options[:limit]}"
-      end unless options[:limit].nil?
-    end
-  end
-end