activerecord-jdbc-adapter 1.3.0.beta1 → 1.3.0.beta2

data/lib/arjdbc/db2/as400.rb

@@ -0,0 +1,124 @@
+require 'arjdbc/db2/adapter'
+
+module ArJdbc
+  module AS400
+    include DB2
+    
+    def self.extended(base); DB2.extended(base); end
+    
+    def self.column_selector
+      [ /as400/i, lambda { |cfg, column| column.extend(::ArJdbc::AS400::Column) } ]
+    end
+
+    def self.jdbc_connection_class; DB2.jdbc_connection_class; end
+
+    def self.arel2_visitors(config)
+      visitors = DB2.arel2_visitors(config).dup
+      visitors['as400'] = ::Arel::Visitors::DB2
+      visitors
+    end
+
+    ADAPTER_NAME = 'AS400'.freeze
+    
+    def adapter_name
+      ADAPTER_NAME
+    end
+
+    # @override
+    def prefetch_primary_key?(table_name = nil)
+      # TRUE if the table has no identity column
+      names = table_name.upcase.split(".")
+      sql = "SELECT 1 FROM SYSIBM.SQLPRIMARYKEYS WHERE "
+      sql << "TABLE_SCHEM = '#{names.first}' AND " if names.size == 2
+      sql << "TABLE_NAME = '#{names.last}'"
+      select_one(sql).nil?
+    end
+
+    # @override
+    def rename_column(table_name, column_name, new_column_name) # :nodoc:
+      raise NotImplementedError, "rename_column is not supported on IBM iSeries"
+    end
+
+    # @override
+    def execute_table_change(sql, table_name, name = nil)
+      execute_and_auto_confirm(sql, name)
+    end
+    
+    # holy moly batman! all this to tell AS400 "yes i am sure"
+    def execute_and_auto_confirm(sql, name = nil)
+
+      begin
+        @connection.execute_update "call qsys.qcmdexc('QSYS/CHGJOB INQMSGRPY(*SYSRPYL)',0000000031.00000)"
+        @connection.execute_update "call qsys.qcmdexc('ADDRPYLE SEQNBR(9876) MSGID(CPA32B2) RPY(''I'')',0000000045.00000)"
+      rescue Exception => e
+        raise "Could not call CHGJOB INQMSGRPY(*SYSRPYL) and ADDRPYLE SEQNBR(9876) MSGID(CPA32B2) RPY('I').\n" +
+              "Do you have authority to do this?\n\n#{e.inspect}"
+      end
+
+      begin
+        result = execute(sql, name)
+      rescue Exception
+        raise
+      else
+        # Return if all work fine
+        result
+      ensure
+
+        # Ensure default configuration restoration
+        begin
+          @connection.execute_update "call qsys.qcmdexc('QSYS/CHGJOB INQMSGRPY(*DFT)',0000000027.00000)"
+          @connection.execute_update "call qsys.qcmdexc('RMVRPYLE SEQNBR(9876)',0000000021.00000)"
+        rescue Exception => e
+          raise "Could not call CHGJOB INQMSGRPY(*DFT) and RMVRPYLE SEQNBR(9876).\n" +
+                    "Do you have authority to do this?\n\n#{e.inspect}"
+        end
+
+      end
+    end
+    private :execute_and_auto_confirm
+
+    # disable all schemas browsing when default schema is specified
+    def table_exists?(name)
+      schema ?
+        @connection.table_exists?(name, schema) :
+          @connection.table_exists?(name)
+    end
+    
+    DRIVER_NAME = 'com.ibm.as400.access.AS400JDBCDriver'.freeze
+    
+    # @deprecated no longer used
+    def as400?
+      true
+    end
+
+    private
+    
+    # @override
+    def db2_schema
+      @db2_schema = false unless defined? @db2_schema
+      return @db2_schema if @db2_schema != false
+      @db2_schema = 
+        if config[:schema].present?
+          config[:schema]
+        elsif config[:jndi].present?
+          # Only found method to set db2_schema from jndi
+          result = select_one("SELECT CURRENT_SCHEMA FROM SYSIBM.SYSDUMMY1")
+          schema = result['00001']
+          # If the connection uses the library list schema name will be nil
+          if schema == '*LIBL'
+            schema = nil
+          end
+          schema
+        else
+          # AS400 implementation takes schema from library name (last part of URL)
+          # jdbc:as400://localhost/schema;naming=system;libraries=lib1,lib2
+          schema = nil
+          split = config[:url].split('/')
+          # Return nil if schema isn't defined
+          schema = split.last.split(';').first.strip if split.size == 4
+          schema
+        end
+    end
+    
+  end
+end

data/lib/arjdbc/db2/connection_methods.rb

@@ -9,9 +9,28 @@ ArJdbc::ConnectionMethods.module_eval do
       end
     end
     config[:driver] ||= ::ArJdbc::DB2::DRIVER_NAME
-    config[:adapter_spec] = ::ArJdbc::DB2
+    config[:adapter_spec] ||= ::ArJdbc::DB2
     config[:connection_alive_sql] ||= 'SELECT 1 FROM syscat.tables FETCH FIRST 1 ROWS ONLY'
     jdbc_connection(config)
   end
   alias_method :jdbcdb2_connection, :db2_connection
+
+  def as400_connection(config)
+    config[:url] ||= begin
+      # jdbc:as400://[host]
+      url = 'jdbc:as400://'
+      url << config[:host] if config[:host]
+      # jdbc:as400://myiSeries;database name=IASP1
+      url << ";database name=#{config[:database]}" if config[:database]
+      # jdbc:as400://[host];proxy server=HODServerName:proxyServerPort
+      url << ";proxy server=#{config[:proxy]}" if config[:proxy]
+      url
+    end
+    require 'arjdbc/db2/as400'
+    config[:driver] ||= ::ArJdbc::AS400::DRIVER_NAME
+    config[:adapter_spec] ||= ::ArJdbc::AS400
+    config[:connection_alive_sql] ||= 'SELECT 1 FROM sysibm.tables FETCH FIRST 1 ROWS ONLY'
+    jdbc_connection(config)
+  end
+  alias_method :jdbcas400_connection, :as400_connection
 end

data/lib/arjdbc/derby/adapter.rb

@@ -1,3 +1,4 @@
+ArJdbc.load_java_part :Derby
 require 'arjdbc/jdbc/missing_functionality_helper'
 
 module ArJdbc
@@ -5,10 +6,9 @@ module ArJdbc
 
     def self.extended(adapter)
       require 'arjdbc/derby/active_record_patch'
-      adapter.configure_connection
     end
 
-    def self.included(*args)
+    def self.included(base)
       require 'arjdbc/derby/active_record_patch'
     end
 
@@ -160,6 +160,10 @@ module ArJdbc
       super
     end
 
+    def empty_insert_statement_value
+      'VALUES ( DEFAULT )' # won't work as Derby does need to know the columns count
+    end
+    
     # Set the sequence to the max value of the table's column.
     def reset_sequence!(table, column, sequence = nil)
       mpk = select_value("SELECT MAX(#{quote_column_name(column)}) FROM #{quote_table_name(table)}")
@@ -195,7 +199,7 @@ module ArJdbc
     end
 
     def execute(sql, name = nil, binds = [])
-      sql = to_sql(sql)
+      sql = to_sql(sql, binds)
       if sql =~ /\A\s*(UPDATE|INSERT)/i
         if ( i = sql =~ /\sWHERE\s/im )
           where_part = sql[i..-1]; sql = sql.dup
@@ -230,69 +234,6 @@ module ArJdbc
       sql = "DISTINCT #{columns}, #{order_columns * ', '}"
       sql
     end
-
-    SIZEABLE = %w(VARCHAR CLOB BLOB) # :nodoc:
-
-    def structure_dump # :nodoc:
-      definition = ""
-      meta_data = @connection.connection.meta_data
-      tables_rs = meta_data.getTables(nil, nil, nil, ["TABLE"].to_java(:string))
-      while tables_rs.next
-        table_name = tables_rs.getString(3)
-        definition << "CREATE TABLE #{table_name} (\n"
-        columns_rs = meta_data.getColumns(nil, nil, table_name, nil)
-        first_col = true
-        while columns_rs.next
-          column_name = add_quotes(columns_rs.getString(4));
-          default = ''
-          d1 = columns_rs.getString(13)
-          if d1 =~ /^GENERATED_/
-            default = auto_increment_stmt(table_name, column_name)
-          elsif d1
-            default = " DEFAULT #{d1}"
-          end
-
-          type = columns_rs.getString(6)
-          column_size = columns_rs.getString(7)
-          nulling = (columns_rs.getString(18) == 'NO' ? " NOT NULL" : "")
-          create_column = add_quotes(expand_double_quotes(strip_quotes(column_name)))
-          create_column << " #{type}"
-          create_column << ( SIZEABLE.include?(type) ? "(#{column_size})" : "" )
-          create_column << nulling
-          create_column << default
-          
-          create_column = first_col ? " #{create_column}" : ",\n #{create_column}"
-          definition << create_column
-
-          first_col = false
-        end
-        definition << ");\n\n"
-      end
-      definition
-    end
-
-    AUTO_INC_STMT2 = "" + 
-    "SELECT AUTOINCREMENTSTART, AUTOINCREMENTINC, COLUMNNAME, REFERENCEID, COLUMNDEFAULT " + 
-    "FROM SYS.SYSCOLUMNS WHERE REFERENCEID = " + 
-    "(SELECT T.TABLEID FROM SYS.SYSTABLES T WHERE T.TABLENAME = '%s') AND COLUMNNAME = '%s'"
-    
-    def auto_increment_stmt(tname, cname)
-      stmt = AUTO_INC_STMT2 % [ tname, strip_quotes(cname) ]
-      if data = execute(stmt).first
-        if start = data['autoincrementstart']
-          coldef = ""
-          coldef << " GENERATED " << (data['columndefault'].nil? ? "ALWAYS" : "BY DEFAULT ")
-          coldef << "AS IDENTITY (START WITH "
-          coldef << start
-          coldef << ", INCREMENT BY "
-          coldef << data['autoincrementinc']
-          coldef << ")"
-          return coldef
-        end
-      end
-      ""
-    end
-    private :auto_increment_stmt
     
     def remove_column(table_name, *column_names) # :nodoc:
       for column_name in column_names.flatten
@@ -354,13 +295,20 @@ module ArJdbc
     def tables
       @connection.tables(nil, derby_schema)
     end
+    
+    def recreate_database(name = nil, options = {}) # :nodoc:
+      drop_database(name)
+      create_database(name, options)
+    end
+    
+    def create_database(name = nil, options = {}); end # :nodoc:
 
-    def recreate_database(db_name, options = {})
-      tables.each { |table| drop_table table }
+    def drop_database(name = nil) # :nodoc:
+      tables.each { |table| drop_table(table) }
     end
 
     def quote_column_name(name) # :nodoc:
-      %Q{"#{name.to_s.upcase.gsub(/\"/, '""')}"}
+      %Q{"#{name.to_s.upcase.gsub('"', '""')}"}
     end
 
     def add_limit_offset!(sql, options) # :nodoc:
@@ -371,22 +319,6 @@ module ArJdbc
 
     private
     
-    def add_quotes(name)
-      return name unless name
-      %Q{"#{name}"}
-    end
-
-    def strip_quotes(str)
-      return str unless str
-      return str unless /^(["']).*\1$/ =~ str
-      str[1..-2]
-    end
-
-    def expand_double_quotes(name)
-      return name unless name && name['"']
-      name.gsub('"', '""')
-    end
-    
     # Derby appears to define schemas using the username
     def derby_schema
       if @config.has_key?(:schema)

data/lib/arjdbc/derby/connection_methods.rb

@@ -8,8 +8,9 @@ ArJdbc::ConnectionMethods.module_eval do
 
     config[:url] ||= "jdbc:derby:#{config[:database]};create=true"
     config[:driver] ||= defined?(::Jdbc::Derby.driver_name) ? ::Jdbc::Derby.driver_name : 'org.apache.derby.jdbc.EmbeddedDriver'
-    config[:adapter_spec] = ::ArJdbc::Derby
+    config[:adapter_spec] ||= ::ArJdbc::Derby
     config[:connection_alive_sql] ||= 'SELECT 1 FROM SYS.SYSSCHEMAS FETCH FIRST 1 ROWS ONLY' # FROM clause is mandatory
+    
     connection = embedded_driver(config)
     md = connection.jdbc_connection.meta_data
     if md.database_major_version < 10 || (md.database_major_version == 10 && md.database_minor_version < 5)

data/lib/arjdbc/discover.rb

@@ -1,31 +1,29 @@
-# arjdbc/discover.rb: Declare ArJdbc.extension modules in this file
-# that loads a custom module and adapter.
+# this file is discovered by the extension mechanism 
+# @see {ArJdbc#discover_extensions}
 
-module ::ArJdbc
-  # Adapters built-in to AR are required up-front so we can override
-  # the native ones
-  require 'arjdbc/mysql'
+module ArJdbc
+  
+  require 'arjdbc/jdbc/adapter_require'
+  
+  # Adapters built-in to AR :
+  
+  require 'arjdbc/mysql' if Java::JavaLang::Boolean.getBoolean('arjdbc.mysql.eager_load')
+  require 'arjdbc/postgresql' if Java::JavaLang::Boolean.getBoolean('arjdbc.postgresql.eager_load')
+  require 'arjdbc/sqlite3' if Java::JavaLang::Boolean.getBoolean('arjdbc.sqlite3.eager_load')
+  
   extension :MySQL do |name|
-    name =~ /mysql/i
+    require('arjdbc/mysql') || true if name =~ /mysql/i
   end
-
-  require 'arjdbc/postgresql'
+  
   extension :PostgreSQL do |name|
-    name =~ /postgre/i
+    require('arjdbc/postgresql') || true if name =~ /postgre/i
   end
 
-  require 'arjdbc/sqlite3'
   extension :SQLite3 do |name|
-    name =~ /sqlite/i
-  end
-
-  # Other adapters are lazy-loaded
-  extension :DB2 do |name, config|
-    if name =~ /(db2|as400)/i && config[:url] !~ /^jdbc:derby:net:/
-      require 'arjdbc/db2'
-      true
-    end
+    require('arjdbc/sqlite3') || true if name =~ /sqlite/i
   end
+  
+  # Other supported adapters :
 
   extension :Derby do |name, config|
     if name =~ /derby/i
@@ -49,44 +47,30 @@ module ::ArJdbc
     end
   end
 
-  extension :FireBird do |name|
-    if name =~ /firebird/i
-      require 'arjdbc/firebird'
-      true
-    end
-  end
-
   extension :H2 do |name|
-    if name =~ /\.h2\./i
-      require 'arjdbc/h2'
-      true
-    end
+    require('arjdbc/h2') || true if name =~ /\.h2\./i
   end
 
   extension :HSQLDB do |name|
-    if name =~ /hsqldb/i
-      require 'arjdbc/hsqldb'
-      true
-    end
+    require('arjdbc/hsqldb') || true if name =~ /hsqldb/i
   end
 
-  extension :Informix do |name|
-    if name =~ /informix/i
-      require 'arjdbc/informix'
-      true
-    end
+  extension :MSSQL do |name|
+    require('arjdbc/mssql') || true if name =~ /sqlserver|tds|Microsoft SQL/i
   end
 
-  extension :Mimer do |name|
-    if name =~ /mimer/i
-      require 'arjdbc/mimer'
+  extension :DB2 do |name, config|
+    if name =~ /db2/i && name !~ /as\/?400/i && config[:url] !~ /^jdbc:derby:net:/
+      require 'arjdbc/db2'
       true
     end
   end
-
-  extension :MSSQL do |name|
-    if name =~ /sqlserver|tds|Microsoft SQL/i
-      require 'arjdbc/mssql'
+  
+  extension :AS400 do |name, config|
+    # The native JDBC driver always returns "DB2 UDB for AS/400"
+    if name =~ /as\/?400/i
+      require 'arjdbc/db2'
+      require 'arjdbc/db2/as400'
       true
     end
   end
@@ -97,6 +81,15 @@ module ::ArJdbc
       true
     end
   end
+  
+  # NOTE: following ones are likely getting deprecated :
+  
+  extension :FireBird do |name|
+    if name =~ /firebird/i
+      require 'arjdbc/firebird'
+      true
+    end
+  end
 
   extension :Sybase do |name|
     if name =~ /sybase|tds/i
@@ -104,4 +97,19 @@ module ::ArJdbc
       true
     end
   end
+  
+  extension :Informix do |name|
+    if name =~ /informix/i
+      require 'arjdbc/informix'
+      true
+    end
+  end
+
+  extension :Mimer do |name|
+    if name =~ /mimer/i
+      require 'arjdbc/mimer'
+      true
+    end
+  end
+  
 end