scenic-oracle_adapter 0.2.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9409f3d5fb8a10fc6fed5fcd1501d0034ad2fa4a383733b1ff9a6818660576ff
-  data.tar.gz: 42256bb731d54eb934e7dd7cbc7abe4ef353f401e7c7b222cda5b30fd6a885b0
+  metadata.gz: 2a6654ada5f4a3b75d1a5539be516cbd673f9db9d19a267984d0262ad0909a4d
+  data.tar.gz: 306b5811810f316b451312e5a86428469fa2348fcf9ef3a13a1503519b9c4e2d
 SHA512:
-  metadata.gz: c8486a41a221db67a984b06f5dfe9c754019f5c759bc540f47d5932991c97982fe9bb80fe20157a12854c51fa9f0e149a6956990ab2a13dd3b5a2b90b3106376
-  data.tar.gz: 583843437bf27efafc5bf84e1cff91b5ca23b3e4f0b169fc53ceaef8ab8dd31d5214bb7ead2e1ca0103edcf5e1120a187a810961ec1250c3f18161e393653e92
+  metadata.gz: 918aa48ce7550cc4452c60bef6690661ddf09ad1a54f64ede2d523063b182fbe1ab807d300b9f31b212add47d87b952098ce362334f42a34b56c4a4dbb60f2af
+  data.tar.gz: 57c3671d477de89604300cf17462cf411f63b8b465cfd923d3bfefee44be82ff871cc967292b91f6ec1fcac2630ebcb5e6f81e4894541400e931ea6c6127ba2c

data/.github/workflows/ci.yml

@@ -0,0 +1,19 @@
+name: CI
+
+on: [push]
+
+jobs:
+
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Login to Docker Hub
+      uses: docker/login-action@v1
+      with:
+        username: ${{ secrets.DOCKER_HUB_USERNAME }}
+        password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
+    - name: Run tests
+      run: docker-compose run gem rspec

data/.rubocop.yml

@@ -1,5 +1,5 @@
 AllCops:
-  TargetRubyVersion: "2.3"
+  TargetRubyVersion: "2.5"
 
 # Use double quotes
 Style/StringLiterals:

data/Dockerfile

@@ -0,0 +1,18 @@
+FROM ruby:latest
+
+RUN curl -sLO 'https://download.oracle.com/otn_software/linux/instantclient/19600/instantclient-basic-linux.x64-19.6.0.0.0dbru.zip' && \
+  curl -sLO 'https://download.oracle.com/otn_software/linux/instantclient/19600/instantclient-sdk-linux.x64-19.6.0.0.0dbru.zip' && \
+  unzip instantclient-basic-linux.x64-19.6.0.0.0dbru.zip && \
+  unzip instantclient-sdk-linux.x64-19.6.0.0.0dbru.zip && \
+  rm instantclient-basic-linux.x64-19.6.0.0.0dbru.zip && \
+  rm instantclient-sdk-linux.x64-19.6.0.0.0dbru.zip
+
+RUN apt update && \
+  apt-get install libaio1
+
+ENV LD_LIBRARY_PATH /instantclient_19_6:$LD_LIBRARY_PATH
+
+RUN mkdir /app
+WORKDIR /app
+COPY . /app
+RUN bundle install

data/README.md

@@ -1,6 +1,6 @@
-# scenic-oracle_adapter [![Build Status](https://travis-ci.org/cdinger/scenic-oracle_adapter.svg?branch=master)](https://travis-ci.org/cdinger/scenic-oracle_adapter)
+# scenic-oracle_adapter [![Build Status](https://github.com/cdinger/scenic-oracle_adapter/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/cdinger/scenic-oracle_adapter/actions/workflows/ci.yml?query=branch%3Amaster)
 
-An Oracle adapter for Thoughtbot's [scenic](https://github.com/thoughtbot/scenic) rubygem.
+An Oracle adapter for the [scenic](https://github.com/scenic-views/scenic) rubygem.
 
 ## Installation
 
@@ -26,13 +26,19 @@ end
 
 ## Development
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `bin/test` (or `rspec`) to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+While you can use any Oracle instance for development, it's easiest to use Docker and docker-compose.
 
-By default, the test suite will attempt to connect to a local XE instance (see `spec/spec_helper.rb` for connection details).
-You can override the database URL by supplying a value to the `DATABASE_URL` environment variable.
+Note that the Oracle container takes up to two minutes to start and become available. If you're doing active development you probably want to start the containers in detached mode: `docker-compose up -d`. This starts everything in the background and allows you to use `docker-compose exec` to run commands on the already running containers:
+
+- Run specs: `docker-compose exec gem bin/test`
+- Open a console: `docker-compose exec gem bin/console`
+
+## Tests
 
-If you don't have a test Oracle database available, you can use [oracle-dev-box](https://github.com/cdinger/oracle-dev-box) to
-run an XE instance in Vagrant.
+If you just want to run the test suite you can use `docker-compose run --rm gem bin/test`. Again, because the Oracle container takes so long to start up, the first execution will take a while. The test suite will wait for the database container to become available. Subsequent executions will be faster.
+
+By default, the test suite will attempt to connect to a local docker Oracle instance (see `spec/spec_helper.rb` for connection details).
+You can override the database URL by supplying a value to the `DATABASE_URL` environment variable.
 
 ## Contributing
 

data/docker-compose.yml

@@ -0,0 +1,20 @@
+version: '3'
+services:
+  db:
+    image: store/oracle/database-enterprise:12.2.0.1
+    volumes:
+      - db:/ORCL
+    ports:
+      - 1521:1521
+  gem:
+    build: .
+    volumes:
+      - .:/app
+    environment:
+      - TERM=dumb
+    stdin_open: true
+    tty: true
+    depends_on:
+      - db
+volumes:
+  db:

data/lib/scenic/adapters/oracle.rb

@@ -2,6 +2,7 @@
 
 require_relative "oracle/index_reapplication"
 require_relative "oracle/indexes"
+require_relative "oracle/refresh_dependencies"
 
 module Scenic
   module Adapters
@@ -31,8 +32,8 @@ module Scenic
         create_view(name, definition)
       end
 
-      def create_materialized_view(name, definition)
-        execute("create materialized view #{quote_table_name(name)} as #{definition}")
+      def create_materialized_view(name, definition, no_data: false)
+        execute("create materialized view #{quote_table_name(name)} #{'build deferred' if no_data} as #{definition}")
       end
 
       def update_materialized_view(name, definition)
@@ -46,7 +47,9 @@ module Scenic
         execute("drop materialized view #{quote_table_name(name)}")
       end
 
-      def refresh_materialized_view(name, concurrently: false)
+      def refresh_materialized_view(name, concurrently: false, cascade: false)
+        refresh_dependencies_for(name) if cascade
+
         atomic_refresh = concurrently.to_s.upcase
         execute(<<~EOSQL)
           begin
@@ -71,6 +74,10 @@ module Scenic
           Scenic::View.new(name: view["name"], definition: view["definition"], materialized: true)
         end
       end
+
+      def refresh_dependencies_for(name)
+        Scenic::Adapters::Oracle::RefreshDependencies.call(name, self, connection)
+      end
     end
   end
 end

data/lib/scenic/adapters/oracle/index_reapplication.rb

@@ -23,9 +23,8 @@ module Scenic
 
         def try_index_create(index)
           if valid_index?(index)
-            if connection.execute(index.definition)
-              say "index '#{index.index_name}' on '#{index.object_name}' has been recreated"
-            end
+            connection.execute(index.definition) &&
+              say("index '#{index.index_name}' on '#{index.object_name}' has been recreated")
           else
             say "index '#{index.index_name}' on '#{index.object_name}' is no longer valid and has been dropped."
           end

data/lib/scenic/adapters/oracle/refresh_dependencies.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+require "tsort"
+
+module Scenic
+  module Adapters
+    class Oracle
+      class RefreshDependencies
+        def self.call(name, adapter, connection)
+          new(name, adapter, connection).call
+        end
+
+        def initialize(name, adapter, connection)
+          @name = name
+          @adapter = adapter
+          @connection = connection
+        end
+
+        def call
+          dependencies.each do |dependency|
+            adapter.refresh_materialized_view(dependency)
+          end
+        end
+
+        private
+
+        attr_reader :name, :adapter, :connection
+
+        def dependencies
+          d = dependency_tree_for(@name)
+          each_node = ->(&b) { d.each_key(&b) }
+          each_child = ->(n, &b) { d[n].each(&b) }
+          TSort.tsort(each_node, each_child) - [@name]
+        end
+
+        def dependency_tree_for(name, tree = {})
+          ds = connection.select_values(<<~EOSQL)
+            select referenced_name
+            from user_dependencies
+            where name = '#{name.upcase}'
+              and referenced_type = 'MATERIALIZED VIEW'
+          EOSQL
+
+          tree[name.downcase.to_sym] = Array(ds).map { |x| x.downcase.to_sym }
+          ds.each { |d| dependency_tree_for(d, tree) }
+          tree
+        end
+      end
+    end
+  end
+end

data/lib/scenic/oracle_adapter/version.rb

@@ -2,6 +2,6 @@
 
 module Scenic
   module OracleAdapter
-    VERSION = "0.2.0"
+    VERSION = "1.1.0"
   end
 end

data/scenic-oracle_adapter.gemspec

@@ -22,12 +22,12 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "scenic", "~> 1.4.1"
+  spec.add_dependency "scenic", "~> 1.5.4"
   spec.add_dependency "activerecord-oracle_enhanced-adapter", ">= 1.5.0"
-  spec.add_dependency "ruby-oci8", "~> 2.2"
 
-  spec.add_development_dependency "bundler", "~> 1.16"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler", "~> 2.0"
+  spec.add_development_dependency "rake", ">= 12.3.3"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "rubocop", ">= 0.49.0"
+  spec.add_development_dependency "ruby-oci8", "~> 2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scenic-oracle_adapter
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Chris Dinger
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2018-10-24 00:00:00.000000000 Z
+date: 2021-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: scenic
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: 1.5.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: 1.5.4
 - !ruby/object:Gem::Dependency
   name: activerecord-oracle_enhanced-adapter
   requirement: !ruby/object:Gem::Requirement
@@ -38,48 +38,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.0
-- !ruby/object:Gem::Dependency
-  name: ruby-oci8
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -108,21 +94,33 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.49.0
-description: 
+- !ruby/object:Gem::Dependency
+  name: ruby-oci8
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
+description:
 email:
 - chris@houseofding.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- ".travis.yml"
-- ".travis/oracle/download.sh"
-- ".travis/oracle/install.sh"
-- ".travis/setup_accounts.sh"
 - CODE_OF_CONDUCT.md
+- Dockerfile
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -130,11 +128,13 @@ files:
 - bin/console
 - bin/setup
 - bin/test
+- docker-compose.yml
 - lib/scenic/adapters/oracle.rb
 - lib/scenic/adapters/oracle/index.rb
 - lib/scenic/adapters/oracle/index_reapplication.rb
 - lib/scenic/adapters/oracle/indexes.rb
 - lib/scenic/adapters/oracle/railtie.rb
+- lib/scenic/adapters/oracle/refresh_dependencies.rb
 - lib/scenic/oracle_adapter.rb
 - lib/scenic/oracle_adapter/version.rb
 - scenic-oracle_adapter.gemspec
@@ -142,7 +142,7 @@ homepage: https://github.com/cdinger/scenic-oracle_adapter
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -157,9 +157,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Oracle adapter for thoughtbot/scenic
 test_files: []

data/.travis.yml

@@ -1,41 +0,0 @@
----
-dist: trusty
-sudo: required
-language: ruby
-cache: bundler
-rvm:
-  - 2.3
-  - 2.4
-  - 2.5
-
-env:
-  global:
-    - ORACLE_FILE=oracle11g/xe/oracle-xe-11.2.0-1.0.x86_64.rpm.zip
-    - ORACLE_HOME=/u01/app/oracle/product/11.2.0/xe
-    - TNS_ADMIN=$ORACLE_HOME/network/admin
-    - NLS_LANG=AMERICAN_AMERICA.AL32UTF8
-    - ORACLE_BASE=/u01/app/oracle
-    - LD_LIBRARY_PATH=$ORACLE_HOME/lib
-    - PATH=$PATH:$ORACLE_HOME/jdbc/lib
-    - DATABASE_VERSION=11.2.0.1
-    - ORACLE_SID=XE
-    - DATABASE_NAME=XE
-
-before_install:
-  - chmod +x .travis/oracle/download.sh
-  - chmod +x .travis/oracle/install.sh
-  - chmod +x .travis/setup_accounts.sh
-  - gem install bundler -v 1.16.5
-
-install:
-  - .travis/oracle/download.sh
-  - .travis/oracle/install.sh
-  - .travis/setup_accounts.sh
-  - bundle install
-
-jobs:
-  include:
-    - stage: Static analysis
-      script: bundle exec rubocop lib
-    - stage: Test
-      script: bundle exec rspec

data/.travis/oracle/download.sh

@@ -1,14 +0,0 @@
-#!/usr/bin/env bash
-
-cd "$(dirname "$(readlink -f "$0")")"
-
-deb_file=oracle-xe_11.2.0-1.0_amd64.deb
-
-git clone https://github.com/wnameless/docker-oracle-xe-11g.git
-
-cd docker-oracle-xe-11g/assets &&
-      cat "${deb_file}aa" "${deb_file}ab" "${deb_file}ac" > "${deb_file}"
-
-pwd
-
-ls -lAh "${deb_file}"

data/.travis/oracle/install.sh

@@ -1,33 +0,0 @@
-#!/usr/bin/env bash
-
-[ -n "$ORACLE_FILE" ] || { echo "Missing ORACLE_FILE environment variable!"; exit 1; }
-[ -n "$ORACLE_HOME" ] || { echo "Missing ORACLE_HOME environment variable!"; exit 1; }
-
-cd "$(dirname "$(readlink -f "$0")")"
-
-ORACLE_DEB=docker-oracle-xe-11g/assets/oracle-xe_11.2.0-1.0_amd64.deb
-
-sudo apt-get -qq update
-sudo apt-get --no-install-recommends -qq install bc libaio1
-
-df -B1 /dev/shm | awk 'END { if ($1 != "shmfs" && $1 != "tmpfs" || $2 < 2147483648) exit 1 }' ||
-    ( sudo rm -r /dev/shm && sudo mkdir /dev/shm && sudo mount -t tmpfs shmfs -o size=2G /dev/shm )
-
-test -f /sbin/chkconfig ||
-    ( echo '#!/bin/sh' | sudo tee /sbin/chkconfig > /dev/null && sudo chmod u+x /sbin/chkconfig )
-
-test -d /var/lock/subsys || sudo mkdir /var/lock/subsys
-
-sudo dpkg -i "${ORACLE_DEB}"
-
-echo 'OS_AUTHENT_PREFIX=""' | sudo tee -a "$ORACLE_HOME/config/scripts/init.ora" > /dev/null
-echo 'disk_asynch_io=false' | sudo tee -a "$ORACLE_HOME/config/scripts/init.ora" > /dev/null
-
-sudo usermod -aG dba $USER
-
-( echo ; echo ; echo travis ; echo travis ; echo n ) | sudo AWK='/usr/bin/awk' /etc/init.d/oracle-xe configure
-
-"$ORACLE_HOME/bin/sqlplus" -L -S / AS SYSDBA <<SQL
-CREATE USER $USER IDENTIFIED EXTERNALLY;
-GRANT CONNECT, RESOURCE TO $USER;
-SQL

data/.travis/setup_accounts.sh

@@ -1,14 +0,0 @@
-#!/bin/bash
-
-set -ev
-
-"$ORACLE_HOME/bin/sqlplus" -L -S / AS SYSDBA <<SQL
-alter user sys identified by admin;
-alter user system identified by admin;
-alter database default tablespace USERS;
-CREATE USER scenic_oracle_adapter IDENTIFIED BY scenic_oracle_adapter;
-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 scenic_oracle_adapter;
-exit
-SQL