activerecord-cockroachdb-adapter 0.1.1 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b89dfdfde72415ced3bb7ff0e774add61898341c
-  data.tar.gz: 8c7731b64632bea50c196351ff3405e7613958d3
+  metadata.gz: b6fb41a73e2d9ae7c9fb88f2094d14dc7b018a94
+  data.tar.gz: 5fb0b0933595b1a631b3318941b4f47b79a5b854
 SHA512:
-  metadata.gz: 96fdde05edb0d94b36f66a4eb8452397c1f1fa68e5e80947707a6b9a728be38a739ae73a43c0fb0d11928df6c2f1d3173725bc73189e13de52f9844028bcce94
-  data.tar.gz: 7788d7e75d13e3930449748d4e12e8e5e1fe679ce8dd76c5f5499faeb408aabb043687f0b6bd0eba0d54bedb4801301676645eb8a92effd7c4a98725f372ce9f
+  metadata.gz: 255858d824d22098be889a190b25454222868ee021da95ae639bd75d8e131c27ecd62a71d5f0b414ebcf414ad621daef709b1a79dc75f64683c943ceb9cb8829
+  data.tar.gz: 6b5aff467669c95beeced14051c17361f01e14f042f6d54c4edd2e094d4cc6c3a73bb3a80918e0b27752873300c0367f4ef4e76bd5020fc379b45d90599084f0

data/README.md

@@ -1,19 +1,23 @@
 # ActiveRecord CockroachDB Adapter
 
-CockroachDB adapter for ActiveRecord 5. This is a lightweight extension of the PostgreSQL adapter that establishes compatibility with [CockroachDB](https://github.com/cockroachdb/cockroach).
+CockroachDB adapter for ActiveRecord 4 and 5. This is a lightweight extension of the PostgreSQL adapter that establishes compatibility with [CockroachDB](https://github.com/cockroachdb/cockroach).
 
 ## Installation
 
 Add this line to your project's Gemfile:
 
 ```ruby
-gem 'activerecord-cockroachdb-adapter', '~> 0.1.0'
+gem 'activerecord-cockroachdb-adapter', '~> 0.2.2'
 ```
 
+If you're using Rails 4.x, use the `0.1.x` versions of this gem.
+
 In `database.yml`, use the following adapter setting:
 
 ```
 development:
   adapter: cockroachdb
   port: 26257
+  host: <hostname>
+  user: <username>
 ```

data/activerecord-cockroachdb-adapter.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "activerecord-cockroachdb-adapter"
-  spec.version       = "0.1.1"
+  spec.version       = "0.1.5"
   spec.licenses      = ["Apache-2.0"]
   spec.authors       = ["Cockroach Labs"]
   spec.email         = ["cockroach-db@googlegroups.com"]
@@ -13,7 +13,8 @@ Gem::Specification.new do |spec|
   spec.description   = "Allows the use of CockroachDB as a backend for ActiveRecord and Rails apps."
   spec.homepage      = "https://github.com/cockroachdb/activerecord-cockroachdb-adapter"
 
-  spec.add_dependency "activerecord", "~> 5.0", ">= 5.0.1"
+  spec.add_dependency "activerecord", "~> 4.2"
+  spec.add_dependency "pg", "0.20"
 
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
   # to allow pushing to a single host or delete this section to allow pushing to any host.

data/lib/active_record/connection_adapters/cockroachdb_adapter.rb

@@ -12,12 +12,13 @@ module ActiveRecord
       conn_params[:user] = conn_params.delete(:username) if conn_params[:username]
       conn_params[:dbname] = conn_params.delete(:database) if conn_params[:database]
 
-      # Forward only valid config params to PGconn.connect.
-      valid_conn_param_keys = PGconn.conndefaults_hash.keys + [:requiressl]
+      # Forward only valid config params to PG::Connection.connect.
+      valid_conn_param_keys = PG::Connection.conndefaults_hash.keys + [:requiressl]
       conn_params.slice!(*valid_conn_param_keys)
 
-      # The postgres drivers don't allow the creation of an unconnected PGconn object,
-      # so just pass a nil connection object for the time being.
+      # The postgres drivers don't allow the creation of an unconnected
+      # PG::Connection object, so just pass a nil connection object for the
+      # time being.
       ConnectionAdapters::CockroachDBAdapter.new(nil, logger, conn_params, config)
     end
   end
@@ -25,6 +26,37 @@ end
 
 class ActiveRecord::ConnectionAdapters::CockroachDBAdapter < ActiveRecord::ConnectionAdapters::PostgreSQLAdapter
   ADAPTER_NAME = "CockroachDB".freeze
+
+  # Note that in the migration from ActiveRecord 5.0 to 5.1, the
+  # `extract_schema_qualified_name` method was aliased in the PostgreSQLAdapter.
+  # To ensure backward compatibility with both <5.1 and 5.1, we rename it here
+  # to use the same original `Utils` module.
+  Utils = ActiveRecord::ConnectionAdapters::PostgreSQL::Utils
+
+  def supports_json?
+      false
+  end
+
+  def supports_ddl_transactions?
+      false
+  end
+
+  def supports_extensions?
+      false
+  end
+
+  def supports_ranges?
+      false
+  end
+
+  def supports_materialized_views?
+      false
+  end
+
+  def supports_pg_crypto_uuid?
+      false
+  end
+
   def indexes(table_name, name = nil) # :nodoc:
     # The PostgreSQL adapter uses a correlated subquery in the following query,
     # which CockroachDB does not yet support. That portion of the query fetches
@@ -37,7 +69,7 @@ class ActiveRecord::ConnectionAdapters::CockroachDBAdapter < ActiveRecord::Conne
       MSG
     end
 
-    table = extract_schema_qualified_name(table_name.to_s)
+    table = Utils.extract_schema_qualified_name(table_name.to_s)
 
     result = query(<<-SQL, "SCHEMA")
       SELECT distinct i.relname, d.indisunique, d.indkey, pg_get_indexdef(d.indexrelid), t.oid,
@@ -85,8 +117,7 @@ class ActiveRecord::ConnectionAdapters::CockroachDBAdapter < ActiveRecord::Conne
 
 
   def primary_keys(table_name)
-      # No longer necessary once Rails releases 5.1.0.
-      name = extract_schema_qualified_name(table_name.to_s)
+      name = Utils.extract_schema_qualified_name(table_name.to_s)
       select_values(<<-SQL.strip_heredoc, "SCHEMA")
       SELECT column_name
           FROM information_schema.key_column_usage kcu
@@ -101,23 +132,17 @@ class ActiveRecord::ConnectionAdapters::CockroachDBAdapter < ActiveRecord::Conne
       SQL
   end
 
-  def column_definitions(table_name)
-      # No longer necessary once Rails releases 5.1.0.
-      query(<<-end_sql, "SCHEMA")
-          SELECT a.attname, format_type(a.atttypid, a.atttypmod),
-                  pg_get_expr(d.adbin, d.adrelid), a.attnotnull, a.atttypid, a.atttypmod,
-                  c.collname, col_description(a.attrelid, a.attnum) AS comment
-          FROM pg_attribute a
-          LEFT JOIN pg_attrdef d ON a.attrelid = d.adrelid AND a.attnum = d.adnum
-          LEFT JOIN pg_type t ON a.atttypid = t.oid
-          LEFT JOIN pg_collation c ON a.attcollation = c.oid AND a.attcollation <> t.typcollation
-          WHERE a.attrelid = #{quote(quote_table_name(table_name))}::regclass
-              AND a.attnum > 0 AND NOT a.attisdropped
-          ORDER BY a.attnum
-      end_sql
-  end
-
-  private def extract_schema_qualified_name(*args)
-    ActiveRecord::ConnectionAdapters::PostgreSQL::Utils.extract_schema_qualified_name(*args)
+  # This is hardcoded to 63 (as previously was in ActiveRecord 5.0) to aid in
+  # migration from PostgreSQL to Cockroachdb. In practice, this limitation
+  # is arbitrary since CockroachDB supports index name lengths and table alias
+  # lengths far greater than this value. For the time being though, we match
+  # the original behavior for PostgreSQL to simplify migrations.
+  #
+  # Note that in the migration to ActiveRecord 5.1, this was changed in
+  # PostgreSQLAdapter to use `SHOW max_identifier_length` (which does not
+  # exist in CockroachDB). Therefore, we have to redefine this here.
+  def table_alias_length
+    63
   end
+  alias index_name_length table_alias_length
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-cockroachdb-adapter
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.5
 platform: ruby
 authors:
 - Cockroach Labs
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-09 00:00:00.000000000 Z
+date: 2017-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,20 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.0.1
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
-    - - ">="
+        version: '4.2'
+- !ruby/object:Gem::Dependency
+  name: pg
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: '0.20'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.1
+        version: '0.20'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement