activerecord-dsql-adapter 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ad2818119d3d7093a3ddd37e8931c729ce600b50ed12e5cf6596f0ffa81672e
-  data.tar.gz: bc006c7e000efa466b91e64a4aafae12eb4c9fa2094d3d476c6f2b729e0feee9
+  metadata.gz: 521857d7d6e64cb32e944b19916fee20987cede5125fbdee5ee186107551c538
+  data.tar.gz: d991051dde9b6541635ac6c9663b3086288e9acb657ffce36a567099457e6ed5
 SHA512:
-  metadata.gz: aabca4cd463236250820fb6676c78b16aa2df30f0dd6fab4ee36bfbf003db58212ad44140177e1a7d0c3ad223a03131de94d754f559dfb6d1801a4dc1ed88d0a
-  data.tar.gz: 7ee6a43d1f0aa09cfb84006bc10b83277f8e6f64496f9af2a546940e7db57b39b6c39862dd941b5d70b5405700f3f801194a72caef23c233d4f17a65477f3859
+  metadata.gz: 6f9b349d16a2a860e46e89932fd5bef016b78135542addd07395cc08ddbacb209ac98b0eff862289a42f122968b01d2a2a89b5483241fc8384a93d55fd4f569b
+  data.tar.gz: '089e5e042d90cc75c8298e7a34f89db2c795e3e63d29c606532883268ffef2c61a69e9dd2802f18fcd7c5d2ded73d2c69c3c401163df5eb50f589116020f35a2'

data/lib/active_record/connection_adapters/dsql_adapter.rb

@@ -13,14 +13,26 @@ module ActiveRecord
       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)
@@ -93,6 +105,29 @@ 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
+
+      class Railtie < ::Rails::Railtie
+        rake_tasks do
+          ActiveRecord::DatabaseTasks.register_task("dsql", "ActiveRecord::Tasks::DSQLDatabaseTasks")
+        end
+      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.2
 platform: ruby
 authors:
 - Samuel Cochran