arql 0.2.13 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a172e23e1a195c0359c73041431fed88cdb54f288e6e836a7f13febaa57632d7
-  data.tar.gz: 30f9ebc606efae03e4be2e1774d85b893d81462e75fc712ffb3d543e43c7bbcd
+  metadata.gz: 21ead482a62e2bad4589f8756b4c5db0e5d4152d54e08b2707bf3ce1441e24cd
+  data.tar.gz: d51796aed86a97001c59e927073a8fefdc82c14c5b45a8417db4aed167ab4125
 SHA512:
-  metadata.gz: ec25c920bdd7a96dcd510abd6db5b1217fdc7e7d9f94558a857f37d17338defe804c25949c90f508d88399907b0785dce3014e2c1e073dd3d3da7a758307bffd
-  data.tar.gz: 7daaea1f984be21a0a524ce1647b275c748c69a341a5ade443514246999bd013b071c3f6b4bffc9aceb6371fea3803b199e09d51a98e365c3b001f34c3e17420
+  metadata.gz: 8be01074982b47fb01a0992f35e2504379ef51edbc9ad9f29d14f31aeedb0d297542ca7f9f98671a3b5a4a38567858c83a60f2025eed63832dc1951b994e4a3a
+  data.tar.gz: f66fea7d15fbd6a99e7c84ebe90540d6c86467ed108c94707b07fe081251d1d4e647c43d8577e560eaf7bdfe56c286069a5ca95d5de27ce76a7bf97aa0ea4043

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    arql (0.2.13)
-      activerecord (~> 6.0.3)
+    arql (0.3.2)
+      activerecord (>= 6.0.3, < 6.2.0)
       activesupport (~> 6.0.3)
       caxlsx (~> 3.0.2)
       composite_primary_keys (~> 12.0.3)
@@ -10,7 +10,7 @@ PATH
       net-ssh-gateway (~> 2.0.0)
       pry (~> 0.13.1)
       pry-byebug (~> 3.9.0)
-      pry-doc (~> 1.1.0)
+      pry-doc (~> 1.2.0)
       rainbow (~> 3.0.0)
       roo (~> 2.8.3)
       sqlite3 (~> 1.4)
@@ -20,65 +20,71 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    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)
+    activemodel (6.0.4.4)
+      activesupport (= 6.0.4.4)
+    activerecord (6.0.4.4)
+      activemodel (= 6.0.4.4)
+      activesupport (= 6.0.4.4)
+    activesupport (6.0.4.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
       zeitwerk (~> 2.2, >= 2.2.2)
     byebug (11.1.3)
-    caxlsx (3.0.2)
+    caxlsx (3.0.4)
       htmlentities (~> 4.3, >= 4.3.4)
       mimemagic (~> 0.3)
       nokogiri (~> 1.10, >= 1.10.4)
       rubyzip (>= 1.3.0, < 3)
     coderay (1.1.3)
-    composite_primary_keys (12.0.3)
+    composite_primary_keys (12.0.10)
       activerecord (~> 6.0.0)
-    concurrent-ruby (1.1.7)
+    concurrent-ruby (1.1.9)
     htmlentities (4.3.4)
-    i18n (1.8.5)
+    i18n (1.8.11)
       concurrent-ruby (~> 1.0)
     method_source (1.0.0)
-    mimemagic (0.3.5)
-    mini_portile2 (2.4.0)
-    minitest (5.14.2)
+    mimemagic (0.4.3)
+      nokogiri (~> 1)
+      rake
+    mini_portile2 (2.6.1)
+    minitest (5.15.0)
     mysql2 (0.5.3)
     net-ssh (6.1.0)
     net-ssh-gateway (2.0.0)
       net-ssh (>= 4.0.0)
-    nokogiri (1.10.10)
-      mini_portile2 (~> 2.4.0)
+    nokogiri (1.12.5)
+      mini_portile2 (~> 2.6.1)
+      racc (~> 1.4)
     pry (0.13.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
     pry-byebug (3.9.0)
       byebug (~> 11.0)
       pry (~> 0.13.0)
-    pry-doc (1.1.0)
+    pry-doc (1.2.0)
       pry (~> 0.11)
       yard (~> 0.9.11)
+    racc (1.6.0)
     rainbow (3.0.0)
     rake (12.3.3)
     roo (2.8.3)
       nokogiri (~> 1)
       rubyzip (>= 1.3.0, < 3.0.0)
-    rubyzip (2.3.0)
+    rubyzip (2.3.2)
     sqlite3 (1.4.2)
     table_print (1.5.7)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
     thread_safe (0.3.6)
-    tzinfo (1.2.8)
+    tzinfo (1.2.9)
       thread_safe (~> 0.1)
-    unicode-display_width (1.7.0)
-    yard (0.9.25)
-    zeitwerk (2.4.2)
+    unicode-display_width (1.8.0)
+    webrick (1.7.0)
+    yard (0.9.27)
+      webrick (~> 1.7.0)
+    zeitwerk (2.5.1)
 
 PLATFORMS
   ruby
@@ -88,4 +94,4 @@ DEPENDENCIES
   rake (~> 12.0)
 
 BUNDLED WITH
-   2.1.4
+   2.2.3

data/arql.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.description   = %{Use ActiveRecord and Pry as your favorite SQL query editor.}
   spec.homepage      = "https://github.com/lululau/arql"
   spec.license       = "MIT"
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.6.0")
 
 
 
@@ -28,13 +28,13 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'sqlite3', '~> 1.4'
   # spec.add_dependency 'activerecord-sqlserver-adapter'
   # spec.add_dependency 'activerecord-oracle_enhanced-adapter'
-  spec.add_dependency 'activerecord', '~> 6.0.3'
+  spec.add_dependency 'activerecord', '>= 6.0.3', '< 6.2.0'
   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'
   spec.add_dependency 'pry-byebug', '~> 3.9.0'
-  spec.add_dependency 'pry-doc', '~> 1.1.0'
+  spec.add_dependency 'pry-doc', '~> 1.2.0'
   spec.add_dependency 'rainbow', '~> 3.0.0'
   spec.add_dependency 'terminal-table', '~> 1.8.0'
   spec.add_dependency 'table_print', '~> 1.5.6'

data/lib/arql/app.rb

@@ -4,7 +4,7 @@ module Arql
   class App
 
     class << self
-      attr_accessor :log_io, :env, :prompt, :instance
+      attr_accessor :log_io, :env, :prompt, :instance, :connect_options
 
       def config
         @@effective_config
@@ -27,7 +27,8 @@ module Arql
       require "arql/definition"
       @options = options
       App.env = @options.env
-      Connection.open(connect_options)
+      App.connect_options = connect_options
+      Connection.open(App.connect_options)
       @definition = Definition.new(effective_config)
       load_initializer!
       App.instance = self
@@ -67,6 +68,8 @@ module Arql
     end
 
     def config
+      @config ||= YAML.load(IO.read(File.expand_path(@options.config_file)), aliases: true).with_indifferent_access
+    rescue ArgumentError
       @config ||= YAML.load(IO.read(File.expand_path(@options.config_file))).with_indifferent_access
     end
 

data/lib/arql/concerns.rb

@@ -1,2 +1,2 @@
 require 'arql/concerns/global_data_definition'
-require 'arql/concerns/tables_data_definition'
+require 'arql/concerns/table_data_definition'

data/lib/arql/connection.rb

@@ -4,6 +4,9 @@ module Arql
       def open(options)
         ActiveRecord::Base.establish_connection(options)
         $C = ActiveRecord::Base.connection
+        $C.define_singleton_method(:dump) do |filename, no_create_db=false|
+          Arql::Mysqldump.new.dump_database(filename, no_create_db)
+        end
       end
     end
   end

data/lib/arql/definition.rb

@@ -35,6 +35,10 @@ module Arql
       [self].write_excel(filename, *fields, **options)
     end
 
+    def dump(filename, batch_size=500)
+      [self].dump(filename, batch_size)
+    end
+
     included do
     end
 
@@ -66,6 +70,10 @@ module Arql
       def to_create_sql
         ActiveRecord::Base.connection.exec_query("show create table #{table_name}").rows.last.last
       end
+
+      def dump(filename, no_create_table=false)
+        Arql::Mysqldump.new.dump_table(filename, table_name, no_create_table)
+      end
     end
   end
 
@@ -237,6 +245,9 @@ module Arql
         records.write_excel(filename, *fields, **options)
       end
 
+      def dump(filename, batch_size=500)
+        records.dump(filename, batch_size)
+      end
     end
   end
 end

data/lib/arql/ext/array.rb

@@ -127,4 +127,13 @@ class Array
       end
     end
   end
+
+  def dump(filename, batch_size=500)
+    File.open(File.expand_path(filename), 'w') do |file|
+      group_by(&:class).each do |(klass, records)|
+        file.puts(klass.to_upsert_sql(records, batch_size))
+      end
+    end
+    {size: size, file: File.expand_path(filename)}
+  end
 end

data/lib/arql/ext/kernel.rb

@@ -95,7 +95,7 @@ module Kernel
   def generate_excel(filename)
     Axlsx::Package.new do |package|
       yield(package.workbook)
-      package.serialize(filename)
+      package.serialize(File.expand_path(filename))
     end
   end
 

data/lib/arql/ext/string.rb

@@ -2,4 +2,12 @@ class String
   def p
     puts self
   end
+
+  def expa
+    File.expand_path(self)
+  end
+
+  def f
+    expa
+  end
 end

data/lib/arql/mysqldump.rb

@@ -0,0 +1,44 @@
+module Arql
+  class Mysqldump
+
+    def initialize(options = nil)
+      options ||= App.connect_options
+      @options = options
+      if options[:socket]
+        port_or_sock = "-S #{options[:socket]}"
+      else
+        port_or_sock = "-P #{options[:port] || 3306}"
+      end
+      @base_dump_cmd = "mysqldump -u %{user} -h %{host} %{port_or_sock} %{password} --skip-lock-tables " % {
+        user: options[:username],
+        host: options[:host],
+        password: options[:password].presence.try { |e| "-p#{e}" } || '',
+        port_or_sock: port_or_sock
+      }
+    end
+
+    def dump_table(filename, table_name, no_create_table = false)
+      system dump_table_cmd(table_name, no_create_table) + " > #{filename}"
+    end
+
+    def dump_database(filename, no_create_db = false)
+      system dump_database_cmd(no_create_db) + " > #{filename}"
+    end
+
+    def dump_table_cmd(table_name, no_create_table = false)
+      @base_dump_cmd + " " + if no_create_table
+                               "--no-create-info #{@options[:database]} #{table_name}"
+                             else
+                               "--add-drop-table #{@options[:database]} #{table_name}"
+                             end
+    end
+
+    def dump_database_cmd(no_create_db = false)
+      @base_dump_cmd + " " + if no_create_db
+                               "--no-create-db --add-drop-database --databases #{@options[:database]}"
+                             else
+                               "--add-drop-database --add-drop-table --databases #{@options[:database]}"
+                             end
+    end
+  end
+end

data/lib/arql/version.rb

@@ -1,3 +1,3 @@
 module Arql
-  VERSION = "0.2.13"
+  VERSION = "0.3.2"
 end

data/lib/arql.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arql
 version: !ruby/object:Gem::Version
-  version: 0.2.13
+  version: 0.3.2
 platform: ruby
 authors:
 - Liu Xiang
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-01-03 00:00:00.000000000 Z
+date: 2021-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2
@@ -42,16 +42,22 @@ dependencies:
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 6.0.3
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 6.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 6.0.3
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 6.2.0
 - !ruby/object:Gem::Dependency
   name: composite_primary_keys
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +134,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
@@ -251,6 +257,7 @@ files:
 - lib/arql/ext/time.rb
 - lib/arql/id.rb
 - lib/arql/multi_io.rb
+- lib/arql/mysqldump.rb
 - lib/arql/repl.rb
 - lib/arql/ssh_proxy.rb
 - lib/arql/ssh_proxy_patch.rb
@@ -267,14 +274,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: Rails ActiveRecord + Pry is the best SQL query editor