arql 0.3.5 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 754f0123178d350470df65a3b627f3ae3890a3de7668d8422429d661e1d271cf
-  data.tar.gz: 5d8241b6d7ba7fca92cd3a645138276fc2c3b0c8fb7658ba514f16794f63e26a
+  metadata.gz: 49ad54c58145e93df8e50ed2008831982b5b2274d78db75d22b074f54b807a5d
+  data.tar.gz: 9dae3245f6a5c16338cf894ecc08a44550e69b1fcef574a70b13d70016ee3a3a
 SHA512:
-  metadata.gz: 85e3b47d182b593b9a34055141192073844d257d96fbd2319e83eb3b0444c3f747fcc460819a1f8d7b51110487f00afa27c61f8ef280d49724390123c8d759f1
-  data.tar.gz: a5c8898c8384a7ed8685fe0ce758f797cbb530c627e116ad58610b854496d388063dfb0278a5c53586bd17a38740925d39ff9cc9942bda200436da597abaf644
+  metadata.gz: 486887bee40dc5fa2f5d4f857990a43026f98e73b2ede3d4a1ad9d0a7bf2c36ef46411ae102470c1545d259e11a3f4bc495998446432255be6e591bbeb89c2f6
+  data.tar.gz: be23a8df1e4a7f161a2363f467c107004e52203fe85a1c29af185d519d48bcd05a05f94017b5fe77f2dd9d981e68d441e3627da35eb84ddc869bcea790013d06

data/.gitignore

@@ -6,3 +6,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+/.idea/

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    arql (0.3.5)
+    arql (0.3.8)
       activerecord (>= 6.0.3, < 6.2.0)
       activesupport (~> 6.0.3)
       caxlsx (~> 3.0.2)
@@ -53,7 +53,7 @@ GEM
     net-ssh (6.1.0)
     net-ssh-gateway (2.0.0)
       net-ssh (>= 4.0.0)
-    nokogiri (1.13.0-x86_64-darwin)
+    nokogiri (1.13.6-x86_64-darwin)
       racc (~> 1.4)
     pry (0.13.1)
       coderay (~> 1.1)
@@ -82,7 +82,7 @@ GEM
     webrick (1.7.0)
     yard (0.9.27)
       webrick (~> 1.7.0)
-    zeitwerk (2.5.3)
+    zeitwerk (2.5.4)
 
 PLATFORMS
   ruby

data/lib/arql/app.rb

@@ -29,8 +29,14 @@ module Arql
       App.env = @options.env
       App.connect_options = connect_options
       Connection.open(App.connect_options)
+      print "Defining models..."
       @definition = Definition.new(effective_config)
+      print "\u001b[2K"
+      puts "\rModels defined"
+      print "Running initializers..."
       load_initializer!
+      print "\u001b[2K"
+      puts "\rInitializers loaded"
       App.instance = self
     end
 

data/lib/arql/commands/vd.rb

@@ -0,0 +1,46 @@
+require 'arql/vd'
+
+module Arql::Commands
+  module VD
+    class << self
+      def get_table_name(name)
+        name = name.to_s
+        return name if name =~ /^[a-z]/
+        if Object.const_defined?(name)
+          klass = Object.const_get(name)
+          return klass.table_name if klass < ActiveRecord::Base
+        end
+        name
+      end
+
+      def table_info_vd(table_name)
+        Arql::VD.new do |vd|
+          table_info(table_name).each { |row| vd << row }
+        end
+      end
+
+      def table_info(table_name)
+        t = []
+        t << ['PK', 'Name', 'SQL Type', 'Ruby Type', 'Limit', 'Precision', 'Scale', 'Default', 'Nullable', 'Comment']
+        connection = ::ActiveRecord::Base.connection
+        connection.columns(table_name).each do |column|
+          pk = if [connection.primary_key(table_name)].flatten.include?(column.name)
+                 'Y'
+               else
+                 ''
+               end
+          t << [pk, column.name, column.sql_type,
+                column.sql_type_metadata.type, column.sql_type_metadata.limit || '',
+                column.sql_type_metadata.precision || '', column.sql_type_metadata.scale || '', column.default || '',
+                column.null, column.comment || '']
+        end
+        t
+      end
+    end
+
+    Pry.commands.block_command 'vd' do |name|
+      table_name = VD::get_table_name(name)
+      VD::table_info_vd(table_name)
+    end
+  end
+end

data/lib/arql/commands.rb

@@ -5,6 +5,7 @@ require 'arql/commands/reconnect'
 require 'arql/commands/redefine'
 require 'arql/commands/show_sql'
 require 'arql/commands/sandbox'
+require 'arql/commands/vd'
 
 module Arql::Commands
 end

data/lib/arql/connection.rb

@@ -2,7 +2,10 @@ module Arql
   class Connection
     class << self
       def open(options)
+        print "Establishing DB connection to #{options[:host]}:#{options[:port]}"
         ActiveRecord::Base.establish_connection(options)
+        print "\u001b[2K"
+        puts "\rDB connection to #{options[:host]}:#{options[:port]} established\n"
         $C = ActiveRecord::Base.connection
         $C.define_singleton_method(:dump) do |filename, no_create_db=false|
           Arql::Mysqldump.new.dump_database(filename, no_create_db)

data/lib/arql/definition.rb

@@ -1,4 +1,6 @@
 require 'arql/concerns'
+require 'arql/vd'
+
 module Arql
   module Extension
     extend ActiveSupport::Concern
@@ -9,6 +11,15 @@ module Arql
       }
     end
 
+    def vd
+      VD.new do |vd|
+        vd << ['Attribute Name', 'Attribute Value', 'SQL Type', 'Comment']
+        self.class.connection.columns(self.class.table_name).each do |column|
+          vd << [column.name, read_attribute(column.name), column.sql_type, column.comment || '']
+        end
+      end
+    end
+
     def v
       t = []
       t << ['Attribute Name', 'Attribute Value', 'SQL Type', 'Comment']
@@ -49,6 +60,12 @@ module Arql
         puts Commands::Table::table_info_table(table_name)
       end
 
+      def vd
+        table_name = Commands::Table::get_table_name(name)
+        Commands::VD::table_info_vd(table_name)
+        nil
+      end
+
       def v
         table_name = Commands::Table::get_table_name(name)
         Commands::Table::table_info(table_name)
@@ -91,18 +108,21 @@ module Arql
         end
         @@models = []
         ActiveRecord::Base.connection.tap do |conn|
-          conn.tables.each do |table_name|
-            table_comment = conn.table_comment(table_name)
-            conn.primary_key(table_name).tap do |pkey|
+          tables = conn.tables
+          comments = conn.table_comment_of_tables(tables)
+          primary_keys = conn.primary_keys_of_tables(tables)
+          tables.each do |table_name|
+            table_comment = comments[table_name]
+            primary_keys[table_name].tap do |pkey|
               table_name.camelize.tap do |const_name|
                 const_name = 'Modul' if const_name == 'Module'
                 const_name = 'Clazz' if const_name == 'Class'
                 Class.new(::ArqlModel) do
                   include Arql::Extension
-                  if pkey.is_a?(Array)
+                  if pkey.is_a?(Array) && pkey.size > 1
                     self.primary_keys = pkey
                   else
-                    self.primary_key = pkey
+                    self.primary_key = pkey&.first
                   end
                   self.table_name = table_name
                   self.inheritance_column = nil
@@ -169,18 +189,29 @@ module Arql
                              end.t
                            end
                          end)
-        conn.tables.each do |table_name|
-          table_comment = conn.table_comment(table_name)
-          conn.primary_key(table_name).tap do |pkey|
+
+        tables = conn.tables
+        if conn.adapter_name == 'Mysql2'
+          require 'arql/ext/active_record/connection_adapters/abstract_mysql_adapter'
+          comments = conn.table_comment_of_tables(tables)
+          primary_keys = conn.primary_keys_of_tables(tables)
+        else
+          comments = tables.map { |t| [t, conn.table_comment(t)] }.to_h
+          primary_keys = tables.map { |t| [t, conn.primary_keys(t)] }.to_h
+        end
+
+        tables.each do |table_name|
+          table_comment = comments[table_name]
+          primary_keys[table_name].tap do |pkey|
             table_name.camelize.tap do |const_name|
               const_name = 'Modul' if const_name == 'Module'
               const_name = 'Clazz' if const_name == 'Class'
               Class.new(::ArqlModel) do
                 include Arql::Extension
-                if pkey.is_a?(Array)
+                if pkey.is_a?(Array) && pkey.size > 1
                   self.primary_keys = pkey
                 else
-                  self.primary_key = pkey
+                  self.primary_key = pkey&.first
                 end
                 self.table_name = table_name
                 self.inheritance_column = nil
@@ -229,6 +260,10 @@ module Arql
         records.t(*attrs, **options)
       end
 
+      def vd(*attrs, **options)
+        records.vd(*attrs, **options)
+      end
+
       def v
         records.v
       end

data/lib/arql/ext/active_record/connection_adapters/abstract_mysql_adapter.rb

@@ -0,0 +1,53 @@
+require 'active_record/connection_adapters/abstract_mysql_adapter'
+
+module ActiveRecord
+  module ConnectionAdapters
+    class AbstractMysqlAdapter
+
+      def extract_schema_qualified_name_of_tables(table_names)
+        table_names.map do |string|
+          schema, name = string.to_s.scan(/[^`.\s]+|`[^`]*`/)
+          schema, name = nil, schema unless name
+          [schema, name]
+        end
+      end
+
+      def quoted_scope_of_tables(names = nil)
+        extract_schema_qualified_name_of_tables(names).map do |(schema, name)|
+          scope = {}
+          scope[:schema] = schema ? quote(schema) : "database()"
+          scope[:name] = quote(name) if name
+          scope
+        end
+      end
+
+      def primary_keys_of_tables(table_names) # :nodoc:
+        raise ArgumentError unless table_names.present?
+
+        scopes = quoted_scope_of_tables(table_names)
+
+        res = query(<<~SQL, "SCHEMA")
+        SELECT table_name, column_name
+        FROM information_schema.statistics
+        WHERE index_name = 'PRIMARY'
+        AND (table_schema, table_name) in
+        (#{scopes.map { |scope| "(#{scope[:schema]}, #{scope[:name]})" }.join(', ')})
+          ORDER BY seq_in_index
+        SQL
+
+        res.group_by(&:first).map { |table, vlaues| [table, vlaues.map(&:last)] }.to_h
+      end
+
+      def table_comment_of_tables(table_names) # :nodoc:
+        scopes = quoted_scope_of_tables(table_names)
+
+        query(<<~SQL, "SCHEMA").presence.try(&:to_h)
+        SELECT table_name, table_comment
+        FROM information_schema.tables
+        WHERE (table_schema, table_name) in
+        (#{scopes.map { |scope| "(#{scope[:schema]}, #{scope[:name]})" }.join(', ')})
+        SQL
+      end
+    end
+  end
+end

data/lib/arql/ext/active_record/connection_adapters/postgresql/schema_statements.rb

@@ -0,0 +1,8 @@
+module ActiveRecord
+  module ConnectionAdapters
+    module PostgreSQL
+      module SchemaStatements
+      end
+    end
+  end
+end

data/lib/arql/ext/array.rb

@@ -1,3 +1,5 @@
+require 'arql/vd'
+
 class Array
   def to_insert_sql(batch_size=500)
     raise 'All element should be an ActiveRecord instance object' unless all? { |e| e.is_a?(ActiveRecord::Base) }
@@ -48,6 +50,33 @@ class Array
     end
   end
 
+  def vd(*attrs, **options)
+    if (attrs.present? || options.present? && options[:except]) && present? && first.is_a?(ActiveRecord::Base)
+      column_names = first.attribute_names.map(&:to_sym)
+      attrs = attrs.flat_map { |e| e.is_a?(Regexp) ? column_names.grep(e) : e }.uniq
+      if options.present? && options[:except]
+        attrs = column_names if attrs.empty?
+        if options[:except].is_a?(Regexp)
+          attrs.reject! { |e| e =~ options[:except] }
+        else
+          attrs -= [options[:except]].flatten
+        end
+      end
+
+      Arql::VD.new do |vd|
+        vd << attrs
+        each do |e|
+          vd << e.attributes.values_at(*attrs.map(&:to_s))
+        end
+      end
+    else
+      Arql::VD.new do |vd|
+        v.each { |row| vd << row if row }
+      end
+    end
+    nil
+  end
+
   def v
     return self unless present?
     t = []

data/lib/arql/ssh_proxy.rb

@@ -8,9 +8,13 @@ module Arql
       attr_accessor :config, :ssh_gateway, :local_ssh_proxy_port
 
       def connect(config)
+        print "Establishing SSH connection to #{config[:host]}:#{config[:port]}"
         @config = config
         @ssh_gateway = Net::SSH::Gateway.new(config[:host], config[:user], config.slice(:port, :password).symbolize_keys.merge(keepalive: true, keepalive_interval: 30, loop_wait: 1))
         @local_ssh_proxy_port = @ssh_gateway.open(config[:forward_host], config[:forward_port], config[:local_port])
+        print "\u001b[2K"
+        puts "\rSSH connection to #{config[:host]}:#{config[:port]} established"
+        @local_ssh_proxy_port
       end
 
       def reconnect

data/lib/arql/vd.rb

@@ -0,0 +1,42 @@
+require 'csv'
+
+module Arql
+  class VD
+    COMMAND = 'vd'
+
+    attr_accessor :rows
+
+    def initialize
+      return unless check_command_installation
+      @rows = []
+      yield self
+      command = "#{COMMAND} -f csv"
+      IO.popen(command, 'w+') do |io|
+        io.puts(csv)
+        io.close_write
+      end
+      print "\033[5q"
+    end
+
+    def <<(row)
+      rows << row
+    end
+
+    def csv
+      CSV.generate do |csv|
+        rows.each do |row|
+          csv << row
+        end
+      end
+    end
+
+    def check_command_installation
+      `which #{COMMAND}`
+      if $?.exitstatus != 0
+        puts "Please install vd (visidata) command, see: https://www.visidata.org/"
+      else
+        true
+      end
+    end
+  end
+end

data/lib/arql/version.rb

@@ -1,3 +1,3 @@
 module Arql
-  VERSION = "0.3.5"
+  VERSION = "0.3.8"
 end

data/lib/arql.rb

@@ -11,6 +11,7 @@ require "arql/ssh_proxy"
 require "arql/app"
 require "arql/cli"
 require "arql/mysqldump"
+require "arql/vd"
 
 module Arql
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arql
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.8
 platform: ruby
 authors:
 - Liu Xiang
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-04-27 00:00:00.000000000 Z
+date: 2022-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2
@@ -245,12 +245,15 @@ files:
 - lib/arql/commands/sandbox.rb
 - lib/arql/commands/show_sql.rb
 - lib/arql/commands/table.rb
+- lib/arql/commands/vd.rb
 - lib/arql/concerns.rb
 - lib/arql/concerns/global_data_definition.rb
 - lib/arql/concerns/table_data_definition.rb
 - lib/arql/connection.rb
 - lib/arql/definition.rb
 - lib/arql/ext.rb
+- lib/arql/ext/active_record/connection_adapters/abstract_mysql_adapter.rb
+- lib/arql/ext/active_record/connection_adapters/postgresql/schema_statements.rb
 - lib/arql/ext/array.rb
 - lib/arql/ext/hash.rb
 - lib/arql/ext/kernel.rb
@@ -263,6 +266,7 @@ files:
 - lib/arql/repl.rb
 - lib/arql/ssh_proxy.rb
 - lib/arql/ssh_proxy_patch.rb
+- lib/arql/vd.rb
 - lib/arql/version.rb
 homepage: https://github.com/lululau/arql
 licenses: