activerecord-jdbc-adapter 0.9.6-java → 0.9.7-java

data/History.txt

@@ -1,3 +1,15 @@
+== 0.9.7
+
+- JRUBY-4781: Fix multiple database connection collision issue w/
+  Oracle
+- ACTIVERECORD_JDBC-115: Support SAVEPOINTS for MySQL and PG so that
+  nested transactions can be faked
+- ACTIVERECORD_JDBC-116: Handle schema.table better for MySQL (thanks
+  Dilshod Mukhtarov)
+- Fix 'Wrong # of arguments (2 for 1)' issue with #create_database for
+  MySQL and AR 3.0
+- SQLServer 2000 support (thanks Jay McGaffigan)
+
 == 0.9.6
 
 - The Oracle release!

data/lib/active_record/connection_adapters/jdbc_adapter.rb

@@ -74,7 +74,9 @@ module JdbcSpec
           alias :#{meth}_pre_pk :#{meth}
           def #{meth}(include_primary_key = true, *args) #:nodoc:
             aq = #{meth}_pre_pk(include_primary_key, *args)
-            aq[#{pk_hash_key}] = #{pk_hash_value} if include_primary_key && aq[#{pk_hash_key}].nil?
+            if connection.is_a?(JdbcSpec::Oracle) || connection.is_a?(JdbcSpec::Mimer)
+              aq[#{pk_hash_key}] = #{pk_hash_value} if include_primary_key && aq[#{pk_hash_key}].nil?
+            end
             aq
           end
         }

data/lib/jdbc_adapter/jdbc_mssql.rb

@@ -16,7 +16,7 @@ module ::JdbcSpec
   end
 
   module MsSQL
-    
+
     include TSqlMethods
 
     def self.extended(mod)
@@ -36,6 +36,7 @@ module ::JdbcSpec
         ActiveRecord::Base.after_save :after_save_with_mssql_lob
         @lob_callback_added = true
       end
+      mod.add_version_specific_add_limit_offset
     end
 
     def self.adapter_matcher(name, *)
@@ -50,15 +51,30 @@ module ::JdbcSpec
       ::ActiveRecord::ConnectionAdapters::MssqlJdbcConnection
     end
 
+    def sqlserver_version
+      @sqlserver_version ||= select_value("select @@version")[/Microsoft SQL Server\s+(\d{4})/, 1]
+    end
+
+    def add_version_specific_add_limit_offset
+      if sqlserver_version == "2000"
+        extend SqlServer2000LimitOffset
+      else
+        extend SqlServerLimitOffset
+      end
+    end
+
     def modify_types(tp) #:nodoc:
       super(tp)
       tp[:string] = {:name => "NVARCHAR", :limit => 255}
-      tp[:text]   = {:name => "NVARCHAR(MAX)"}
+      if sqlserver_version == "2000"
+        tp[:text] = {:name => "NTEXT"}
+      else
+        tp[:text] = {:name => "NVARCHAR(MAX)"}
+      end
       tp
     end
-      
+
     module Column
-      
       attr_accessor :identity, :is_special
 
       def simplified_type(field_type)
@@ -82,7 +98,7 @@ module ::JdbcSpec
         return $1 if value =~ /^\(N?'(.*)'\)$/
         value
       end
-      
+
       def type_cast(value)
         return nil if value.nil? || value == "(null)" || value == "(NULL)"
         case type
@@ -97,7 +113,7 @@ module ::JdbcSpec
         when :binary    then unquote value
         else value
         end
-        
+
       end
 
       def is_utf8?
@@ -139,7 +155,7 @@ module ::JdbcSpec
       def self.string_to_binary(value)
         ''
       end
-      
+
     end
 
     def quote(value, column = nil)
@@ -184,19 +200,52 @@ module ::JdbcSpec
       quote false
     end
 
-    def add_limit_offset!(sql, options)
-      limit = options[:limit]
-      if limit
-        offset = (options[:offset] || 0).to_i
-        start_row = offset + 1
-        end_row = offset + limit.to_i
-        order = (options[:order] || determine_order_clause(sql))
-        sql.sub!(/ ORDER BY.*$/i, '')
-        find_select = /\b(SELECT(?:\s+DISTINCT)?)\b(.*)/i
-        whole, select, rest_of_query = find_select.match(sql).to_a
-        new_sql = "#{select} t.* FROM (SELECT ROW_NUMBER() OVER(ORDER BY #{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}"
-        sql.replace(new_sql)
+    module SqlServer2000LimitOffset
+      def add_limit_offset!(sql, options)
+        limit = options[:limit]
+        if limit
+          offset = (options[:offset] || 0).to_i
+          start_row = offset + 1
+          end_row = offset + limit.to_i
+          order = (options[:order] || determine_order_clause(sql))
+          sql.sub!(/ ORDER BY.*$/i, '')
+          find_select = /\b(SELECT(?:\s+DISTINCT)?)\b(.*)/i
+          whole, select, rest_of_query = find_select.match(sql).to_a
+          if (start_row == 1) && (end_row ==1)
+            new_sql = "#{select} TOP 1 #{rest_of_query}"
+            sql.replace(new_sql)
+          else
+            #UGLY
+            #KLUDGY?
+            #removing out stuff before the FROM...
+            rest = rest_of_query[/FROM/i=~ rest_of_query.. -1]
+            #need the table name for avoiding amiguity
+            table_name = get_table_name(sql)
+            #I am not sure this will cover all bases.  but all the tests pass
+            new_order = "#{order}, #{table_name}.id" if order.index("#{table_name}.id").nil?
+            new_order ||= order
+            new_sql = "#{select} TOP #{limit} #{rest_of_query} WHERE #{table_name}.id NOT IN (#{select} TOP #{offset} #{table_name}.id #{rest} ORDER BY #{new_order}) ORDER BY #{order} "
+            sql.replace(new_sql)
+          end
+        end
+      end
+    end
+
+    module SqlServerLimitOffset
+      def add_limit_offset!(sql, options)
+        limit = options[:limit]
+        if limit
+          offset = (options[:offset] || 0).to_i
+          start_row = offset + 1
+          end_row = offset + limit.to_i
+          order = (options[:order] || determine_order_clause(sql))
+          sql.sub!(/ ORDER BY.*$/i, '')
+          find_select = /\b(SELECT(?:\s+DISTINCT)?)\b(.*)/i
+          whole, select, rest_of_query = find_select.match(sql).to_a
+          new_sql = "#{select} t.* FROM (SELECT ROW_NUMBER() OVER(ORDER BY #{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}"
+          sql.replace(new_sql)
+        end
       end
     end
 
@@ -251,7 +300,7 @@ module ::JdbcSpec
       change_column_type(table_name, column_name, type, options)
       change_column_default(table_name, column_name, options[:default]) if options_include_default?(options)
     end
-    
+
     def change_column_type(table_name, column_name, type, options = {}) #:nodoc:
       sql = "ALTER TABLE #{table_name} ALTER COLUMN #{quote_column_name(column_name)} #{type_to_sql(type, options[:limit], options[:precision], options[:scale])}"
       if options.has_key?(:null)
@@ -259,14 +308,14 @@ module ::JdbcSpec
       end
       execute(sql)
     end
-    
+
     def change_column_default(table_name, column_name, default) #:nodoc:
       remove_default_constraint(table_name, column_name)
       unless default.nil?
         execute "ALTER TABLE #{table_name} ADD CONSTRAINT DF_#{table_name}_#{column_name} DEFAULT #{quote(default)} FOR #{quote_column_name(column_name)}"
       end
     end
-    
+
     def remove_column(table_name, column_name)
       remove_check_constraints(table_name, column_name)
       remove_default_constraint(table_name, column_name)
@@ -400,20 +449,20 @@ module ::JdbcSpec
       end
       sql
     end
-        
+
     def determine_order_clause(sql)
       return $1 if sql =~ /ORDER BY (.*)$/
       sql =~ /FROM +(\w+?)\b/ || raise("can't determine table name")
-      table_name = $1 
-      "#{table_name}.#{determine_primary_key(table_name)}" 
+      table_name = $1
+      "#{table_name}.#{determine_primary_key(table_name)}"
     end
 
     def determine_primary_key(table_name)
       primary_key = columns(table_name).detect { |column| column.primary || column.identity }
       primary_key ? primary_key.name : "id"
     end
-    
+
   end
-  
+
 end
 

data/lib/jdbc_adapter/jdbc_mysql.rb

@@ -118,6 +118,22 @@ module ::JdbcSpec
       # Transactions aren't supported
     end
 
+    def supports_savepoints? #:nodoc:
+      true
+    end
+
+    def create_savepoint
+      execute("SAVEPOINT #{current_savepoint_name}")
+    end
+
+    def rollback_to_savepoint
+      execute("ROLLBACK TO SAVEPOINT #{current_savepoint_name}")
+    end
+
+    def release_savepoint
+      execute("RELEASE SAVEPOINT #{current_savepoint_name}")
+    end
+
     def disable_referential_integrity(&block) #:nodoc:
       old = select_value("SELECT @@FOREIGN_KEY_CHECKS")
       begin
@@ -150,9 +166,9 @@ module ::JdbcSpec
       end
     end
 
-    def recreate_database(name) #:nodoc:
+    def recreate_database(name, options = {}) #:nodoc:
       drop_database(name)
-      create_database(name)
+      create_database(name, options)
     end
 
     def character_set(options) #:nodoc:

data/lib/jdbc_adapter/jdbc_postgre.rb

@@ -144,6 +144,18 @@ module ::JdbcSpec
       true
     end
 
+    def create_savepoint
+      execute("SAVEPOINT #{current_savepoint_name}")
+    end
+
+    def rollback_to_savepoint
+      execute("ROLLBACK TO SAVEPOINT #{current_savepoint_name}")
+    end
+
+    def release_savepoint
+      execute("RELEASE SAVEPOINT #{current_savepoint_name}")
+    end
+
     # Returns the configured supported identifier length supported by PostgreSQL,
     # or report the default of 63 on PostgreSQL 7.x.
     def table_alias_length

data/lib/jdbc_adapter/version.rb

@@ -1,5 +1,5 @@
 module JdbcAdapter
   module Version
-    VERSION = "0.9.6"
+    VERSION = "0.9.7"
   end
 end

data/rakelib/package.rake

@@ -24,7 +24,6 @@ begin
     p.changes = p.paragraphs_of('History.txt', 0..1).join("\n\n")
     p.description = p.paragraphs_of('README.txt', 0...1).join("\n\n")
   end
-  hoe.spec.dependencies.delete_if { |dep| dep.name == "hoe" }
   task :gemspec do
     File.open("#{hoe.name}.gemspec", "w") {|f| f << hoe.spec.to_ruby }
   end

data/src/java/jdbc_adapter/RubyJdbcConnection.java

@@ -135,15 +135,18 @@ public class RubyJdbcConnection extends RubyObject {
                     if (schemaName != null) schemaName = caseConvertIdentifierForJdbc(metadata, schemaName);
                     table_name = caseConvertIdentifierForJdbc(metadata, table_name);
 
+                    String catalog = c.getCatalog();
+                    if (schemaName != null) { catalog = schemaName; }
+
                     String[] tableTypes = new String[]{"TABLE","VIEW","SYNONYM"};
                     RubyArray matchingTables = (RubyArray) tableLookupBlock(context.getRuntime(),
-                            c.getCatalog(), schemaName, table_name, tableTypes, false).call(c);
+                            catalog, schemaName, table_name, tableTypes, false).call(c);
                     if (matchingTables.isEmpty()) {
                         throw new SQLException("Table " + table_name + " does not exist");
                     }
 
-                    results = metadata.getColumns(c.getCatalog(),schemaName,table_name,null);
-                    pkeys = metadata.getPrimaryKeys(c.getCatalog(),schemaName,table_name);
+                    results = metadata.getColumns(catalog,schemaName,table_name,null);
+                    pkeys = metadata.getPrimaryKeys(catalog,schemaName,table_name);
                     return unmarshal_columns(context, metadata, results, pkeys);
                 } finally {
                     close(results);

data/test/mssql_db_create_test.rb

@@ -7,7 +7,7 @@ class MysqlDbCreateTest < Test::Unit::TestCase
   def db_config
     MSSQL_CONFIG
   end
-
+  
   def test_rake_db_create
     begin
       Rake::Task["db:create"].invoke
@@ -18,7 +18,9 @@ class MysqlDbCreateTest < Test::Unit::TestCase
       end
     end
     ActiveRecord::Base.establish_connection(db_config.merge(:database => "master"))
-    databases = ActiveRecord::Base.connection.select_rows("SELECT NAME FROM sys.sysdatabases").flatten
+    select = "SELECT NAME FROM sys.sysdatabases"
+    select = "SELECT name FROM master..sysdatabases ORDER BY name" if ActiveRecord::Base.connection.sqlserver_version == "2000"
+    databases = ActiveRecord::Base.connection.select_rows(select).flatten
     assert databases.include?(@db_name)
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
     - 0
     - 9
-    - 6
-  version: 0.9.6
+    - 7
+  version: 0.9.7
 platform: java
 authors: 
   - Nick Sieger, Ola Bini and JRuby contributors
@@ -14,10 +14,24 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-05 00:00:00 -05:00
+date: 2010-05-25 00:00:00 -05:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+  - !ruby/object:Gem::Dependency 
+    name: hoe
+    prerelease: false
+    requirement: &id001 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            segments: 
+              - 2
+              - 3
+              - 3
+            version: 2.3.3
+    type: :development
+    version_requirements: *id001
 description: |-
   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
@@ -178,6 +192,7 @@ rdoc_options:
 require_paths: 
   - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -185,6 +200,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
           - 0
         version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -194,7 +210,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: jruby-extras
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: JDBC adapter for ActiveRecord, for use within JRuby on Rails.