scenic-oracle_adapter 1.3.2 → 1.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b6af72024c360af2c3e802a98dad25c65109fd6d79eda9b7a0d6e43c4829d92f
-  data.tar.gz: 6c3c8e11b6676d69dc79893a2196f7e0a5f8babb04d20e714d2f63b1d5f00d67
+  metadata.gz: 453bc175d2fa922a314a781064fb63a6415dc3be36aa096baa9d52c77f1542ed
+  data.tar.gz: 3d5ed519bc3ce673c934bc32d310b298c8d525e12fd089abf8a1201674036d4e
 SHA512:
-  metadata.gz: 2df4de941f6d6536a225811124efeb2423e186f4ea741b58d6144019c77252cf7b98c203e9dde881325b7892f75cae27b22764acf2f2170ca2262230d4671e34
-  data.tar.gz: 2eb947aa0e7d850bcd9a6aceaa9abda6fad9eab0fd9d4b68a26c54683d1054132ce849a4f0a47c4f7d6a3e8c4563a89572096008396860ac0872b06cc059c36a
+  metadata.gz: cb0722b1989112a9b5f48c7fdbd7b303d4fd7baf5b577dc002bcd9d174e795b120715b725ffdd72cc562f7522b09a9eea13cc8e4984dccd53d929bdea2b1b0c4
+  data.tar.gz: df2366ae4965f197b205f7148ecef307f17695f3c05815b17ee681bf230b53c2bb1edfc7831b854d590022422fbfc42c3ce00e526ff7d14f719ecc8399ae5ce6

data/README.md

@@ -28,14 +28,14 @@ end
 
 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`
 
 ## 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.
+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

@@ -11,8 +11,6 @@ services:
     build: .
     volumes:
       - .:/app
-    environment:
-      - TERM=dumb
     stdin_open: true
     tty: true
     depends_on:

data/lib/scenic/adapters/oracle.rb

@@ -13,13 +13,11 @@ module Scenic
       end
 
       def views
-        all_view_objects.sort_by do |view_object|
-          dependency_order.index(view_object.name)
-        end
+        sorted_dependency_views + sorted_missing_dependency_views
       end
 
       def create_view(name, definition)
-        execute("create view #{quote_table_name(name)} as #{definition}")
+        execute("create view #{quote_table_name(name)} as #{trimmed_definition(definition)}")
       end
 
       def drop_view(name)
@@ -27,7 +25,7 @@ module Scenic
       end
 
       def replace_view(name, definition)
-        execute("create or replace view #{quote_table_name(name)} as #{definition}")
+        execute("create or replace view #{quote_table_name(name)} as #{trimmed_definition(definition)}")
       end
 
       def update_view(name, definition)
@@ -36,7 +34,7 @@ module Scenic
       end
 
       def create_materialized_view(name, definition, no_data: false)
-        execute("create materialized view #{quote_table_name(name)} #{'build deferred' if no_data} as #{definition}")
+        execute("create materialized view #{quote_table_name(name)} #{'build deferred' if no_data} as #{trimmed_definition(definition)}")
       end
 
       def update_materialized_view(name, definition, no_data: false)
@@ -71,14 +69,24 @@ module Scenic
       private
 
       def view_dependencies
-        select_all(<<~EOSQL)
+        @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')
+            left join user_dependencies ud on
+              uo.object_name = ud.name
+              and (
+                (ud.referenced_type in ('VIEW', 'MATERIALIZED VIEW'))
+                OR
+                (
+                  ud.referenced_type IN ('TABLE')
+                  AND
+                  ud.referenced_name in (select mview_name from user_mviews)
+                )
+              )
               and ud.referenced_name in (select object_name from user_objects)
               and ud.referenced_owner = user
           where uo.object_type in ('VIEW', 'MATERIALIZED VIEW')
+          order by lower(uo.object_name), lower(ud.referenced_name)
         EOSQL
       end
 
@@ -93,6 +101,22 @@ module Scenic
         views_hash.tsort
       end
 
+      def sorted_dependency_views
+        all_view_objects.filter do |view|
+          dependency_order.include?(view.name)
+        end.sort_by do |view|
+          dependency_order.index(view.name)
+        end
+      end
+
+      def sorted_missing_dependency_views
+        all_view_objects.filter do |view|
+          dependency_order.exclude?(view.name)
+        end.sort_by do |view|
+          view.name
+        end
+      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)
@@ -112,6 +136,10 @@ module Scenic
       def refresh_dependencies_for(name)
         Scenic::Adapters::Oracle::RefreshDependencies.call(name, self, connection)
       end
+
+      def trimmed_definition(sql)
+        sql.strip.sub(/;$/, "").strip
+      end
     end
   end
 end

data/lib/scenic/oracle_adapter/version.rb

@@ -2,6 +2,6 @@
 
 module Scenic
   module OracleAdapter
-    VERSION = "1.3.2"
+    VERSION = "1.3.4"
   end
 end

data/lib/tsortable_hash.rb

@@ -4,7 +4,7 @@ class TSortableHash < Hash
   include TSort
 
   alias_method :tsort_each_node, :each_key
-  def tsort_each_child(node, &)
-    fetch(node).each(&)
+  def tsort_each_child(node, &block)
+    fetch(node).each(&block)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scenic-oracle_adapter
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.4
 platform: ruby
 authors:
 - Chris Dinger
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-07-04 00:00:00.000000000 Z
+date: 2024-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: scenic
@@ -158,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
+rubygems_version: 3.5.4
 signing_key:
 specification_version: 4
 summary: Oracle adapter for thoughtbot/scenic