arql 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 26a222ddbbce9305531742f9b9f160406fe36351aaac3026a1c93879de257e35
-  data.tar.gz: f324c816f59dc993fca822d5482f0ee43cd973f1659abcd2f2fa48b7fd80acd7
+  metadata.gz: 3a74b566a319ba4437d0f30010fe958105d8dd0d2c129aa4f8546ca4855ec15e
+  data.tar.gz: 97f1813e455787ccd8ef9394cde51cc4a2459769427cae004f89386db77ba528
 SHA512:
-  metadata.gz: 5935a72b159a97a09dbdcfa761ba57b4375c7d78a680569ba8cd88a6f95fb9543b9d70e56d62c0973dc6a99a11347d32f87bce5f8b9ea5335c35f3176b9e5ca4
-  data.tar.gz: 84313b888ed601eafdce1b5e1867ca7580058b575e34de9291c489b4e318966ec169bff22c1d070960f3d1cf55020e8930b2212d78300a331ce122ccc868c87e
+  metadata.gz: a6016fbb6da3857724030da6ce875e0a5889f50207026e71af1a9cc12a867165afaf6b9c4f6465750c91b01a0bbbae7f439507bfb9b02d7f1b854227793e7ffb
+  data.tar.gz: d4995846d815847ad229ca4bef01ebc722fcf0c9b4575c42f77229e0480b76e78df6a47518e14b10a2ff06c6616dae9e1aa8e962060ab40ee8eaa923e22c056c

data/.gitignore

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

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    arql (0.3.6)
+    arql (0.3.7)
       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.4-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/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,5 +1,6 @@
 require 'arql/concerns'
 require 'arql/vd'
+
 module Arql
   module Extension
     extend ActiveSupport::Concern
@@ -107,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
@@ -185,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

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

@@ -1,3 +1,3 @@
 module Arql
-  VERSION = "0.3.6"
+  VERSION = "0.3.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arql
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors:
 - Liu Xiang
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-04-27 00:00:00.000000000 Z
+date: 2022-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2
@@ -252,6 +252,8 @@ files:
 - 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