scenic-oracle_adapter 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 533aa27e5aab91d23478730a7330bc9d08c343ddd5de1bfa8191ed18e2ed9dd6
-  data.tar.gz: b8461d886bca7de8feb790fa12bdb59a550e81b5fd12f292ff5008b55e6db769
+  metadata.gz: 1d9bb94f1cec86d7abe41786c15d0bac531eef9b082099f8d4d498f0dee898a8
+  data.tar.gz: 3e2131ed37270bb8f39f8e7bdb67d82561461f266a59fa9387824282620f31d0
 SHA512:
-  metadata.gz: 784827c8e18df5276b914921aded3c4b8ccb57ee5fa0993ef88eca4a1b8023df93983cb05e17b4a620e71d27dd20afb9fcf86bb31dd2b2a18ac3fb057d80aa8d
-  data.tar.gz: 04e19cc856521843c40fd06ca4bd0bd2e4f5e1389251bc63949a34be45e294edb64f35fb6778ffb50581ab479b96f3658e169a59c5a44e0ebefad298ef269cd1
+  metadata.gz: a44e897ba0001c0e8f293c13648bf6062ac06d3980211515058ef80e1a4651a583434560d00420fcb4021d6953216ba0cda670378c0787bb4d6a259c46846b3a
+  data.tar.gz: 31c7ed943ce55a201b589da0c08cfa04cb6a27ee05dce313a7d5f229949973c997e4ee88e17f58ef936509ca9edca97b23754d722472db6361bb589b44ee98d7

data/.github/workflows/ci.yml

@@ -12,10 +12,5 @@ jobs:
 
     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/Dockerfile

@@ -1,16 +1,4 @@
-FROM --platform=linux/amd64 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
+FROM ghcr.io/cdinger/oracle-ruby:3.3
 
 RUN mkdir /app
 WORKDIR /app

data/README.md

@@ -26,12 +26,12 @@ end
 
 ## Development
 
-While you can use any Oracle instance for development, 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.
 
-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:
+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`
+- Run specs: `docker compose exec gem bin/test`
+- Open a console: `docker compose exec gem bin/console`
 
 ## Tests
 

data/docker-compose.yml

@@ -1,20 +1,16 @@
-version: '3'
 services:
   db:
-    image: container-registry.oracle.com/database/express:latest
+    image: ghcr.io/cdinger/oracle:19.3.0-ee
     volumes:
       - db:/opt/oracle/oradata
     environment:
       - ORACLE_PWD=thisisonlyusedlocally
     ports:
       - "127.0.0.1:1521:1521"
-      - "127.0.0.1:5500:5500"
   gem:
     build: .
     volumes:
       - .:/app
-    environment:
-      - TERM=dumb
     stdin_open: true
     tty: true
     depends_on:

data/lib/scenic/adapters/oracle.rb

@@ -3,6 +3,7 @@
 require_relative "oracle/index_reapplication"
 require_relative "oracle/indexes"
 require_relative "oracle/refresh_dependencies"
+require "tsortable_hash"
 
 module Scenic
   module Adapters
@@ -12,7 +13,9 @@ module Scenic
       end
 
       def views
-        all_views + all_mviews
+        all_view_objects.sort_by do |view_object|
+          dependency_order.index(view_object.name)
+        end
       end
 
       def create_view(name, definition)
@@ -67,6 +70,27 @@ module Scenic
 
       private
 
+      def view_dependencies
+        select_all(<<~EOSQL)
+          select lower(uo.object_name) as name, lower(ud.referenced_name) as dependency
+          from user_objects uo
+            left join user_dependencies ud on uo.object_name = ud.name
+              and ud.referenced_type in ('VIEW', 'MATERIALIZED VIEW')
+          where uo.object_type in ('VIEW', 'MATERIALIZED VIEW')
+        EOSQL
+      end
+
+      def dependency_order
+        views_hash = TSortableHash.new
+
+        view_dependencies.each do |view_data|
+          views_hash[view_data["name"]] ||= []
+          views_hash[view_data["name"]] << view_data["dependency"] unless view_data["dependency"].nil?
+        end
+
+        views_hash.tsort
+      end
+
       def all_views
         select_all("select lower(view_name) name, text definition from user_views").map do |view|
           Scenic::View.new(name: view["name"], definition: view["definition"], materialized: false)
@@ -79,6 +103,10 @@ module Scenic
         end
       end
 
+      def all_view_objects
+        all_views + all_mviews
+      end
+
       def refresh_dependencies_for(name)
         Scenic::Adapters::Oracle::RefreshDependencies.call(name, self, connection)
       end

data/lib/scenic/oracle_adapter/version.rb

@@ -2,6 +2,6 @@
 
 module Scenic
   module OracleAdapter
-    VERSION = "1.3.0"
+    VERSION = "1.3.1"
   end
 end

data/lib/tsortable_hash.rb

@@ -0,0 +1,10 @@
+require "tsort"
+
+class TSortableHash < Hash
+  include TSort
+
+  alias_method :tsort_each_node, :each_key
+  def tsort_each_child(node, &)
+    fetch(node).each(&)
+  end
+end

data/scenic-oracle_adapter.gemspec

@@ -22,7 +22,7 @@ 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.8.0"
+  spec.add_dependency "scenic", "= 1.8.0"
   spec.add_dependency "activerecord-oracle_enhanced-adapter", ">= 1.5.0"
 
   spec.add_development_dependency "bundler", "~> 2.0"

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: scenic-oracle_adapter
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Chris Dinger
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-03-29 00:00:00.000000000 Z
+date: 2024-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: scenic
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
         version: 1.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
         version: 1.8.0
 - !ruby/object:Gem::Dependency
@@ -137,6 +137,7 @@ files:
 - lib/scenic/adapters/oracle/refresh_dependencies.rb
 - lib/scenic/oracle_adapter.rb
 - lib/scenic/oracle_adapter/version.rb
+- lib/tsortable_hash.rb
 - scenic-oracle_adapter.gemspec
 homepage: https://github.com/cdinger/scenic-oracle_adapter
 licenses:
@@ -157,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.4
+rubygems_version: 3.5.9
 signing_key:
 specification_version: 4
 summary: Oracle adapter for thoughtbot/scenic