arql 0.2.3 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf94862baf6c8e5ff36589e84a022e892b4b88664ecc300c51d313a541e982fd
-  data.tar.gz: baa0a4b30e5efeb4083347c18f2863faa764052505e46442e45dd9af519612b0
+  metadata.gz: 470deccd5ba138549ecac9e05bb6bb57fee7c6954965443656dc7529344eaf75
+  data.tar.gz: a3eb2b9eabb1e36de3b9a31603d754c23f1e7bb70c5fe567274686975636229c
 SHA512:
-  metadata.gz: aa3a4aba5288c64c7969efe368713e9f2a64ff9dfde3f41d47b9d8f3ec2f64fbfbe5479d6dc1c95281d82f68497616f44f78e84b635e312b6c6e40528871e6cf
-  data.tar.gz: cae343a1411c59e683dcc99ee309d1ca91100c2c8cf22cbff37ffe04cc02e338d38562e0623a752c5f0803926fba1b0f5a2332074ec3f98083dadd0b8439ab0e
+  metadata.gz: 67e739e75aae86ab98622646b66a0b1f695cae31f673d1d95625e151ee6f14c818c9b230dca823fa3deb7f0b8d2c1c3303c33158d1e2334a85b6eb36ff713e8c
+  data.tar.gz: f6fdde5dd75d1a8f17b89713b481e0f54e897b9a6c27a6a049601f82c25fe3dde0c255e870cf177eb11b73d55942908c0b74aed664243376d29737dff85e884d

data/Gemfile.lock

@@ -1,10 +1,11 @@
 PATH
   remote: .
   specs:
-    arql (0.2.3)
+    arql (0.2.8)
       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| eval(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(ActiveRecord::Base) do
+                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
@@ -133,14 +144,20 @@ module Arql
       @@options = options
       @@models = []
       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(ActiveRecord::Base) do
+              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
@@ -157,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.3"
+  VERSION = "0.2.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arql
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.8
 platform: ruby
 authors:
 - Liu Xiang
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-09-24 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