activerecord-oracle_enhanced-adapter 5.2.1 → 5.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa2bc4f36243959ebbe43179acbb417a7ee8c3256efa3a743b4fcdf6ceb35a42
-  data.tar.gz: 16d9bacff337f6634fb5d72e0d13f65dfc9b727ac95f757d3be1484ad6f66e2a
+  metadata.gz: 192b152e571ea28d6e195b9245c3bfc6ee331254a1c55bb6d7605d5da9a50b91
+  data.tar.gz: a954652613d0ce95d24a75bc5b6784fe2750d25e37fc26448017c1c290246df0
 SHA512:
-  metadata.gz: 625e0fc67e187b681867359d4576491bbbf2eb14c70f4c455bfa926713aaed6bf1e452acf7a3806f05297eccd444326368c390be170033f0013758cd5c2538e9
-  data.tar.gz: 197b8c4ef15c5458e67d1a530ebfce8fa8b2a97f0ccad2037729d59cf6fd867f828303a07d6eef475b60afb4fc83d302fd29aa0f67387657cea441429789d2ab
+  metadata.gz: 04cee9773aab325fcaf71454ad982538a8940846e5b9780422f1836ff7089a20d5a9e0e8439ed7ca7770ecb956701b7b05a56ecb46a6ef7d7742306926b4fe6e
+  data.tar.gz: 1cee77e92e6f81f4c0f93c610cb6b0436ebf39a97dd14411633295b830878cb3de485e2220a15120b7fd8826d4caf1e094662d354696de83a3beff26c865ec97

data/History.md

@@ -1,3 +1,11 @@
+## 5.2.2 / 2018-04-28
+
+* Changes and bug fixes
+  * Use SQL literals for `column_definitions` and `pk_and_sequence_for` [#1678 #1713 #1714]
+  * Memoize if the table needs to prefetch primary key[#1673 #1699 #1700]
+  * CI with JRuby 9.1.17.0 [#1710]
+  * Remove `rails/arel` from Gemfile [#1711 #1712]
+
 ## 5.2.1 / 2018-04-15
 
 * Changes and bug fixes

data/VERSION

@@ -1 +1 @@
-5.2.1
+5.2.2

data/lib/active_record/connection_adapters/oracle_enhanced_adapter.rb

@@ -518,7 +518,7 @@ module ActiveRecord
       def column_definitions(table_name)
         (owner, desc_table_name, db_link) = @connection.describe(table_name)
 
-        select_all(<<-SQL.strip.gsub(/\s+/, " "), "Column definitions", [bind_string("owner", owner), bind_string("table_name", desc_table_name)])
+        select_all(<<-SQL.strip.gsub(/\s+/, " "), "Column definitions")
           SELECT cols.column_name AS name, cols.data_type AS sql_type,
                  cols.data_default, cols.nullable, cols.virtual_column, cols.hidden_column,
                  cols.data_type_owner AS sql_type_owner,
@@ -531,8 +531,8 @@ module ActiveRecord
                  DECODE(data_type, 'NUMBER', data_scale, NULL) AS scale,
                  comments.comments as column_comment
             FROM all_tab_cols#{db_link} cols, all_col_comments#{db_link} comments
-           WHERE cols.owner      = :owner
-             AND cols.table_name = :table_name
+           WHERE cols.owner      = '#{owner}'
+             AND cols.table_name = #{quote(desc_table_name)}
              AND cols.hidden_column = 'NO'
              AND cols.owner = comments.owner
              AND cols.table_name = comments.table_name
@@ -546,19 +546,19 @@ module ActiveRecord
       def pk_and_sequence_for(table_name, owner = nil, desc_table_name = nil, db_link = nil) #:nodoc:
         (owner, desc_table_name, db_link) = @connection.describe(table_name) unless owner
 
-        seqs = select_values(<<-SQL.strip.gsub(/\s+/, " "), "Sequence", [bind_string("owner", owner), bind_string("sequence_name", default_sequence_name(desc_table_name).upcase)])
+        seqs = select_values(<<-SQL.strip.gsub(/\s+/, " "), "Sequence")
           select us.sequence_name
           from all_sequences#{db_link} us
-          where us.sequence_owner = :owner
-          and us.sequence_name = :sequence_name
+          where us.sequence_owner = '#{owner}'
+          and us.sequence_name = upper(#{quote(default_sequence_name(desc_table_name))})
         SQL
 
         # changed back from user_constraints to all_constraints for consistency
-        pks = select_values(<<-SQL.strip.gsub(/\s+/, " "), "Primary Key", [bind_string("owner", owner), bind_string("table_name", desc_table_name)])
+        pks = select_values(<<-SQL.strip.gsub(/\s+/, " "), "Primary Key")
           SELECT cc.column_name
             FROM all_constraints#{db_link} c, all_cons_columns#{db_link} cc
-           WHERE c.owner = :owner
-             AND c.table_name = :table_name
+           WHERE c.owner = '#{owner}'
+             AND c.table_name = #{quote(desc_table_name)}
              AND c.constraint_type = 'P'
              AND cc.owner = c.owner
              AND cc.constraint_name = c.constraint_name

data/spec/active_record/connection_adapters/oracle_enhanced_adapter_spec.rb

@@ -542,17 +542,17 @@ describe "OracleEnhancedAdapter" do
       expect(@logger.logged(:debug).last).to match(/\[\["owner", "#{DATABASE_USER.upcase}"\], \["trigger_name", "TEST_POSTS_PKT"\], \["owner", "#{DATABASE_USER.upcase}"\], \["table_name", "TEST_POSTS"\]\]/)
     end
 
-    it "should return content from columns with bind usage" do
+    it "should return content from columns without bind usage" do
       expect(@conn.columns("TEST_POSTS").length).to be > 0
-      expect(@logger.logged(:debug).last).to match(/:owner/)
-      expect(@logger.logged(:debug).last).to match(/:table_name/)
-      expect(@logger.logged(:debug).last).to match(/\[\["owner", "#{DATABASE_USER.upcase}"\], \["table_name", "TEST_POSTS"\]\]/)
+      expect(@logger.logged(:debug).last).not_to match(/:owner/)
+      expect(@logger.logged(:debug).last).not_to match(/:table_name/)
+      expect(@logger.logged(:debug).last).not_to match(/\[\["owner", "#{DATABASE_USER.upcase}"\], \["table_name", "TEST_POSTS"\]\]/)
     end
 
-    it "should return pk and sequence from pk_and_sequence_for with bind usage" do
+    it "should return pk and sequence from pk_and_sequence_for without bind usage" do
       expect(@conn.pk_and_sequence_for("TEST_POSTS").length).to eq 2
-      expect(@logger.logged(:debug).last).to match(/:owner/)
-      expect(@logger.logged(:debug).last).to match(/\[\["owner", "#{DATABASE_USER.upcase}"\], \["table_name", "TEST_POSTS"\]\]/)
+      expect(@logger.logged(:debug).last).not_to match(/:owner/)
+      expect(@logger.logged(:debug).last).not_to match(/\[\["owner", "#{DATABASE_USER.upcase}"\], \["table_name", "TEST_POSTS"\]\]/)
     end
 
     it "should return pk from primary_keys with bind usage" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-oracle_enhanced-adapter
 version: !ruby/object:Gem::Version
-  version: 5.2.1
+  version: 5.2.2
 platform: ruby
 authors:
 - Raimonds Simanovskis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-15 00:00:00.000000000 Z
+date: 2018-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord