activerecord-dsql-adapter 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 521857d7d6e64cb32e944b19916fee20987cede5125fbdee5ee186107551c538
-  data.tar.gz: d991051dde9b6541635ac6c9663b3086288e9acb657ffce36a567099457e6ed5
+  metadata.gz: 4b576c75df39b5f6614a13458d0470b4381e4addec43940b53ae76666175c0ce
+  data.tar.gz: 3df4dc2c5b42817bc69fa7c0b2c1cc19dd0c9e063dbff9d88888472e6a759890
 SHA512:
-  metadata.gz: 6f9b349d16a2a860e46e89932fd5bef016b78135542addd07395cc08ddbacb209ac98b0eff862289a42f122968b01d2a2a89b5483241fc8384a93d55fd4f569b
-  data.tar.gz: '089e5e042d90cc75c8298e7a34f89db2c795e3e63d29c606532883268ffef2c61a69e9dd2802f18fcd7c5d2ded73d2c69c3c401163df5eb50f589116020f35a2'
+  metadata.gz: 275a8d7abcbc96fee0c9cba68b34e258b0c804cb5794dc52c339d15ed7357059984730228aa9c547202c7a7f9cb7feb5b6c838a3976fac242e25a71dbae453f5
+  data.tar.gz: 92f3755515e1aa655f043cc76560ae4d82e85f71bd88a772fc79cec1ca5de1e9a7d6aca911a2f380b7972c1254fd541a24ef138184dbd54403a130b889dfc996

data/lib/active_record/connection_adapters/dsql_adapter.rb

@@ -7,6 +7,14 @@ 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"
 
@@ -47,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
@@ -116,10 +127,27 @@ module ActiveRecord
         false
       end
 
-      class Railtie < ::Rails::Railtie
-        rake_tasks do
-          ActiveRecord::DatabaseTasks.register_task("dsql", "ActiveRecord::Tasks::DSQLDatabaseTasks")
-        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

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.3
 platform: ruby
 authors:
 - Samuel Cochran