activerecord-oracle_enhanced-adapter 1.7.8 → 1.7.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e288f3252430d1ed219947281862797ff87b59ba
-  data.tar.gz: 83dc958f35386c22c8c1d7a68c1f817e4cd884cc
+  metadata.gz: c66ea5a29bbc96acd0537074b8acb1826adc37db
+  data.tar.gz: 82238858ccab6ab176f310583077aa375f710958
 SHA512:
-  metadata.gz: 8ef95f27bd4dbaf561c5ef0f36a70903f0ed3652ca7096cfc32f7396ced16ab829717be7e79e0858ef9c7adaf79de74a805b5bad73909ea35a9f8cebb340f442
-  data.tar.gz: 866f47befdc34a4489b8b3da4bd35c37dfea56393a1e38e2686ccb9fe73e088f66bc7d7f26ff9ef69050d68f3b72050afd561d85f39d73f469724f4ae129cf71
+  metadata.gz: 5a17e233a007cd95860964daccd49cd9d271650b853a6486256d83cdba8f12c3d92a8088d64ee9dd89fba415e9a587683453a8b1970652bb79dd5d51a87c3fc5
+  data.tar.gz: 4d13330c563debb87972c50be25d63e560c91edca0444ef4c2869b72d5de4ea9184e6a7f24b9f70f01f25b9fc7e65be445c6729fa60f5da9d836647f0786050c

data/History.md

@@ -1,3 +1,15 @@
+## 1.7.9 / 2016-12-26
+
+* Changes and bug fixes
+
+  * Fix ORA-00933 error when executing `rails db:schema:load` [#1084]
+  * Quoting booleans should return a frozen string [#1083]
+  * Quoting booleans should return a frozen string [#1083]
+  * CI against ruby 2.4.0 [#1096, #1086]
+
+* Known issues
+ * No changes since 1.7.7
+
 ## 1.7.8 / 2016-12-06
 
 * Changes and bug fixes

data/VERSION

@@ -1 +1 @@
-1.7.8
+1.7.9

data/activerecord-oracle_enhanced-adapter.gemspec

@@ -1,12 +1,12 @@
 Gem::Specification.new do |s|
   s.name = %q{activerecord-oracle_enhanced-adapter}
-  s.version = "1.7.8"
+  s.version = "1.7.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.required_ruby_version     = '>= 2.2.2'
   s.license = 'MIT'
   s.authors = [%q{Raimonds Simanovskis}]
-  s.date = %q{2016-12-06}
+  s.date = %q{2016-12-26}
   s.description = %q{Oracle "enhanced" ActiveRecord adapter contains useful additional methods for working with new and legacy Oracle databases.
 This adapter is superset of original ActiveRecord Oracle adapter.
 }

data/lib/active_record/connection_adapters/oracle_enhanced/quoting.rb

@@ -103,7 +103,7 @@ module ActiveRecord
 
         def quoted_true #:nodoc:
           return "'#{self.class.boolean_to_string(true)}'" if emulate_booleans_from_strings
-          "1"
+          "1".freeze
         end
 
         def unquoted_true #:nodoc:
@@ -113,7 +113,7 @@ module ActiveRecord
 
         def quoted_false #:nodoc:
           return "'#{self.class.boolean_to_string(false)}'" if emulate_booleans_from_strings
-          "0"
+          "0".freeze
         end
 
         def unquoted_false #:nodoc:

data/lib/active_record/connection_adapters/oracle_enhanced/schema_statements.rb

@@ -118,11 +118,23 @@ module ActiveRecord
         end
 
         def insert_versions_sql(versions) # :nodoc:
-          sm_table = ActiveRecord::Migrator.schema_migrations_table_name
+          sm_table = quote_table_name(ActiveRecord::Migrator.schema_migrations_table_name)
 
-          versions.map { |version|
-            "INSERT INTO #{sm_table} (version) VALUES ('#{version}')"
-          }.join "\n\n/\n\n"
+          if supports_multi_insert?
+            versions.inject("INSERT ALL\n") { |sql, version|
+              sql << "INTO #{sm_table} (version) VALUES (#{quote(version)})\n"
+            } << "SELECT * FROM DUAL\n"
+          else
+            if versions.is_a?(Array)
+              # called from ActiveRecord::Base.connection#dump_schema_information
+              versions.map { |version|
+                "INSERT INTO #{sm_table} (version) VALUES (#{quote(version)})"
+              }.join("\n\n/\n\n")
+            else
+              # called from ActiveRecord::Base.connection#assume_migrated_upto_version
+              "INSERT INTO #{sm_table} (version) VALUES (#{quote(versions)})"
+            end
+          end
         end
 
         def initialize_schema_migrations_table

data/lib/active_record/connection_adapters/oracle_enhanced_adapter.rb

@@ -493,7 +493,7 @@ module ActiveRecord
       end
 
       def supports_multi_insert?
-        false
+        @connection.database_version.to_s >= [11, 2].to_s
       end
 
       #:stopdoc:

data/spec/active_record/connection_adapters/oracle_enhanced_schema_statements_spec.rb

@@ -1429,4 +1429,44 @@ end
     end
 
   end
+
+  describe "load schema" do
+    let(:versions) {
+      %w(20160101000000 20160102000000 20160103000000)
+    }
+
+    before do
+      @conn = ActiveRecord::Base.connection
+
+      ActiveRecord::SchemaMigration.create_table
+    end
+
+    context "multi insert is supported" do
+      it "should loads the migration schema table from insert versions sql" do
+        skip "Not supported in this database version" unless ActiveRecord::Base.connection.supports_multi_insert?
+
+        expect {
+          @conn.execute @conn.insert_versions_sql(versions)
+        }.not_to raise_error
+
+        expect(@conn.select_value("SELECT COUNT(version) FROM schema_migrations")).to eq versions.count
+      end
+    end
+
+    context "multi insert is NOT supported" do
+      it "should loads the migration schema table from insert versions sql" do
+        skip "Not supported in this database version" if ActiveRecord::Base.connection.supports_multi_insert?
+
+        expect {
+          versions.each { |version| @conn.execute @conn.insert_versions_sql(version) }
+        }.not_to raise_error
+
+        expect(@conn.select_value("SELECT COUNT(version) FROM schema_migrations")).to eq versions.count
+      end
+    end
+
+    after do
+      ActiveRecord::SchemaMigration.drop_table
+    end
+  end
 end

data/spec/active_record/connection_adapters/oracle_enhanced_structure_dump_spec.rb

@@ -291,6 +291,9 @@ describe "OracleEnhancedAdapter structure dump" do
         Time.parse("2016.01.#{i}").strftime("%Y%m%d%H%M%S")
       end
     end
+
+    let(:dump) { ActiveRecord::Base.connection.dump_schema_information }
+
     before do
       ActiveRecord::SchemaMigration.reset_table_name
       ActiveRecord::SchemaMigration.create_table
@@ -298,18 +301,42 @@ describe "OracleEnhancedAdapter structure dump" do
         ActiveRecord::SchemaMigration.create!(:version => i)
       end
     end
-    let(:dump) { ActiveRecord::Base.connection.dump_schema_information }
-    it "should dump schema migrations one version per insert" do
-      versions[0...-1].each do |i|
-        expect(dump).to include "INSERT INTO schema_migrations (version) VALUES ('#{i}')\n\n/\n"
+
+    context "multi insert is supported" do
+      it "should dump schema migrations using multi inserts" do
+        skip "Not supported in this database version" unless ActiveRecord::Base.connection.supports_multi_insert?
+
+        expect(dump).to eq <<-SQL.strip_heredoc
+          INSERT ALL
+          INTO "SCHEMA_MIGRATIONS" (version) VALUES ('20160101000000')
+          INTO "SCHEMA_MIGRATIONS" (version) VALUES ('20160102000000')
+          INTO "SCHEMA_MIGRATIONS" (version) VALUES ('20160103000000')
+          INTO "SCHEMA_MIGRATIONS" (version) VALUES ('20160104000000')
+          INTO "SCHEMA_MIGRATIONS" (version) VALUES ('20160105000000')
+          INTO "SCHEMA_MIGRATIONS" (version) VALUES ('20160106000000')
+          INTO "SCHEMA_MIGRATIONS" (version) VALUES ('20160107000000')
+          INTO "SCHEMA_MIGRATIONS" (version) VALUES ('20160108000000')
+          INTO "SCHEMA_MIGRATIONS" (version) VALUES ('20160109000000')
+          INTO "SCHEMA_MIGRATIONS" (version) VALUES ('20160110000000')
+          SELECT * FROM DUAL
+        SQL
       end
     end
-    it "should not add own separator or newline" do
-      expect(dump).to match(/INSERT INTO schema_migrations \(version\) VALUES \('#{versions.last}'\)\z/)
-    end
-    it "should contain expected amount of lines" do
-      expect(dump.lines.length).to eq(4 * (versions.length - 1) + 1)
+
+    context "multi insert is NOT supported" do
+      let(:insert_statement_per_migration) {
+        1.step(10).map { |i|
+          %Q|INSERT INTO "SCHEMA_MIGRATIONS" (version) VALUES ('201601#{sprintf("%02d", i)}000000')|
+        }.join("\n\n/\n\n")
+      }
+
+      it "should dump schema migrations one version per insert" do
+        skip "Not supported in this database version" if ActiveRecord::Base.connection.supports_multi_insert?
+
+        expect(dump).to eq insert_statement_per_migration
+      end
     end
+
     after do
       ActiveRecord::SchemaMigration.drop_table
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-oracle_enhanced-adapter
 version: !ruby/object:Gem::Version
-  version: 1.7.8
+  version: 1.7.9
 platform: ruby
 authors:
 - Raimonds Simanovskis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-06 00:00:00.000000000 Z
+date: 2016-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord