activerecord-dsql-adapter 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 521857d7d6e64cb32e944b19916fee20987cede5125fbdee5ee186107551c538
-  data.tar.gz: d991051dde9b6541635ac6c9663b3086288e9acb657ffce36a567099457e6ed5
+  metadata.gz: a2a6400458dc398fea1b2033dd3fe8c8e488808c71f459dfe693cc905b8ceebc
+  data.tar.gz: 50eceb300ff89ca6f93aff37165794a32760a3d242f84be60779d0a8a00d3302
 SHA512:
-  metadata.gz: 6f9b349d16a2a860e46e89932fd5bef016b78135542addd07395cc08ddbacb209ac98b0eff862289a42f122968b01d2a2a89b5483241fc8384a93d55fd4f569b
-  data.tar.gz: '089e5e042d90cc75c8298e7a34f89db2c795e3e63d29c606532883268ffef2c61a69e9dd2802f18fcd7c5d2ded73d2c69c3c401163df5eb50f589116020f35a2'
+  metadata.gz: abcb7ee0f219fbf922ee539b03becb54bdcdb600a0685bde8415c0886319296c90ea8c15d5ee0ccd8428f162c1d1b2bb597d42e4c1e751ab14f8bfd8e91d8987
+  data.tar.gz: 664df396b1edb20293c1a22bec8647a321f0f4224e8e6e352ed78b51568774fee07dcee443b48691d6ce25cf4eef6f694066792db34b8e50b0867ab9cd7c2d91

data/lib/active_record/connection_adapters/dsql/railtie.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module ActiveRecord
+  module ConnectionAdapters
+    module DSQL
+      class Railtie < ::Rails::Railtie
+        rake_tasks do
+          ActiveRecord::Tasks::DatabaseTasks.register_task("dsql", "ActiveRecord::Tasks::DSQLDatabaseTasks")
+        end
+      end
+    end
+  end
+end

data/lib/active_record/connection_adapters/dsql/schema_dumper.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module ActiveRecord
+  module ConnectionAdapters
+    module DSQL
+      class SchemaDumper < PostgreSQL::SchemaDumper # :nodoc:
+        private
+
+        def extensions(stream)
+          # Ignore extensions
+        end
+      end
+    end
+  end
+end

data/lib/active_record/connection_adapters/dsql_adapter.rb

@@ -47,12 +47,15 @@ module ActiveRecord
         end
       end
 
-      # DSQL doesn't support serial or bigserial
-
+      # DSQL doesn't support serial or bigserial, nor sequences, but seems to
+      # endorse using uuid with default random function uuids for primary keys
+      #
+      # https://docs.aws.amazon.com/aurora-dsql/latest/userguide/getting-started.html
+      #
       def self.native_database_types # :nodoc:
         @native_database_types ||= begin
           types = NATIVE_DATABASE_TYPES.dup
-          types[:primary_key] = "bigint primary key"
+          types[:primary_key] = "uuid primary key unique default gen_random_uuid()"
           types[:datetime] = types[datetime_type]
           types
         end
@@ -116,16 +119,40 @@ module ActiveRecord
         false
       end
 
-      class Railtie < ::Rails::Railtie
-        rake_tasks do
-          ActiveRecord::DatabaseTasks.register_task("dsql", "ActiveRecord::Tasks::DSQLDatabaseTasks")
-        end
+      # Ignore DSQL sys schema.
+      #
+      # https://docs.aws.amazon.com/aurora-dsql/latest/userguide/working-with-systems-tables.html
+      #
+      def schema_names
+        super - ["sys"]
+      end
+
+      # DSQL creates a primary key index which INCLUDES all columns in the
+      # table. We use indnkeyatts to only take notice of key (not INCLUDE-ed)
+      # columns for the primary key.
+      #
+      # https://www.postgresql.org/docs/current/catalog-pg-index.html
+      #
+      def primary_keys(table_name) # :nodoc:
+        query_values(<<~SQL, "SCHEMA")
+          SELECT a.attname
+            FROM (
+                   SELECT indrelid, indnkeyatts, indkey, generate_subscripts(indkey, 1) idx
+                     FROM pg_index
+                    WHERE indrelid = #{quote(quote_table_name(table_name))}::regclass
+                      AND indisprimary
+                 ) i
+            JOIN pg_attribute a
+              ON a.attrelid = i.indrelid
+             AND a.attnum = i.indkey[i.idx]
+           WHERE i.idx < i.indnkeyatts
+           ORDER BY i.idx
+        SQL
       end
-    end
-  end
 
-  module Tasks
-    class DSQLDatabaseTasks < PostgreSQLDatabaseTasks
+      def create_schema_dumper(options) # :nodoc:
+        DSQL::SchemaDumper.create(self, options)
+      end
     end
   end
 end

data/lib/active_record/tasks/dsql_database_tasks.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require "active_record"
+require "active_record/tasks/postgresql_database_tasks"
+
+module ActiveRecord
+  module Tasks
+    class DSQLDatabaseTasks < PostgreSQLDatabaseTasks
+      def initialize(config)
+        config_hash = config.configuration_hash.dup
+
+        config_hash[:sslmode] ||= "require"
+        config_hash[:database] ||= "postgres"
+        config_hash[:username] ||= "admin"
+
+        config = ActiveRecord::DatabaseConfigurations::HashConfig.new(config.env_name, config.name, config_hash)
+
+        super(config)
+      end
+
+      def create(...)
+        fail "DSQL does not support CREATE DATABASE"
+      end
+
+      def drop(...)
+        fail "DSQL does not support DROP DATABASE"
+      end
+    end
+  end
+end

data/lib/activerecord-dsql-adapter.rb

@@ -1,7 +1,29 @@
 # frozen_string_literal: true
 
-require "active_support/lazy_load_hooks"
+require "active_record"
 
 ActiveSupport.on_load(:active_record) do
   ActiveRecord::ConnectionAdapters.register("dsql", "ActiveRecord::ConnectionAdapters::DSQLAdapter", "active_record/connection_adapters/dsql_adapter")
 end
+
+module ActiveRecord
+  module ConnectionAdapters
+    module DSQL
+      extend ActiveSupport::Autoload
+
+      autoload :SchemaDumper
+    end
+  end
+end
+
+module ActiveRecord
+  module Tasks
+    extend ActiveSupport::Autoload
+
+    autoload :DSQLDatabaseTasks,  "active_record/tasks/dsql_database_tasks"
+  end
+end
+
+if defined? Rails
+  require "active_record/connection_adapters/dsql/railtie"
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-dsql-adapter
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - Samuel Cochran
@@ -80,7 +80,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - README.md
+- lib/active_record/connection_adapters/dsql/railtie.rb
+- lib/active_record/connection_adapters/dsql/schema_dumper.rb
 - lib/active_record/connection_adapters/dsql_adapter.rb
+- lib/active_record/tasks/dsql_database_tasks.rb
 - lib/activerecord-dsql-adapter.rb
 homepage: https://github.com/sj26/activerecord-dsql-adapter
 licenses: []