activerecord-oracle_enhanced-adapter 1.6.4 → 1.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3140aab4b8a424d37dbf40c830b1078da12c520a
-  data.tar.gz: 5a4dda72b35ed5f9578ec10b21b2bf647ce3dd48
+  metadata.gz: 60a3ec980dcf98f634383b6ae254f5de37b549f7
+  data.tar.gz: d217ce9bc4b2ee4352746ca29eae5c639496b92f
 SHA512:
-  metadata.gz: 8b966b3ee7215ae2b724667d0eb929fdd2c2e5d7d8b98f7bfdcd66490e3a7fa7907dfbc1c3ec23fe42c358b7509a7035f67ad9b1d0815738f8d6cde248d72e34
-  data.tar.gz: 69feaef9c100e36ef781663aaaf98dafa72ee8f30d34b83611015da18311381bacec12c7ff97e846829076e4c9f9c411aeca1994478f3cb09bfd8fabb049889a
+  metadata.gz: 091010e46da037032c6714d2522c9097dbb3acd156a9ebecd240fc9154c73163f4e84e0e996ddbe27ae0ca64e2f13261370d61825aca3ab20fd997602362e3fc
+  data.tar.gz: 81622c33e2565fbe6292aa70214f865db3dd9d3cb623aac56ae65ebf7669e911e09a6c6251503654e5ce893c34b56e140d105def665be8fa6dc58e68e5fa215a

data/History.md

@@ -1,6 +1,11 @@
+## 1.6.5 / 2015-12-01
+
+* Enhancement
+ * Support `schema` option to use schema objects owned by another schema[#742]
+
 ## 1.6.4 / 2015-11-09
 
-* Changes and bug fixes since 1.6.2
+* Changes and bug fixes since 1.6.3
  * Add table and column comments to structure dump and schema dump [#734]
  * Remove `serialized_attributes` which is removed in Rails 5 [#694]
  * fixing bundler dependency conflict with head of rails vs arel 6.0[#714]

data/README.md

@@ -489,6 +489,23 @@ ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.default_tablespaces =
   {:clob => 'TS_LOB', :blob => 'TS_LOB', :index => 'TS_INDEX', :table => 'TS_DATA'}
 ```
 
+### Switching to another schema
+
+There are some requirements to connect to Oracle database first and switch to another user.
+Oracle enhanced adapter supports schema: option.
+
+Note: Oracle enhanced adapter does not take care if the database user specified in username: parameter
+has appropriate privilege to select, insert, update and delete database objects owned by the schema specified in schema: parameter.
+
+```yml
+development:
+  adapter: oracle_enhanced
+  database: xe
+  username: user
+  password: secret
+  schema: tableowner
+```
+
 TROUBLESHOOTING
 ---------------
 

data/RUNNING_TESTS.md

@@ -26,6 +26,9 @@ Running tests
         SQL> CREATE USER oracle_enhanced IDENTIFIED BY oracle_enhanced;
         SQL> GRANT unlimited tablespace, create session, create table, create sequence, create procedure, create trigger, create view, create materialized view, create database link, create synonym, create type, ctxapp TO oracle_enhanced;
 
+        SQL> CREATE USER oracle_enhanced_schema IDENTIFIED BY oracle_enhanced_schema;
+        SQL> GRANT unlimited tablespace, create session, create table, create sequence, create procedure, create trigger, create view, create materialized view, create database link, create synonym, create type, ctxapp TO oracle_enhanced_schema;
+
 * If you use RVM then switch to corresponding Ruby (1.8.7, 1.9.2 or JRuby) and it is recommended to create isolated gemset for test purposes (e.g. rvm create gemset oracle_enhanced)
 
 * Install bundler with

data/VERSION

@@ -1 +1 @@
-1.6.4
+1.6.5

data/activerecord-oracle_enhanced-adapter.gemspec

@@ -5,12 +5,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{activerecord-oracle_enhanced-adapter}
-  s.version = "1.6.4"
+  s.version = "1.6.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.license = 'MIT'
   s.authors = [%q{Raimonds Simanovskis}]
-  s.date = %q{2015-11-09}
+  s.date = %q{2015-12-01}
   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/jdbc_connection.rb

@@ -159,8 +159,14 @@ module ActiveRecord
 
         self.autocommit = true
 
-        # default schema owner
-        @owner = username.upcase unless username.nil?
+        schema = config[:schema] && config[:schema].to_s
+        if schema.blank?
+          # default schema owner
+          @owner = username.upcase unless username.nil?
+        else
+          exec "alter session set current_schema = #{schema}"
+          @owner = schema
+        end
 
         @raw_connection
       end

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

@@ -25,7 +25,9 @@ module ActiveRecord
       def initialize(config)
         @raw_connection = OCI8EnhancedAutoRecover.new(config, OracleEnhancedOCIFactory)
         # default schema owner
-        @owner = config[:username].to_s.upcase
+        @owner = config[:schema]
+        @owner ||= config[:username]
+        @owner = @owner.to_s.upcase
       end
 
       def raw_oci_connection
@@ -306,6 +308,7 @@ module ActiveRecord
         username = config[:username] && config[:username].to_s
         password = config[:password] && config[:password].to_s
         database = config[:database] && config[:database].to_s
+        schema = config[:schema] && config[:schema].to_s
         host, port = config[:host], config[:port]
         privilege = config[:privilege] && config[:privilege].to_sym
         async = config[:allow_concurrency]
@@ -333,6 +336,7 @@ module ActiveRecord
         conn.prefetch_rows = prefetch_rows
         conn.exec "alter session set cursor_sharing = #{cursor_sharing}" rescue nil
         conn.exec "alter session set time_zone = '#{time_zone}'" unless time_zone.blank?
+        conn.exec "alter session set current_schema = #{schema}" unless schema.blank?
 
         # Initialize NLS parameters
         OracleEnhancedAdapter::DEFAULT_NLS_PARAMETERS.each do |key, default_value|

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

@@ -10,7 +10,7 @@ module ActiveRecord #:nodoc:
           "CREATE SEQUENCE \"#{seq}\""
         end
         select_values("SELECT table_name FROM all_tables t
-                    WHERE owner = SYS_CONTEXT('userenv', 'session_user') AND secondary = 'N'
+                    WHERE owner = SYS_CONTEXT('userenv', 'current_schema') AND secondary = 'N'
                       AND NOT EXISTS (SELECT mv.mview_name FROM all_mviews mv WHERE mv.owner = t.owner AND mv.mview_name = t.table_name)
                       AND NOT EXISTS (SELECT mvl.log_table FROM all_mview_logs mvl WHERE mvl.log_owner = t.owner AND mvl.log_table = t.table_name)
                     ORDER BY 1").each do |table_name|
@@ -79,7 +79,7 @@ module ActiveRecord #:nodoc:
               ON a.constraint_name = c.constraint_name
            WHERE c.table_name = '#{table.upcase}'
              AND c.constraint_type = 'P'
-             AND c.owner = SYS_CONTEXT('userenv', 'session_user')
+             AND c.owner = SYS_CONTEXT('userenv', 'current_schema')
         SQL
         pks.each do |row|
           opts[:name] = row['constraint_name']
@@ -97,7 +97,7 @@ module ActiveRecord #:nodoc:
               ON a.constraint_name = c.constraint_name
            WHERE c.table_name = '#{table.upcase}'
              AND c.constraint_type = 'U'
-             AND c.owner = SYS_CONTEXT('userenv', 'session_user')
+             AND c.owner = SYS_CONTEXT('userenv', 'current_schema')
         SQL
         uks.each do |uk|
           keys[uk['constraint_name']] ||= []
@@ -125,7 +125,7 @@ module ActiveRecord #:nodoc:
       end
 
       def structure_dump_fk_constraints #:nodoc:
-        fks = select_all("SELECT table_name FROM all_tables WHERE owner = SYS_CONTEXT('userenv', 'session_user') ORDER BY 1").map do |table|
+        fks = select_all("SELECT table_name FROM all_tables WHERE owner = SYS_CONTEXT('userenv', 'current_schema') ORDER BY 1").map do |table|
           if respond_to?(:foreign_keys) && (foreign_keys = foreign_keys(table["table_name"])).any?
             foreign_keys.map do |fk|
               sql = "ALTER TABLE #{quote_table_name(fk.from_table)} ADD CONSTRAINT #{quote_column_name(fk.options[:name])} "
@@ -196,14 +196,14 @@ module ActiveRecord #:nodoc:
                      FROM all_source
                     WHERE type IN ('PROCEDURE', 'PACKAGE', 'PACKAGE BODY', 'FUNCTION', 'TRIGGER', 'TYPE')
                       AND name NOT LIKE 'BIN$%'
-                      AND owner = SYS_CONTEXT('userenv', 'session_user') ORDER BY type").each do |source|
+                      AND owner = SYS_CONTEXT('userenv', 'current_schema') ORDER BY type").each do |source|
           ddl = "CREATE OR REPLACE   \n"
           select_all(%Q{
                   SELECT text
                     FROM all_source
                    WHERE name = '#{source['name']}'
                      AND type = '#{source['type']}'
-                     AND owner = SYS_CONTEXT('userenv', 'session_user')
+                     AND owner = SYS_CONTEXT('userenv', 'current_schema')
                    ORDER BY line
                 }).each do |row|
             ddl << row['text']
@@ -220,7 +220,7 @@ module ActiveRecord #:nodoc:
         # export synonyms
         select_all("SELECT owner, synonym_name, table_name, table_owner
                       FROM all_synonyms
-                     WHERE owner = SYS_CONTEXT('userenv', 'session_user') ").each do |synonym|
+                     WHERE owner = SYS_CONTEXT('userenv', 'current_schema') ").each do |synonym|
           structure << "CREATE OR REPLACE #{synonym['owner'] == 'PUBLIC' ? 'PUBLIC' : '' } SYNONYM #{synonym['synonym_name']}
 			FOR #{synonym['table_owner']}.#{synonym['table_name']}"
         end
@@ -233,7 +233,7 @@ module ActiveRecord #:nodoc:
           "DROP SEQUENCE \"#{seq}\""
         end
         select_values("SELECT table_name from all_tables t
-                    WHERE owner = SYS_CONTEXT('userenv', 'session_user') AND secondary = 'N'
+                    WHERE owner = SYS_CONTEXT('userenv', 'current_schema') AND secondary = 'N'
                       AND NOT EXISTS (SELECT mv.mview_name FROM all_mviews mv WHERE mv.owner = t.owner AND mv.mview_name = t.table_name)
                       AND NOT EXISTS (SELECT mvl.log_table FROM all_mview_logs mvl WHERE mvl.log_owner = t.owner AND mvl.log_table = t.table_name)
                     ORDER BY 1").each do |table|
@@ -245,7 +245,7 @@ module ActiveRecord #:nodoc:
       def temp_table_drop #:nodoc:
         join_with_statement_token(select_values(
                   "SELECT table_name FROM all_tables
-                    WHERE owner = SYS_CONTEXT('userenv', 'session_user') AND secondary = 'N' AND temporary = 'Y' ORDER BY 1").map do |table|
+                    WHERE owner = SYS_CONTEXT('userenv', 'current_schema') AND secondary = 'N' AND temporary = 'Y' ORDER BY 1").map do |table|
           "DROP TABLE \"#{table}\" CASCADE CONSTRAINTS"
         end)
       end

data/lib/active_record/connection_adapters/oracle_enhanced_adapter.rb

@@ -849,14 +849,19 @@ module ActiveRecord
         select_value("SELECT SYS_CONTEXT('userenv', 'session_user') FROM dual")
       end
 
+      # Current database session schema
+      def current_schema
+        select_value("SELECT SYS_CONTEXT('userenv', 'current_schema') FROM dual")
+      end
+
       # Default tablespace name of current user
       def default_tablespace
-        select_value("SELECT LOWER(default_tablespace) FROM user_users WHERE username = SYS_CONTEXT('userenv', 'session_user')")
+        select_value("SELECT LOWER(default_tablespace) FROM user_users WHERE username = SYS_CONTEXT('userenv', 'current_schema')")
       end
 
       def tables(name = nil) #:nodoc:
         select_values(
-        "SELECT DECODE(table_name, UPPER(table_name), LOWER(table_name), table_name) FROM all_tables WHERE owner = SYS_CONTEXT('userenv', 'session_user') AND secondary = 'N'",
+        "SELECT DECODE(table_name, UPPER(table_name), LOWER(table_name), table_name) FROM all_tables WHERE owner = SYS_CONTEXT('userenv', 'current_schema') AND secondary = 'N'",
         name)
       end
 
@@ -869,7 +874,7 @@ module ActiveRecord
       end
 
       def materialized_views #:nodoc:
-        select_values("SELECT LOWER(mview_name) FROM all_mviews WHERE owner = SYS_CONTEXT('userenv', 'session_user')")
+        select_values("SELECT LOWER(mview_name) FROM all_mviews WHERE owner = SYS_CONTEXT('userenv', 'current_schema')")
       end
 
       cattr_accessor :all_schema_indexes #:nodoc:

data/spec/active_record/connection_adapters/oracle_enhanced_connection_spec.rb

@@ -35,6 +35,30 @@ describe "OracleEnhancedConnection" do
 
   end
 
+  describe "create connection with schema option" do
+    before(:all) do
+      @conn = ActiveRecord::ConnectionAdapters::OracleEnhancedConnection.create(CONNECTION_WITH_SCHEMA_PARAMS)
+    end
+
+    before(:each) do
+      @conn = ActiveRecord::ConnectionAdapters::OracleEnhancedConnection.create(CONNECTION_WITH_SCHEMA_PARAMS) unless @conn.active?
+    end
+
+    it "should create new connection" do
+      @conn.should be_active
+    end
+
+    it "should swith to specified schema" do
+      @conn.select_value("select SYS_CONTEXT('userenv', 'current_schema') from dual").should == CONNECTION_WITH_SCHEMA_PARAMS[:schema].upcase
+    end
+
+    it "should swith to specified schema after reset" do
+      @conn.reset!
+      @conn.select_value("select SYS_CONTEXT('userenv', 'current_schema') from dual").should == CONNECTION_WITH_SCHEMA_PARAMS[:schema].upcase
+    end
+
+  end
+
   describe "create connection with NLS parameters" do
     after do
       ENV['NLS_DATE_FORMAT'] = nil

data/spec/spec_helper.rb

@@ -125,6 +125,7 @@ DATABASE_HOST         = config["database"]["host"]         || ENV['DATABASE_HOST
 DATABASE_PORT         = config["database"]["port"]         || ENV['DATABASE_PORT']         || 1521
 DATABASE_USER         = config["database"]["user"]         || ENV['DATABASE_USER']         || 'oracle_enhanced'
 DATABASE_PASSWORD     = config["database"]["password"]     || ENV['DATABASE_PASSWORD']     || 'oracle_enhanced'
+DATABASE_SCHEMA       = config["database"]["schema"]       || ENV['DATABASE_SCHEMA']       || 'oracle_enhanced_schema'
 DATABASE_SYS_PASSWORD = config["database"]["sys_password"] || ENV['DATABASE_SYS_PASSWORD'] || 'admin'
 
 CONNECTION_PARAMS = {
@@ -136,6 +137,16 @@ CONNECTION_PARAMS = {
   :password => DATABASE_PASSWORD
 }
 
+CONNECTION_WITH_SCHEMA_PARAMS = {
+  :adapter => "oracle_enhanced",
+  :database => DATABASE_NAME,
+  :host => DATABASE_HOST,
+  :port => DATABASE_PORT,
+  :username => DATABASE_USER,
+  :password => DATABASE_PASSWORD,
+  :schema => DATABASE_SCHEMA
+}
+
 SYS_CONNECTION_PARAMS = {
   :adapter => "oracle_enhanced",
   :database => DATABASE_NAME,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-oracle_enhanced-adapter
 version: !ruby/object:Gem::Version
-  version: 1.6.4
+  version: 1.6.5
 platform: ruby
 authors:
 - Raimonds Simanovskis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-09 00:00:00.000000000 Z
+date: 2015-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jeweler