activerecord-amazon-timestream-adapter 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 864faadd28644aa8d276fa335661e02ee37b55640cdd776c2e9f99eb2b58ff72
-  data.tar.gz: c38741466d3ea5c6a67acee2bf1ec4f5ac553eac0a840d9a4e66e8b14c8c4e86
+  metadata.gz: 40439344b1bf48a7fa48d5870fe9dc26d8d1b3d6cf26de59e74356142caec035
+  data.tar.gz: 99fd64958f63efc61c9fd473639059b1c3394e7509fb3616d6caa84d14a192bc
 SHA512:
-  metadata.gz: 72c9859c3dcc5a56f732822a85d15369a2652935e5542586ae6200ef9552ed1e29345fb25d90e6382a06f86114e1279e2228b0bf0d06bcf43e6ffadc7db849b8
-  data.tar.gz: 5ebb0ae723a08796cb58a6bc8c1f45792ae4824c8c03021eb7a80e9a36b51c8751897c0d7648ec7d2d9fb9504fe7dbae6773160643aa8a4ab9094261bb73d9d3
+  metadata.gz: 7bb934253342e57663de04d9fb2237852893676c218b48446fc052609676202c6ec6e6baa4e161fe24845989f036927ba4641292adb0e79da91466cb6abb8c27
+  data.tar.gz: 6d118754cdccdd5721c92f656819adde144a2a69f7068ec62ef1c253cbc7b21594d112d186ab9efa6b38b9f94bdb26796e86478e7c491558221c2cf713f1f291

data/lib/active_record/connection_adapters/amazon_timestream/database_statements.rb

@@ -8,7 +8,7 @@ module ActiveRecord
       module DatabaseStatements
         def execute(sql, name = nil)
           log(sql, name) do
-            @query.query({ query_string: sql })
+            @connection.query({ query_string: sql })
           end
         end
 
@@ -18,7 +18,7 @@ module ActiveRecord
 
         def exec_query(sql, name = 'SQL', binds = [])
           log(sql, name, binds) do
-            response = @query.query query_string: sql
+            response = @connection.query query_string: sql
 
             ActiveRecord::Result.new response.column_info.map(&:name),
                                      response.rows.map { |r| r.data.map(&:scalar_value) },

data/lib/active_record/connection_adapters/amazon_timestream/quoting.rb

@@ -5,7 +5,7 @@ module ActiveRecord
     module AmazonTimestream
       module Quoting
         def quote_table_name(table_name)
-          "\"#{@config[:database]}\".\"#{quote_string(table_name)}\""
+          "\"#{@database}\".\"#{quote_string(table_name)}\""
         end
       end
     end

data/lib/active_record/connection_adapters/amazon_timestream/schema_statements.rb

@@ -7,16 +7,13 @@ module ActiveRecord
     module AmazonTimestream
       module SchemaStatements
         def tables(_name = nil)
-          response = @write.list_tables database_name: @config[:database]
-
-          response.tables.map(&:table_name)
+          response = @connection.query({ query_string: "SHOW TABLES FROM \"#{@database}\"" })
+          response.rows.map { |r| r.data[0].scalar_value }
         end
 
         def columns(table_name, _name = nil)
-          response = @query.query query_string: "SELECT * FROM #{quote_table_name(table_name)} LIMIT 1"
-          response.column_info.map do |column|
-            Column.new(column.name, nil, lookup_cast_type(column.type.scalar_type))
-          end
+          response = @connection.query({ query_string: "DESCRIBE \"#{@database}\".\"#{table_name}\"" })
+          response.rows.map { |r| Column.new(r.data[0].scalar_value, nil, lookup_cast_type(r.data[1].scalar_value)) }
         end
 
         def table_exists?(_table_name)

data/lib/active_record/connection_adapters/amazon_timestream_adapter.rb

@@ -7,7 +7,6 @@ require 'active_record/connection_adapters/amazon_timestream/schema_statements'
 require 'arel/visitors/amazon_timestream'
 require 'aws-sdk-core'
 require 'aws-sdk-timestreamquery'
-require 'aws-sdk-timestreamwrite'
 
 module ActiveRecord
   class Base
@@ -16,7 +15,10 @@ module ActiveRecord
 
       raise ArgumentError, 'No database specified. Missing argument: database.' unless config.key?(:database)
 
-      ConnectionAdapters::AmazonTimestreamAdapter.new(logger, config)
+      credentials = Aws::Credentials.new config[:username], config[:password] if config[:username] && config[:password]
+      connection = Aws::TimestreamQuery::Client.new credentials: credentials
+
+      ConnectionAdapters::AmazonTimestreamAdapter.new(connection, logger, config[:database])
     end
   end
 
@@ -28,11 +30,10 @@ module ActiveRecord
       include AmazonTimestream::DatabaseStatements
       include AmazonTimestream::Quoting
 
-      def initialize(logger, config)
-        super(nil, logger)
-        @config = config
+      def initialize(connection, logger, database)
+        super(connection, logger)
+        @database = database
         @visitor = Arel::Visitors::AmazonTimestream.new self
-        connect!
       end
 
       def supports_explain?
@@ -44,10 +45,7 @@ module ActiveRecord
       end
 
       def active?
-        @query.query({ query_string: 'SELECT 1' })
         true
-      rescue StandardError
-        false
       end
 
       protected
@@ -63,17 +61,6 @@ module ActiveRecord
 
         mapping.alias_type(/unknown/i, 'varchar')
       end
-
-      private
-
-      def connect!
-        if @config[:username] && @config[:password]
-          credentials = Aws::Credentials.new(@config[:username], @config[:password])
-        end
-
-        @query = Aws::TimestreamQuery::Client.new credentials: credentials
-        @write = Aws::TimestreamWrite::Client.new credentials: credentials
-      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-amazon-timestream-adapter
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Francois Deschenes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-12 00:00:00.000000000 Z
+date: 2020-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,20 +80,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: aws-sdk-timestreamwrite
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
 description: 
 email: fdeschenes@me.com
 executables: []