ovirt_metrics 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ffd084cdcd5c83f2b33a5f3be6d484bc18e5692dcd25b1733dc4217159fc4b8
-  data.tar.gz: d4c597c0ed52ffd470f5e58409b8002e579c03fd45de8cba1e4e5da38bb1e5dd
+  metadata.gz: 1af74e7888e42f106793d65f064e8ef47f4660a704f8a04d89c231c7ed652c1a
+  data.tar.gz: 7cbfc1fbf819d4c4164aea5f9207f69a26ed9e6ad2a1fc1258925f70751f7a7d
 SHA512:
-  metadata.gz: 4ff0a5552bb9aba180e47cfe4323d4a339620fdb66d9f599fda37882a54572dcc3821cad58c836995d4ad45cf8cd0213038842d1fb813b177085527a93b297b8
-  data.tar.gz: 76e40dacb3023e84f38710cda3a6a643cac7e82b81ee0c41e543e5b68612504df62d6decea25434ba8c17f00626f27400ee34f3cd9e4ab41aee3ea68e476737d
+  metadata.gz: c95385d550ae26e15bdeef7b02d419afbd8ce0443aced77aa863921977271fa7acb2f7edd9ddea9a093b62809e15e8d7a30deb0470a2eea2daeca6fd021db822
+  data.tar.gz: a1a8eccd66bfe8754e326c6ce9888259b4adfb359a2f919f3eb9427f227a53e6a32d28d32454d61d7988986e47389872a56d7490d12dc6deeaefae62876e2385

data/lib/active_record/connection_adapters/ovirt_postgresql_adapter.rb

@@ -0,0 +1,30 @@
+module ActiveRecord
+  module ConnectionHandling # :nodoc:
+    def ovirt_postgresql_connection(config)
+      conn_params = config.symbolize_keys
+
+      conn_params.delete_if { |_, v| v.nil? }
+
+      conn_params[:user] = conn_params.delete(:username) if conn_params[:username]
+      conn_params[:dbname] = conn_params.delete(:database) if conn_params[:database]
+
+      valid_conn_param_keys = PG::Connection.conndefaults_hash.keys + [:requiressl]
+      conn_params.slice!(*valid_conn_param_keys)
+
+      ConnectionAdapters::OvirtPostgreSQLAdapter.new(nil, logger, conn_params, config)
+    end
+  end
+
+  module ConnectionAdapters
+    class OvirtPostgreSQLAdapter < PostgreSQLAdapter
+      ADAPTER_NAME = "OvirtPostgreSQL"
+
+      def check_version
+        msg = "The version of PostgreSQL (#{postgresql_version}) is too old (9.2+ required)"
+        if postgresql_version < 90200
+          raise msg
+        end
+      end
+    end
+  end
+end

data/lib/ovirt_metrics.rb

@@ -27,7 +27,10 @@ module OvirtMetrics
     opts            ||= {}
     opts[:port]     ||= 5432
     opts[:database] ||= DEFAULT_HISTORY_DATABASE_NAME
-    opts[:adapter]    = 'postgresql'
+    opts[:adapter] = begin
+                       require "active_record/connection_adapters/ovirt_postgresql_adapter"
+                       'ovirt_postgresql'
+                     end
 
     # Don't allow accidental connections to localhost.  A blank host will
     # connect to localhost, so don't allow that at all.

data/lib/ovirt_metrics/version.rb

@@ -1,3 +1,3 @@
 module OvirtMetrics
-  VERSION = "3.0.0"
+  VERSION = "3.0.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ovirt_metrics
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Oleg Barenboim
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-23 00:00:00.000000000 Z
+date: 2019-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -135,39 +135,7 @@ files:
 - ".rspec"
 - LICENSE.txt
 - README.md
-- lib/active_record/connection_adapters/ovirt_legacy_postgresql/column.rb
-- lib/active_record/connection_adapters/ovirt_legacy_postgresql/database_statements.rb
-- lib/active_record/connection_adapters/ovirt_legacy_postgresql/explain_pretty_printer.rb
-- lib/active_record/connection_adapters/ovirt_legacy_postgresql/oid.rb
-- lib/active_record/connection_adapters/ovirt_legacy_postgresql/oid/array.rb
-- lib/active_record/connection_adapters/ovirt_legacy_postgresql/oid/bit.rb
-- lib/active_record/connection_adapters/ovirt_legacy_postgresql/oid/bit_varying.rb
-- lib/active_record/connection_adapters/ovirt_legacy_postgresql/oid/bytea.rb
-- lib/active_record/connection_adapters/ovirt_legacy_postgresql/oid/cidr.rb
-- lib/active_record/connection_adapters/ovirt_legacy_postgresql/oid/date_time.rb
-- lib/active_record/connection_adapters/ovirt_legacy_postgresql/oid/decimal.rb
-- lib/active_record/connection_adapters/ovirt_legacy_postgresql/oid/enum.rb
-- lib/active_record/connection_adapters/ovirt_legacy_postgresql/oid/hstore.rb
-- lib/active_record/connection_adapters/ovirt_legacy_postgresql/oid/inet.rb
-- lib/active_record/connection_adapters/ovirt_legacy_postgresql/oid/json.rb
-- lib/active_record/connection_adapters/ovirt_legacy_postgresql/oid/jsonb.rb
-- lib/active_record/connection_adapters/ovirt_legacy_postgresql/oid/money.rb
-- lib/active_record/connection_adapters/ovirt_legacy_postgresql/oid/point.rb
-- lib/active_record/connection_adapters/ovirt_legacy_postgresql/oid/rails_5_1_point.rb
-- lib/active_record/connection_adapters/ovirt_legacy_postgresql/oid/range.rb
-- lib/active_record/connection_adapters/ovirt_legacy_postgresql/oid/specialized_string.rb
-- lib/active_record/connection_adapters/ovirt_legacy_postgresql/oid/type_map_initializer.rb
-- lib/active_record/connection_adapters/ovirt_legacy_postgresql/oid/uuid.rb
-- lib/active_record/connection_adapters/ovirt_legacy_postgresql/oid/vector.rb
-- lib/active_record/connection_adapters/ovirt_legacy_postgresql/oid/xml.rb
-- lib/active_record/connection_adapters/ovirt_legacy_postgresql/quoting.rb
-- lib/active_record/connection_adapters/ovirt_legacy_postgresql/referential_integrity.rb
-- lib/active_record/connection_adapters/ovirt_legacy_postgresql/schema_definitions.rb
-- lib/active_record/connection_adapters/ovirt_legacy_postgresql/schema_dumper.rb
-- lib/active_record/connection_adapters/ovirt_legacy_postgresql/schema_statements.rb
-- lib/active_record/connection_adapters/ovirt_legacy_postgresql/type_metadata.rb
-- lib/active_record/connection_adapters/ovirt_legacy_postgresql/utils.rb
-- lib/active_record/connection_adapters/ovirt_legacy_postgresql_adapter.rb
+- lib/active_record/connection_adapters/ovirt_postgresql_adapter.rb
 - lib/ovirt_metrics.rb
 - lib/ovirt_metrics/column_definitions.rb
 - lib/ovirt_metrics/configurator.rb

data/lib/active_record/connection_adapters/ovirt_legacy_postgresql/column.rb

@@ -1,15 +0,0 @@
-module ActiveRecord
-  module ConnectionAdapters
-    # PostgreSQL-specific extensions to column definitions in a table.
-    class OvirtLegacyPostgreSQLColumn < Column #:nodoc:
-      delegate :array, :oid, :fmod, to: :sql_type_metadata
-      alias :array? :array
-
-      def serial?
-        return unless default_function
-
-        %r{\Anextval\('"?#{table_name}_#{name}_seq"?'::regclass\)\z} === default_function
-      end
-    end
-  end
-end

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

@@ -1,170 +0,0 @@
-module ActiveRecord
-  module ConnectionAdapters
-    module OvirtLegacyPostgreSQL
-      module DatabaseStatements
-        def explain(arel, binds = [])
-          sql = "EXPLAIN #{to_sql(arel, binds)}"
-          OvirtLegacyPostgreSQL::ExplainPrettyPrinter.new.pp(exec_query(sql, 'EXPLAIN', binds))
-        end
-
-        def select_value(arel, name = nil, binds = [])
-          arel, binds = binds_from_relation arel, binds
-          sql = to_sql(arel, binds)
-          execute_and_clear(sql, name, binds) do |result|
-            result.getvalue(0, 0) if result.ntuples > 0 && result.nfields > 0
-          end
-        end
-
-        def select_values(arel, name = nil, binds = [])
-          arel, binds = binds_from_relation arel, binds
-          sql = to_sql(arel, binds)
-          execute_and_clear(sql, name, binds) do |result|
-            if result.nfields > 0
-              result.column_values(0)
-            else
-              []
-            end
-          end
-        end
-
-        # Executes a SELECT query and returns an array of rows. Each row is an
-        # array of field values.
-        def select_rows(sql, name = nil, binds = [])
-          execute_and_clear(sql, name, binds) do |result|
-            result.values
-          end
-        end
-
-        # The internal PostgreSQL identifier of the money data type.
-        MONEY_COLUMN_TYPE_OID = 790 #:nodoc:
-        # The internal PostgreSQL identifier of the BYTEA data type.
-        BYTEA_COLUMN_TYPE_OID = 17 #:nodoc:
-
-        # create a 2D array representing the result set
-        def result_as_array(res) #:nodoc:
-          # check if we have any binary column and if they need escaping
-          ftypes = Array.new(res.nfields) do |i|
-            [i, res.ftype(i)]
-          end
-
-          rows = res.values
-          return rows unless ftypes.any? { |_, x|
-            x == BYTEA_COLUMN_TYPE_OID || x == MONEY_COLUMN_TYPE_OID
-          }
-
-          typehash = ftypes.group_by { |_, type| type }
-          binaries = typehash[BYTEA_COLUMN_TYPE_OID] || []
-          monies   = typehash[MONEY_COLUMN_TYPE_OID] || []
-
-          rows.each do |row|
-            # unescape string passed BYTEA field (OID == 17)
-            binaries.each do |index, _|
-              row[index] = unescape_bytea(row[index])
-            end
-
-            # If this is a money type column and there are any currency symbols,
-            # then strip them off. Indeed it would be prettier to do this in
-            # OvirtLegacyPostgreSQLColumn.string_to_decimal but would break form input
-            # fields that call value_before_type_cast.
-            monies.each do |index, _|
-              data = row[index]
-              # Because money output is formatted according to the locale, there are two
-              # cases to consider (note the decimal separators):
-              #  (1) $12,345,678.12
-              #  (2) $12.345.678,12
-              case data
-              when /^-?\D+[\d,]+\.\d{2}$/  # (1)
-                data.gsub!(/[^-\d.]/, '')
-              when /^-?\D+[\d.]+,\d{2}$/  # (2)
-                data.gsub!(/[^-\d,]/, '').sub!(/,/, '.')
-              end
-            end
-          end
-        end
-
-        # Queries the database and returns the results in an Array-like object
-        def query(sql, name = nil) #:nodoc:
-          log(sql, name) do
-            result_as_array @connection.async_exec(sql)
-          end
-        end
-
-        # Executes an SQL statement, returning a PGresult object on success
-        # or raising a PGError exception otherwise.
-        # Note: the PGresult object is manually memory managed; if you don't
-        # need it specifically, you many want consider the exec_query wrapper.
-        def execute(sql, name = nil)
-          log(sql, name) do
-            @connection.async_exec(sql)
-          end
-        end
-
-        def exec_query(sql, name = 'SQL', binds = [], prepare: false)
-          execute_and_clear(sql, name, binds, prepare: prepare) do |result|
-            types = {}
-            fields = result.fields
-            fields.each_with_index do |fname, i|
-              ftype = result.ftype i
-              fmod  = result.fmod i
-              types[fname] = get_oid_type(ftype, fmod, fname)
-            end
-            ActiveRecord::Result.new(fields, result.values, types)
-          end
-        end
-
-        def exec_delete(sql, name = 'SQL', binds = [])
-          execute_and_clear(sql, name, binds) {|result| result.cmd_tuples }
-        end
-        alias :exec_update :exec_delete
-
-        def sql_for_insert(sql, pk, id_value, sequence_name, binds) # :nodoc:
-          if pk.nil?
-            # Extract the table from the insert sql. Yuck.
-            table_ref = extract_table_ref_from_insert_sql(sql)
-            pk = primary_key(table_ref) if table_ref
-          end
-
-          if pk && use_insert_returning?
-            sql = "#{sql} RETURNING #{quote_column_name(pk)}"
-          end
-
-          super
-        end
-
-        def exec_insert(sql, name, binds, pk = nil, sequence_name = nil)
-          val = exec_query(sql, name, binds)
-          if !use_insert_returning? && pk
-            unless sequence_name
-              table_ref = extract_table_ref_from_insert_sql(sql)
-              sequence_name = default_sequence_name(table_ref, pk)
-              return val unless sequence_name
-            end
-            last_insert_id_result(sequence_name)
-          else
-            val
-          end
-        end
-
-        # Begins a transaction.
-        def begin_db_transaction
-          execute "BEGIN"
-        end
-
-        def begin_isolated_db_transaction(isolation)
-          begin_db_transaction
-          execute "SET TRANSACTION ISOLATION LEVEL #{transaction_isolation_levels.fetch(isolation)}"
-        end
-
-        # Commits a transaction.
-        def commit_db_transaction
-          execute "COMMIT"
-        end
-
-        # Aborts a transaction.
-        def exec_rollback_db_transaction
-          execute "ROLLBACK"
-        end
-      end
-    end
-  end
-end

data/lib/active_record/connection_adapters/ovirt_legacy_postgresql/explain_pretty_printer.rb

@@ -1,42 +0,0 @@
-module ActiveRecord
-  module ConnectionAdapters
-    module OvirtLegacyPostgreSQL
-      class ExplainPrettyPrinter # :nodoc:
-        # Pretty prints the result of an EXPLAIN in a way that resembles the output of the
-        # PostgreSQL shell:
-        #
-        #                                     QUERY PLAN
-        #   ------------------------------------------------------------------------------
-        #    Nested Loop Left Join  (cost=0.00..37.24 rows=8 width=0)
-        #      Join Filter: (posts.user_id = users.id)
-        #      ->  Index Scan using users_pkey on users  (cost=0.00..8.27 rows=1 width=4)
-        #            Index Cond: (id = 1)
-        #      ->  Seq Scan on posts  (cost=0.00..28.88 rows=8 width=4)
-        #            Filter: (posts.user_id = 1)
-        #   (6 rows)
-        #
-        def pp(result)
-          header = result.columns.first
-          lines  = result.rows.map(&:first)
-
-          # We add 2 because there's one char of padding at both sides, note
-          # the extra hyphens in the example above.
-          width = [header, *lines].map(&:length).max + 2
-
-          pp = []
-
-          pp << header.center(width).rstrip
-          pp << '-' * width
-
-          pp += lines.map {|line| " #{line}"}
-
-          nrows = result.rows.length
-          rows_label = nrows == 1 ? 'row' : 'rows'
-          pp << "(#{nrows} #{rows_label})"
-
-          pp.join("\n") + "\n"
-        end
-      end
-    end
-  end
-end

data/lib/active_record/connection_adapters/ovirt_legacy_postgresql/oid.rb

@@ -1,31 +0,0 @@
-require 'active_record/connection_adapters/ovirt_legacy_postgresql/oid/array'
-require 'active_record/connection_adapters/ovirt_legacy_postgresql/oid/bit'
-require 'active_record/connection_adapters/ovirt_legacy_postgresql/oid/bit_varying'
-require 'active_record/connection_adapters/ovirt_legacy_postgresql/oid/bytea'
-require 'active_record/connection_adapters/ovirt_legacy_postgresql/oid/cidr'
-require 'active_record/connection_adapters/ovirt_legacy_postgresql/oid/date_time'
-require 'active_record/connection_adapters/ovirt_legacy_postgresql/oid/decimal'
-require 'active_record/connection_adapters/ovirt_legacy_postgresql/oid/enum'
-require 'active_record/connection_adapters/ovirt_legacy_postgresql/oid/hstore'
-require 'active_record/connection_adapters/ovirt_legacy_postgresql/oid/inet'
-require 'active_record/connection_adapters/ovirt_legacy_postgresql/oid/json'
-require 'active_record/connection_adapters/ovirt_legacy_postgresql/oid/jsonb'
-require 'active_record/connection_adapters/ovirt_legacy_postgresql/oid/money'
-require 'active_record/connection_adapters/ovirt_legacy_postgresql/oid/point'
-require 'active_record/connection_adapters/ovirt_legacy_postgresql/oid/rails_5_1_point'
-require 'active_record/connection_adapters/ovirt_legacy_postgresql/oid/range'
-require 'active_record/connection_adapters/ovirt_legacy_postgresql/oid/specialized_string'
-require 'active_record/connection_adapters/ovirt_legacy_postgresql/oid/uuid'
-require 'active_record/connection_adapters/ovirt_legacy_postgresql/oid/vector'
-require 'active_record/connection_adapters/ovirt_legacy_postgresql/oid/xml'
-
-require 'active_record/connection_adapters/ovirt_legacy_postgresql/oid/type_map_initializer'
-
-module ActiveRecord
-  module ConnectionAdapters
-    module OvirtLegacyPostgreSQL
-      module OID # :nodoc:
-      end
-    end
-  end
-end

data/lib/active_record/connection_adapters/ovirt_legacy_postgresql/oid/array.rb

@@ -1,70 +0,0 @@
-module ActiveRecord
-  module ConnectionAdapters
-    module OvirtLegacyPostgreSQL
-      module OID # :nodoc:
-        class Array < Type::Value # :nodoc:
-          include Type::Helpers::Mutable
-
-          attr_reader :subtype, :delimiter
-          delegate :type, :user_input_in_time_zone, :limit, to: :subtype
-
-          def initialize(subtype, delimiter = ',')
-            @subtype = subtype
-            @delimiter = delimiter
-
-            @pg_encoder = PG::TextEncoder::Array.new name: "#{type}[]", delimiter: delimiter
-            @pg_decoder = PG::TextDecoder::Array.new name: "#{type}[]", delimiter: delimiter
-          end
-
-          def deserialize(value)
-            if value.is_a?(::String)
-              type_cast_array(@pg_decoder.decode(value), :deserialize)
-            else
-              super
-            end
-          end
-
-          def cast(value)
-            if value.is_a?(::String)
-              value = @pg_decoder.decode(value)
-            end
-            type_cast_array(value, :cast)
-          end
-
-          def serialize(value)
-            if value.is_a?(::Array)
-              @pg_encoder.encode(type_cast_array(value, :serialize))
-            else
-              super
-            end
-          end
-
-          def ==(other)
-            other.is_a?(Array) &&
-              subtype == other.subtype &&
-              delimiter == other.delimiter
-          end
-
-          def type_cast_for_schema(value)
-            return super unless value.is_a?(::Array)
-            "[" + value.map { |v| subtype.type_cast_for_schema(v) }.join(", ") + "]"
-          end
-
-          def map(value, &block)
-            value.map(&block)
-          end
-
-          private
-
-          def type_cast_array(value, method)
-            if value.is_a?(::Array)
-              value.map { |item| type_cast_array(item, method) }
-            else
-              @subtype.public_send(method, value)
-            end
-          end
-        end
-      end
-    end
-  end
-end