Merge pull request #1006 from rsov/merging_branch

Merge fixes for AS400 database for Rails 5.2

Author: enebo

lib/arjdbc/db2/adapter.rb

@@ -328,6 +328,17 @@ def prefetch_primary_key?(table_name = nil)
       select_one(sql).nil?
     end
 
+    # @override
+    def primary_keys(table)
+      # If no schema in table name is given but present in URL parameter. Use the URL parameter one
+      # This avoids issues if the table is present in multiple schemas
+      if table.split(".").size == 1 && schema
+        table = "#{schema}.#{table}"
+      end
+
+      super
+    end
+
     def next_sequence_value(sequence_name)
       select_value("SELECT NEXT VALUE FOR #{sequence_name} FROM sysibm.sysdummy1")
     end

lib/arjdbc/jdbc/adapter.rb

@@ -358,6 +358,10 @@ def update_lob_value(record, column, value)
       # @return [Integer, NilClass]
       def last_inserted_id(result)
         if result.is_a?(Hash) || result.is_a?(ActiveRecord::Result)
+          # If table does not have primary key defined
+          return nil if result.first.blank?
+
+
           result.first.first[1] # .first = { "id"=>1 } .first = [ "id", 1 ]
         else
           result