arql 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44604f0630f7b6308b9c53bf90b46bd9138b52fdec169baf46bf4e790adfc82b
-  data.tar.gz: 7efecc0c754d4f16eb31a19756de3d95a06d8d93440e480726d6df574827af13
+  metadata.gz: 470deccd5ba138549ecac9e05bb6bb57fee7c6954965443656dc7529344eaf75
+  data.tar.gz: a3eb2b9eabb1e36de3b9a31603d754c23f1e7bb70c5fe567274686975636229c
 SHA512:
-  metadata.gz: d795bedb12d2bf39bbb2b5e394373b545e35a542e00110708915fa57b5ca2248f5ed64ee975283d0a3a23e3e4ed201a560fc3ba78dac4085650d6eef486c7fdf
-  data.tar.gz: 07c6aacfcd46fe3361ebbf977c553c32aad792cb7cd40ebdb9803f0cb76b32ace4bb4326808dd4db2c61be2f6e3e98ec1ee85753ced7e73ee85f8d1f6ffaf10d
+  metadata.gz: 67e739e75aae86ab98622646b66a0b1f695cae31f673d1d95625e151ee6f14c818c9b230dca823fa3deb7f0b8d2c1c3303c33158d1e2334a85b6eb36ff713e8c
+  data.tar.gz: f6fdde5dd75d1a8f17b89713b481e0f54e897b9a6c27a6a049601f82c25fe3dde0c255e870cf177eb11b73d55942908c0b74aed664243376d29737dff85e884d

data/Gemfile.lock

@@ -1,10 +1,11 @@
 PATH
   remote: .
   specs:
-    arql (0.2.7)
+    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/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

@@ -90,7 +90,11 @@ module Arql
                 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
@@ -149,7 +153,11 @@ module Arql
               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

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.7"
+  VERSION = "0.2.8"
 end

metadata

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