scenic-oracle_adapter 1.0.1 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc14694dd15934c22a25e20481285d8f8a7c8ea7a4024d6521dd36c9b7696d8a
-  data.tar.gz: abdf33349c67895ee70f7e76ef258aceff53682a09160e5a09749235feb562f4
+  metadata.gz: 90cced87a95b6ccb71157a1c48cb6853807b8056e63f162a9bb029ca395ca2e9
+  data.tar.gz: 4f8622335a56bb5790762bf157bedc80fa36f63273b8f7231397b10d44dfd1f3
 SHA512:
-  metadata.gz: 89697e345b111efa52cb3273bcfdde6ff59dc7aec623fe29b03259d2cb39938a124bfa7f91a4144a4c89c9392bc2d5d2be1f88e1c37a07b87ba1848be846416e
-  data.tar.gz: 945348558a3fb40f0a9714c3841a1a0f946787f781eed129d031408c56d050f3dfaa77a0fc0926b64063b2845b6df0dc40a6aec5b93ee03c038124201cb9b68f
+  metadata.gz: cb32bae31161bb72aa561fd637702ee9b64a1d148dbc0129ded0eda8cf6fd6412879d2d9611fbd1073fc849e859c10efadf104c3a4193d4ac95ea2f522a84ad1
+  data.tar.gz: 44c8b878d942b249fbfb444068ad493b7b678cb56c60305c6551ec60699048bb92d2ad6dfd59b9c890ea64cc1d4bec4737b6f0adc11dc7c699c46e7b5c7b9e5e

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/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,11 +26,16 @@ end
 
 ## Development
 
-While you can use any Oracle instance to run the test suite, it's easiest to use Docker and docker-compose.
+While you can use any Oracle instance for development, it's easiest to use Docker and docker-compose.
 
-After checking out the repo, start the Oracle instance by running `docker-compose up -d`. After that, you can 
-run `docker-compose exec gem bin/setup` to install dependencies. Then, run `docker-compose exec gem bin/test` (or `rspec`) to run the tests.
-You can also run `docker-compose exec gem bin/console` for an interactive prompt that will allow you to experiment.
+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 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.

data/docker-compose.yml

@@ -1,11 +1,11 @@
 version: '3'
 services:
   db:
-    image: "container-registry.oracle.com/database/enterprise:12.2.0.1-slim"
+    image: store/oracle/database-enterprise:12.2.0.1
     volumes:
       - db:/ORCL
     ports:
-      - "1521:1521"
+      - 1521:1521
   gem:
     build: .
     volumes:

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

@@ -8,7 +8,11 @@ module Scenic
     class Oracle
       class Railtie < Rails::Railtie
         ActiveSupport.on_load(:active_record) do
-          ActiveRecord::ConnectionAdapters::OracleEnhanced::SchemaDumper.prepend Scenic::SchemaDumper
+          if defined?(ActiveRecord::ConnectionAdapters::OracleEnhancedSchemaDumper)
+            ActiveRecord::ConnectionAdapters::OracleEnhancedSchemaDumper.prepend Scenic::SchemaDumper
+          else
+            ActiveRecord::ConnectionAdapters::OracleEnhanced::SchemaDumper.prepend Scenic::SchemaDumper
+          end
         end
       end
     end

data/lib/scenic/adapters/oracle.rb

@@ -32,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)

data/lib/scenic/oracle_adapter/version.rb

@@ -2,6 +2,6 @@
 
 module Scenic
   module OracleAdapter
-    VERSION = "1.0.1"
+    VERSION = "1.1.1"
   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", "~> 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: 1.0.1
+  version: 1.1.1
 platform: ruby
 authors:
 - Chris Dinger
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-04-07 00:00:00.000000000 Z
+date: 2021-09-10 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,20 +38,6 @@ 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
@@ -108,20 +94,31 @@ 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
@@ -145,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
@@ -160,8 +157,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.15
+signing_key:
 specification_version: 4
 summary: Oracle adapter for thoughtbot/scenic
 test_files: []

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

data/.travis.yml

@@ -1,43 +0,0 @@
----
-dist: trusty
-sudo: required
-language: ruby
-cache: bundler
-rvm:
-  - 2.4
-  - 2.5
-  - 2.6
-  - 2.7
-
-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
-    - DATABASE_URL="oracle-enhanced://scenic_oracle_adapter:scenic_oracle_adapter@localhost/xe:1521"
-
-before_install:
-  - chmod +x .travis/oracle/download.sh
-  - chmod +x .travis/oracle/install.sh
-  - chmod +x .travis/setup_accounts.sh
-  - gem install bundler -v 2.1.2
-
-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