arql 0.2.4 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bcf50149ad9ded8d667ea9afc40dea78d432525c8c62fe4f33d0d164e02acb81
-  data.tar.gz: a6fd83949c0c87f1d4891fae1a8fb0fa65e13a48f9e8ddb327b02f499bdbc73a
+  metadata.gz: 547372d219f1903fb2ea57628747977c703cc394ce0b80653c4240268f634da0
+  data.tar.gz: bf3b769511f63c366f97011b52cc6227fe062db18ed82171a071718b9e1ad093
 SHA512:
-  metadata.gz: 9f73ccc2e3669a6f10fa7555737d09fadec7e0c0457c5b8819dae65055aa6a045153cce2137ccf9a9742f509d9f5c8567fd617e9f3dda7e2136935cf3686a2f3
-  data.tar.gz: ca3d6d547e8267066d72a6e67b09012b42b2e4defa36669c8b304707dc434cd6194a84a201c0fac8d3ed3f749ca017f2b4eaba6ce1f0a3813cfab34140827bc5
+  metadata.gz: 387959d7154d8aa3893f9fce185b156c12302effd413ba9a3ca40749061c3cf4fa20c8352a8cc68fc0318e86cb3abbd9318ba2befd2ea42710a81aa01d47bc7f
+  data.tar.gz: 309295ae45053888434f888eef6fd46b881024837f8a5bb20a83d31fbf84de34b7fa06e4eada8ee714d1ce6e12f33a2fdb993d6d50f4f804eb13f70aa3f19cf8

data/Gemfile.lock

@@ -1,10 +1,11 @@
 PATH
   remote: .
   specs:
-    arql (0.2.4)
+    arql (0.2.9)
       activerecord (~> 6.0.3)
       activesupport (~> 6.0.3)
       caxlsx (~> 3.0.2)
+      composite_primary_keys (~> 12.0.3)
       mysql2 (~> 0.5.3)
       net-ssh-gateway (~> 2.0.0)
       pry (~> 0.13.1)
@@ -19,12 +20,12 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (6.0.3.3)
-      activesupport (= 6.0.3.3)
-    activerecord (6.0.3.3)
-      activemodel (= 6.0.3.3)
-      activesupport (= 6.0.3.3)
-    activesupport (6.0.3.3)
+    activemodel (6.0.3.4)
+      activesupport (= 6.0.3.4)
+    activerecord (6.0.3.4)
+      activemodel (= 6.0.3.4)
+      activesupport (= 6.0.3.4)
+    activesupport (6.0.3.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -37,6 +38,8 @@ GEM
       nokogiri (~> 1.10, >= 1.10.4)
       rubyzip (>= 1.3.0, < 3)
     coderay (1.1.3)
+    composite_primary_keys (12.0.3)
+      activerecord (~> 6.0.0)
     concurrent-ruby (1.1.7)
     htmlentities (4.3.4)
     i18n (1.8.5)
@@ -71,11 +74,11 @@ GEM
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
     thread_safe (0.3.6)
-    tzinfo (1.2.7)
+    tzinfo (1.2.8)
       thread_safe (~> 0.1)
     unicode-display_width (1.7.0)
     yard (0.9.25)
-    zeitwerk (2.4.0)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby

data/arql.gemspec

@@ -29,6 +29,7 @@ Gem::Specification.new do |spec|
   # spec.add_dependency 'activerecord-sqlserver-adapter'
   # spec.add_dependency 'activerecord-oracle_enhanced-adapter'
   spec.add_dependency 'activerecord', '~> 6.0.3'
+  spec.add_dependency 'composite_primary_keys', '~> 12.0.3'
   spec.add_dependency 'activesupport', '~> 6.0.3'
   spec.add_dependency 'net-ssh-gateway', '~> 2.0.0'
   spec.add_dependency 'pry', '~> 0.13.1'

data/lib/arql/app.rb

@@ -22,6 +22,7 @@ module Arql
     def initialize(options)
       require 'active_support/all'
       require 'active_record'
+      require 'composite_primary_keys'
       require "arql/connection"
       require "arql/definition"
       @options = options

data/lib/arql/commands/models.rb

@@ -5,25 +5,29 @@ module Arql::Commands
     class << self
       def models
         t = []
-        t << ['Table Name', 'Model Class', 'Abbr']
+        t << ['Table Name', 'Model Class', 'Abbr', 'Comment']
         t << nil
         Arql::Definition.models.each do |definition|
-          t << [definition[:table], definition[:model].name, definition[:abbr] || '']
+          t << [definition[:table], definition[:model].name, definition[:abbr] || '', definition[:comment] || '']
         end
         t
       end
 
-      def models_table
+      def models_table(regexp)
         Terminal::Table.new do |t|
-          models.each { |row| t << (row || :separator) }
+          models.each_with_index { |row, idx| t << (row || :separator) if row.nil? ||
+            regexp.nil? ||
+            idx.zero? ||
+            row.any? { |e| e =~ regexp }
+          }
         end
       end
     end
   end
 
-  Pry.commands.block_command 'm' do
+  Pry.commands.block_command 'm' do |regexp|
     puts
-    puts Models::models_table
+    puts Models::models_table(regexp.try { |e| e.start_with?('/') ? eval(e) : Regexp.new(e) })
   end
 
   Pry.commands.alias_command 'l', 'm'

data/lib/arql/commands/table.rb

@@ -25,7 +25,7 @@ module Arql::Commands
         t << nil
         connection = ::ActiveRecord::Base.connection
         connection.columns(table_name).each do |column|
-          pk = if column.name == connection.primary_key(table_name)
+          pk = if [connection.primary_key(table_name)].flatten.include?(column.name)
                  'Y'
                else
                  ''

data/lib/arql/definition.rb

@@ -83,13 +83,18 @@ module Arql
         @@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|
               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
-                  self.primary_key = pkey
+                  if pkey.is_a?(Array)
+                    self.primary_keys = pkey
+                  else
+                    self.primary_key = pkey
+                  end
                   self.table_name = table_name
                   self.inheritance_column = nil
                   self.default_timezone = :local
@@ -106,16 +111,22 @@ module Arql
                   end
                 end.tap do |clazz|
                   Object.const_set(const_name, clazz).tap do |const|
-                    const_name.gsub(/[a-z]*/, '').tap do |abbr|
-                      unless Object.const_defined?(abbr)
-                        Object.const_set abbr, const
-                        abbr_const = abbr
+                    const_name.gsub(/[a-z]*/, '').tap do |bare_abbr|
+                      abbr_const = nil
+                      9.times do |idx|
+                        abbr = idx.zero? ? bare_abbr : "#{bare_abbr}#{idx+1}"
+                        unless Object.const_defined?(abbr)
+                          Object.const_set abbr, const
+                          abbr_const = abbr
+                          break
+                        end
                       end
 
                       @@models << {
                         model: const,
                         abbr: abbr_const,
-                        table: table_name
+                        table: table_name,
+                        comment: table_comment
                       }
                     end
                   end
@@ -135,13 +146,18 @@ module Arql
       ActiveRecord::Base.connection.tap do |conn|
         Object.const_set('ArqlModel', Class.new(ActiveRecord::Base) { self.abstract_class = true })
         conn.tables.each do |table_name|
+          table_comment = conn.table_comment(table_name)
           conn.primary_key(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
-                self.primary_key = pkey
+                if pkey.is_a?(Array)
+                  self.primary_keys = pkey
+                else
+                  self.primary_key = pkey
+                end
                 self.table_name = table_name
                 self.inheritance_column = nil
                 self.default_timezone = :local
@@ -158,16 +174,22 @@ module Arql
                 end
               end.tap do |clazz|
                 Object.const_set(const_name, clazz).tap do |const|
-                  const_name.gsub(/[a-z]*/, '').tap do |abbr|
-                    unless Object.const_defined?(abbr)
-                      Object.const_set abbr, const
-                      abbr_const = abbr
+                  const_name.gsub(/[a-z]*/, '').tap do |bare_abbr|
+                    abbr_const = nil
+                    9.times do |idx|
+                      abbr = idx.zero? ? bare_abbr : "#{bare_abbr}#{idx+1}"
+                      unless Object.const_defined?(abbr)
+                        Object.const_set abbr, const
+                        abbr_const = abbr
+                        break
+                      end
                     end
 
                     @@models << {
                       model: const,
                       abbr: abbr_const,
-                      table: table_name
+                      table: table_name,
+                      comment: table_comment
                     }
                   end
                 end

data/lib/arql/ext/array.rb

@@ -15,8 +15,10 @@ class Array
 
   def t(*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 = first.attribute_names.map(&:to_sym) if attrs.empty?
+        attrs = column_names if attrs.empty?
         if options[:except].is_a?(Regexp)
           attrs.reject! { |e| e =~ options[:except] }
         else

data/lib/arql/ext/kernel.rb

@@ -25,7 +25,7 @@ module Kernel
           Terminal::Table.new { |t|
           t.headings = ['PK', 'Name', 'SQL Type', 'Limit', 'Precision', 'Scale', 'Default', 'Nullable', 'Comment']
           t.rows = table[:columns].map { |column|
-            pk = if column.name == ::ActiveRecord::Base.connection.primary_key(table_name)
+            pk = if [::ActiveRecord::Base.connection.primary_key(table_name)].flatten.include?(column_name)
                    'Y'
                  else
                    ''
@@ -44,7 +44,7 @@ module Kernel
           Terminal::Table.new { |t|
           t.headings = ['PK', 'Name', 'SQL Type', 'Limit', 'Precision', 'Scale', 'Default', 'Nullable', 'Comment']
           t.rows = table[:columns].map { |column|
-            pk = if column.name == ::ActiveRecord::Base.connection.primary_key(table_name)
+            pk = if [::ActiveRecord::Base.connection.primary_key(table_name)].flatten.include?(column_name)
                    'Y'
                  else
                    ''

data/lib/arql/version.rb

@@ -1,3 +1,3 @@
 module Arql
-  VERSION = "0.2.4"
+  VERSION = "0.2.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arql
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.9
 platform: ruby
 authors:
 - Liu Xiang
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-12-01 00:00:00.000000000 Z
+date: 2020-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 6.0.3
+- !ruby/object:Gem::Dependency
+  name: composite_primary_keys
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 12.0.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 12.0.3
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement