activerecord-dsql-adapter 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b576c75df39b5f6614a13458d0470b4381e4addec43940b53ae76666175c0ce
-  data.tar.gz: 3df4dc2c5b42817bc69fa7c0b2c1cc19dd0c9e063dbff9d88888472e6a759890
+  metadata.gz: bba333873c829af25ffcf9a57c9eac82af22672f9b23b8ad0e868b9f207da5ae
+  data.tar.gz: 2c958e61542f81683de0dc04bae5e0b8dde6002aa2128e8f4c1e4933063f27be
 SHA512:
-  metadata.gz: 275a8d7abcbc96fee0c9cba68b34e258b0c804cb5794dc52c339d15ed7357059984730228aa9c547202c7a7f9cb7feb5b6c838a3976fac242e25a71dbae453f5
-  data.tar.gz: 92f3755515e1aa655f043cc76560ae4d82e85f71bd88a772fc79cec1ca5de1e9a7d6aca911a2f380b7972c1254fd541a24ef138184dbd54403a130b889dfc996
+  metadata.gz: 47cbd5b86957b9bc556ac3929ea2393d76363ffd0fa8ac7df96c9b8bbb2794ec5caf6c7d01c5d103b6440b2d1326fd7b37c648a7c765a4d40d5c3b4d9a3db3a6
+  data.tar.gz: 1038d78431011751fca28ecf41a9982061a1749833fe61efe8f1005d01cd09446faf8773d337cbb92bd7112bbf6d35e2d116ec5e03492c392859b609ef698553

data/README.md

@@ -35,6 +35,81 @@ dsql-example(dev)> ActiveRecord::Base.connection.execute("SELECT 1")
 => #<PG::Result:0x00000001238b39a8 status=PGRES_TUPLES_OK ntuples=1 nfields=1 cmd_tuples=1>
 ```
 
+```
+rails dbconsole -p
+psql (14.13 (Homebrew), server 16.5)
+SSL connection (protocol: TLSv1.3, cipher: TLS_AES_128_GCM_SHA256, bits: 128, compression: off)
+Type "help" for help.
+
+[postgres] >
+```
+
+```
+$ rails generate scaffold create_posts title:string body:text
+      invoke  active_record
+      create    db/migrate/20241204112954_create_posts.rb
+      create    app/models/post.rb
+      invoke  resource_route
+       route    resources :posts
+      invoke  scaffold_controller
+      create    app/controllers/posts_controller.rb
+      invoke    erb
+      create      app/views/posts
+      create      app/views/posts/index.html.erb
+      create      app/views/posts/edit.html.erb
+      create      app/views/posts/show.html.erb
+      create      app/views/posts/new.html.erb
+      create      app/views/posts/_form.html.erb
+      create      app/views/posts/_post.html.erb
+      invoke    resource_route
+      invoke    helper
+      create      app/helpers/posts_helper.rb
+
+$ rails db:migrate
+== 20241204112954 CreatePosts: migrating ======================================
+-- create_table(:posts)
+   -> 0.3887s
+== 20241204112954 CreatePosts: migrated (0.3889s) =============================
+
+$ rails console
+Loading development environment (Rails 7.2.2)
+
+pry(main)> post = Post.create!(title: "Hello, world!")
+  TRANSACTION (218.9ms)  BEGIN
+  Post Create (530.9ms)  INSERT INTO "posts" ("title", "body", "created_at", "updated_at") VALUES ($1, $2, $3, $4) RETURNING "id"  [["title", "Hello, world!"], ["body", nil], ["created_at", "2024-12-04 11:37:41.238422"], ["updated_at", "2024-12-04 11:37:41.238422"]]
+  TRANSACTION (276.7ms)  COMMIT
+=> #<Post:0x00000001267f30d8 id: "5b642ccc-c5e1-4d7c-828b-70fc107bf6e9", title: "Hello, world!", body: nil, created_at: "2024-12-04 11:37:41.238422000 +0000", updated_at: "2024-12-04 11:37:41.238422000 +0000">
+
+pry(main)> post.update!(body: "Should probably write something...")
+  TRANSACTION (221.5ms)  BEGIN
+  Post Update (503.8ms)  UPDATE "posts" SET "body" = $1, "updated_at" = $2 WHERE "posts"."id" = $3  [["body", "Should probably write something..."], ["updated_at", "2024-12-04 11:37:54.659673"], ["id", "5b642ccc-c5e1-4d7c-828b-70fc107bf6e9"]]
+  TRANSACTION (258.7ms)  COMMIT
+=> true
+
+pry(main)> post.destroy!
+  TRANSACTION (217.6ms)  BEGIN
+  Post Destroy (439.5ms)  DELETE FROM "posts" WHERE "posts"."id" = $1  [["id", "5b642ccc-c5e1-4d7c-828b-70fc107bf6e9"]]
+  TRANSACTION (230.3ms)  COMMIT
+=> #<Post:0x00000001267f30d8 id: "5b642ccc-c5e1-4d7c-828b-70fc107bf6e9", title: "Hello, world!", body: "Should probably write something...", created_at: "2024-12-04 11:37:41.238422000 +0000", updated_at: "2024-12-04 11:37:54.659673000 +0000">
+```
+
+```ruby
+# db/schema.rb
+
+ActiveRecord::Schema[7.2].define(version: 2024_12_04_112954) do
+  create_table "posts", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+    t.string "title"
+    t.text "body"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+
+    t.unique_constraint ["id"], name: "posts_id_key"
+  end
+end
+```
+
+DSQL does not support `CREATE DATABASE` so `db:create` and `db:drop` do not work. But `db:prepare` can load the schema for you.
+
 ## Development
 
 After checking out the repo, run `script/setup` to install dependencies. You can also run `script/console` for an interactive prompt that will allow you to experiment.

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/schema_statements.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module ActiveRecord
+  module ConnectionAdapters
+    module DSQL
+      module SchemaStatements
+        def add_index_options(table_name, column_name, **options) # :nodoc:
+          options[:algorithm] = :async
+          super
+        end
+      end
+    end
+  end
+end

data/lib/active_record/connection_adapters/dsql_adapter.rb

@@ -7,17 +7,11 @@ 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"
 
+      include ActiveRecord::ConnectionAdapters::DSQL::SchemaStatements
+
       class << self
         def new_client(conn_params)
           conn_params[:sslmode] ||= "require"
@@ -127,6 +121,18 @@ module ActiveRecord
         false
       end
 
+      def index_algorithms
+        { async: "ASYNC" }
+      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.
@@ -149,11 +155,10 @@ module ActiveRecord
            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,30 @@
 # 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
+      autoload :SchemaStatements
+    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,18 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-dsql-adapter
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors:
 - Samuel Cochran
-autorequire:
 bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDKDCCAhCgAwIBAgIBAzANBgkqhkiG9w0BAQsFADA6MQ0wCwYDVQQDDARzajI2
+  MIIDKDCCAhCgAwIBAgIBBDANBgkqhkiG9w0BAQsFADA6MQ0wCwYDVQQDDARzajI2
   MRQwEgYKCZImiZPyLGQBGRYEc2oyNjETMBEGCgmSJomT8ixkARkWA2NvbTAeFw0y
-  NDA3MjIwNjA3MjdaFw0yNTA3MjIwNjA3MjdaMDoxDTALBgNVBAMMBHNqMjYxFDAS
+  NTA5MDEwNTU2MDhaFw0yNjA5MDEwNTU2MDhaMDoxDTALBgNVBAMMBHNqMjYxFDAS
   BgoJkiaJk/IsZAEZFgRzajI2MRMwEQYKCZImiZPyLGQBGRYDY29tMIIBIjANBgkq
   hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsr60Eo/ttCk8GMTMFiPr3GoYMIMFvLak
   xSmTk9YGCB6UiEePB4THSSA5w6IPyeaCF/nWkDp3/BAam0eZMWG1IzYQB23TqIM0
@@ -21,29 +20,35 @@ cert_chain:
   4O/FL2ChjL2CPCpLZW55ShYyrzphWJwLOJe+FJ/ZBl6YXwrzQM9HKnt4titSNvyU
   KzE3L63A3PZvExzLrN9u09kuWLLJfXB2sGOlw3n9t72rJiuBr3/OQQIDAQABozkw
   NzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQU99dfRjEKFyczTeIz
-  m3ZsDWrNC80wDQYJKoZIhvcNAQELBQADggEBAKcQ+MfpXXDmqboG36O8mXhJZJ8+
-  zlUqM1QnoEG8XpH/29py4GzSgs6Sb+v/Z1SEArRDq0r1bKZuWiWxqEDnmSE94+pe
-  A0Ct6Pv/paEhQCoPkGQNa74cH4tzkVHIA7WSwRL8wOz5vo++YBKH5H36nNqtLV7s
-  kNJYsbeOL/w2icQ4b0w4KYgcs4bd6yrYdgcgsRd2sCYb2XFHjczYqw4iEwuUenNM
-  G8WXc9zUMVewWkEjS9s++xFNb/7f4dFNXCoE3pgHjzctt7gYcJVacprsg925LYHO
-  WsbnbEow7BPlYOZm3rDIsEYpWqxN0lR8BakO2ToJ5RAHXahFu4K4eJtAsLk=
+  m3ZsDWrNC80wDQYJKoZIhvcNAQELBQADggEBABLxSFRmde7YPaefFvqzjWZ7snrT
+  /QdsnhlLypvIUeGCuLemQKq5sO7YFJ4UUnYbzrhPScnh5odx0XuXDWLN2Xr7Sz9A
+  cw4c0gEWhZAv5xm9taOyw0Wuy2u7RNeAgLikufrIdr+Fei4fj0zEzdUQs6OxDZBV
+  ZJpG1F3YsIupbaQEFZFOMoP111ziIeddeS/+xJYB9iXxWdgBcKgPchpPjp//D1kk
+  rbxUJAPpJ+AnctA9Kgqa7b71x6DG8aFCTN3TUGKpQUnt5Qe6eynYnNBQ+yyo8J8r
+  rVaBG/8I33rEoBAyw3BuV44TS7DG1kGbv4DOByI46JFAZU4aLEr6lpAmvPs=
   -----END CERTIFICATE-----
-date: 2024-12-04 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 7.2.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 7.2.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '9'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -72,7 +77,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description:
 email:
 - sj26@sj26.com
 executables: []
@@ -80,7 +84,11 @@ 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/schema_statements.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: []
@@ -88,7 +96,6 @@ metadata:
   homepage_uri: https://github.com/sj26/activerecord-dsql-adapter
   source_code_uri: https://github.com/sj26/activerecord-dsql-adapter
   changelog_uri: https://github.com/sj26/activerecord-dsql-adapter/releases
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -103,8 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.16
-signing_key:
+rubygems_version: 3.7.2
 specification_version: 4
 summary: ActiveRecord adapter for AWS Aurora DSQL (PostgreSQL)
 test_files: []