activerecord-dsql-adapter 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ad2818119d3d7093a3ddd37e8931c729ce600b50ed12e5cf6596f0ffa81672e
-  data.tar.gz: bc006c7e000efa466b91e64a4aafae12eb4c9fa2094d3d476c6f2b729e0feee9
+  metadata.gz: 4b576c75df39b5f6614a13458d0470b4381e4addec43940b53ae76666175c0ce
+  data.tar.gz: 3df4dc2c5b42817bc69fa7c0b2c1cc19dd0c9e063dbff9d88888472e6a759890
 SHA512:
-  metadata.gz: aabca4cd463236250820fb6676c78b16aa2df30f0dd6fab4ee36bfbf003db58212ad44140177e1a7d0c3ad223a03131de94d754f559dfb6d1801a4dc1ed88d0a
-  data.tar.gz: 7ee6a43d1f0aa09cfb84006bc10b83277f8e6f64496f9af2a546940e7db57b39b6c39862dd941b5d70b5405700f3f801194a72caef23c233d4f17a65477f3859
+  metadata.gz: 275a8d7abcbc96fee0c9cba68b34e258b0c804cb5794dc52c339d15ed7357059984730228aa9c547202c7a7f9cb7feb5b6c838a3976fac242e25a71dbae453f5
+  data.tar.gz: 92f3755515e1aa655f043cc76560ae4d82e85f71bd88a772fc79cec1ca5de1e9a7d6aca911a2f380b7972c1254fd541a24ef138184dbd54403a130b889dfc996

checksums.yaml.gz.sig

@@ -1,4 +1,3 @@
-FE��JtM��F���I��e-o�
�釽�ݺق�e�t��|�G���s�jG�A֭���%���7�eZ_�b����0‰�t{���iq'3�
 �4�Ƒ���Ɗq��j���yi"G���񶙨}�)���<`��
-���7����Xݑ(u��N
-(��K\-Ժ�8K��
-�`΂J���J���\������Y
+��wf�1E�)A�N���hjFԙA|��Ê
&��w�1� �	��頭}�g�7�v����'L�P�%j[�Cw1�������m��ԙ(�J��v��B։*p��乯�
+�뮼S3
+i��ކ�XZ

data/lib/active_record/connection_adapters/dsql_adapter.rb

@@ -7,20 +7,40 @@ require "active_record/connection_adapters/postgresql_adapter"
 
 module ActiveRecord
   module ConnectionAdapters
+    module DSQL
+      class Railtie < ::Rails::Railtie
+        rake_tasks do
+          ActiveRecord::DatabaseTasks.register_task("dsql", "ActiveRecord::Tasks::DSQLDatabaseTasks")
+        end
+      end
+    end
+
     class DSQLAdapter < PostgreSQLAdapter
       ADAPTER_NAME = "DSQL"
 
       class << self
         def new_client(conn_params)
           conn_params[:sslmode] ||= "require"
-          conn_params[:user] ||= "admin"
           conn_params[:dbname] ||= "postgres"
-
+          conn_params[:user] ||= "admin"
           conn_params[:password] ||= generate_password(conn_params)
 
           super(conn_params)
         end
 
+        def dbconsole(config, options = {})
+          config_hash = config.configuration_hash.dup
+
+          config_hash[:sslmode] ||= "require"
+          config_hash[:database] ||= "postgres"
+          config_hash[:username] ||= "admin"
+          config_hash[:password] ||= generate_password(config_hash)
+
+          config = ActiveRecord::DatabaseConfigurations::HashConfig.new(config.env_name, config.name, config_hash)
+
+          super(config, options)
+        end
+
         private
 
         def generate_password(conn_params)
@@ -35,12 +55,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
@@ -93,6 +116,46 @@ module ActiveRecord
       def supports_json?
         false
       end
+
+      # DSQL *does* support DDL transactions, but does not support mixing DDL and
+      # DML, so inserting the migration version into the schema_migrations
+      # table fails unless we turn off the DDL transaction.
+      #
+      # PG::FeatureNotSupported: ERROR: ddl and dml are not supported in the same transaction
+      #
+      def supports_ddl_transactions?
+        false
+      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
     end
   end
 end
+
+ActiveSupport.run_load_hooks(:active_record_dsql_adapter, ActiveRecord::ConnectionAdapters::DSQLAdapter)

data/lib/activerecord-dsql-adapter.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
-require "active_record"
-require "active_record/connection_adapters"
+require "active_support/lazy_load_hooks"
 
-ActiveRecord::ConnectionAdapters.register("dsql", "ActiveRecord::ConnectionAdapters::DSQLAdapter", "active_record/connection_adapters/dsql_adapter")
+ActiveSupport.on_load(:active_record) do
+  ActiveRecord::ConnectionAdapters.register("dsql", "ActiveRecord::ConnectionAdapters::DSQLAdapter", "active_record/connection_adapters/dsql_adapter")
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-dsql-adapter
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Samuel Cochran