arql 0.3.31 → 0.4.1

data/lib/arql/ext/kernel.rb

@@ -5,67 +5,11 @@ module Kernel
   include ::Arql::Concerns::GlobalDataDefinition
 
   def q(sql)
-    ActiveRecord::Base.connection.exec_query(sql)
-  end
-
-  def print_tables(format = :md)
-    require 'terminal-table'
-
-    tables = ActiveRecord::Base.connection.tables.map do |table_name|
-      {
-        table: table_name,
-        table_comment: ActiveRecord::Base.connection.table_comment(table_name) || '',
-        columns: ::ActiveRecord::Base.connection.columns(table_name)
-      }
-    end
-
-    outputs = tables.map do |table|
-      table_name = table[:table]
-      table_comment = table[:table_comment]
-      case format
-      when :md
-        "# #{table_name} #{table_comment}\n\n" +
-          Terminal::Table.new { |t|
-          t.headings = ['PK', 'Name', 'SQL Type', 'Limit', 'Precision', 'Scale', 'Default', 'Nullable', 'Comment']
-          t.rows = table[:columns].map { |column|
-            pk = if [::ActiveRecord::Base.connection.primary_key(table_name)].flatten.include?(column)
-                   'Y'
-                 else
-                   ''
-                 end
-            [pk, "`#{column.name}`", column.sql_type, column.sql_type_metadata.limit || '', column.sql_type_metadata.precision || '',
-             column.sql_type_metadata.scale || '', column.default || '', column.null, column.comment || '']
-          }
-          t.style = {
-            border_top: false,
-            border_bottom: false,
-            border_i: '|'
-          }
-        }.to_s.lines.map { |l| '  ' + l }.join
-      when :org
-        "* #{table_name} #{table_comment}\n\n" +
-          Terminal::Table.new { |t|
-          t.headings = ['PK', 'Name', 'SQL Type', 'Limit', 'Precision', 'Scale', 'Default', 'Nullable', 'Comment']
-          t.rows = table[:columns].map { |column|
-            pk = if [::ActiveRecord::Base.connection.primary_key(table_name)].flatten.include?(column)
-                   'Y'
-                 else
-                   ''
-                 end
-            [pk, "=#{column.name}=", column.sql_type, column.sql_type_metadata.limit || '', column.sql_type_metadata.precision || '',
-             column.sql_type_metadata.scale || '', column.default || '', column.null, column.comment || '']
-          }
-          t.style = {
-            border_top: false,
-            border_bottom: false,
-          }
-        }.to_s.lines.map { |l| '  ' + l.gsub(/^\+|\+$/, '|') }.join
-      when :sql
-        "-- Table: #{table_name}\n\n" + ActiveRecord::Base.connection.exec_query("show create table `#{table_name}`").rows.last.last + ';'
-      end
+    if Arql::App.instance.environments.size > 1
+      $stderr.puts "Multiple environments are defined. Please use Namespace::q() instread, where Namespace is the namespace module of one of the environments."
+      return
     end
-
-    outputs.each { |out| puts out; puts }
+    Arql::App.instance.definitions.first.connection.exec_query(sql)
   end
 
   def generate_csv(filename, **options, &block)
@@ -113,4 +57,69 @@ module Kernel
     JSON.parse(IO.read(File.expand_path(filename)))
   end
 
-end
+  def within_namespace(namespace_pattern, &blk)
+    if namespace_pattern.is_a?(Module)
+      namespace_pattern.module_eval(&blk)
+      return
+    end
+    definition = Arql::App.instance.definitions.find do |_, defi|
+      case namespace_pattern
+      when Symbol
+        defi.namespace.to_s == namespace_pattern.to_s
+      when String
+        defi.namespace.to_s == namespace_pattern
+      when Regexp
+        defi.namespace.to_s =~ namespace_pattern
+      end
+    end
+    if definition
+      definition.last.namespace_module.module_eval(&blk)
+      return
+    end
+
+    $stderr.puts "Namespace #{namespace_pattern.inspect} not found"
+  end
+
+  def within_env(env_name_pattern, &blk)
+    definition = Arql::App.instance.definitions.find do |env_name, defi|
+      case env_name_pattern
+      when Symbol
+        env_name == env_name_pattern.to_s
+      when String
+        env_name == env_name_pattern
+      when Regexp
+        env_name =~ env_name_pattern
+      end
+    end
+    if definition
+      definition.last.namespace_module.module_eval(&blk)
+      return
+    end
+
+    $stderr.puts "Environment #{env_name_pattern.inspect} not found"
+  end
+
+  def models
+    Arql::App.instance.definitions.flat_map do |_, definition|
+      definition.namespace_module.models
+    end
+  end
+
+  def table_names
+    Arql::App.instance.definitions.flat_map do |_, definition|
+      definition.namespace_module.tables
+    end
+  end
+
+  def model_names
+    Arql::App.instance.definitions.flat_map do |_, definition|
+      definition.namespace_module.model_names
+    end
+  end
+
+  def env_config(env_regexp)
+    Arql::App.instance.definitions.find do |env_name, _|
+      env_name =~ env_regexp
+    end.last.options
+  end
+end

data/lib/arql/ext/object.rb

@@ -19,4 +19,18 @@ class Object
   def a
     [self]
   end
+
+  class << self
+    def const_missing(name)
+      return super unless const_defined?(:Arql)
+      return super unless Arql.const_defined?(:App)
+      return super unless Arql::App.instance&.definitions&.present?
+
+      Arql::App.instance.definitions.lazy.filter do |_, definition|
+        definition.namespace_module.const_defined?(name)
+      end.map do |_, definition|
+          definition.namespace_module.const_get(name)
+      end.first || super
+    end
+  end
 end

data/lib/arql/ext/ransack/search.rb

@@ -0,0 +1,29 @@
+Ransack::Search.class_eval do
+  def t(*attrs, **options)
+    result.t(*attrs, **options)
+  end
+
+  def vd(*attrs, **options)
+    result.vd(*attrs, **options)
+  end
+
+  def v
+    result.v
+  end
+
+  def a
+    result.a
+  end
+
+  def write_csv(filename, *fields, **options)
+    result.write_csv(filename, *fields, **options)
+  end
+
+  def write_excel(filename, *fields, **options)
+    result.write_excel(filename, *fields, **options)
+  end
+
+  def dump(filename, batch_size=500)
+    result.dump(filename, batch_size)
+  end
+end

data/lib/arql/mysqldump.rb

@@ -2,7 +2,6 @@ module Arql
   class Mysqldump
 
     def initialize(options = nil)
-      options ||= App.connect_options
       @options = options
       if options[:socket]
         port_or_sock = "-S #{options[:socket]}"

data/lib/arql/repl.rb

@@ -6,7 +6,7 @@ require 'rainbow'
 module Arql
   class Repl
     def initialize
-      Pry.config.prompt = Pry::Prompt.new("", "", prompt)
+      Pry.config.prompt = Pry::Prompt.new('', '', prompt) unless App.instance.options.babel_compatable
       Pry.start
     end
 

data/lib/arql/ssh_proxy.rb

@@ -3,33 +3,36 @@ require 'arql/ssh_proxy_patch'
 
 module Arql
   class SSHProxy
-    class << self
+    attr_accessor :config, :ssh_gateway, :local_ssh_proxy_port
 
-      attr_accessor :config, :ssh_gateway, :local_ssh_proxy_port
+    def initialize(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"
+    end
 
-      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
+      reconnect! unless @ssh_gateway.active?
+    end
 
-      def reconnect
-        reconnect! unless @ssh_gateway.active?
-      end
+    def reconnect!
+      @ssh_gateway.shutdown!
+      @ssh_gateway = Net::SSH::Gateway.new(@config[:host], @config[:user], @config.slice(:port, :password).symbolize_keys)
+      @ssh_gateway.open(config[:forward_host], config[:forward_port], @local_ssh_proxy_port)
+    end
 
-      def reconnect!
-        @ssh_gateway.shutdown!
-        @ssh_gateway = Net::SSH::Gateway.new(@config[:host], @config[:user], @config.slice(:port, :password).symbolize_keys)
-        @ssh_gateway.open(config[:forward_host], config[:forward_port], @local_ssh_proxy_port)
-      end
+    def active?
+      @ssh_gateway.active?
+    end
 
-      def active?
-        @ssh_gateway.active?
-      end
+    def database_host_port
+      {
+        host: '127.0.0.1',
+        port: @local_ssh_proxy_port
+      }
     end
   end
 end

data/lib/arql/version.rb

@@ -1,3 +1,3 @@
 module Arql
-  VERSION = "0.3.31"
+  VERSION = "0.4.1"
 end

data/lib/arql.rb

@@ -3,21 +3,25 @@ require 'roo'
 require 'caxlsx'
 require 'csv'
 require 'net/ssh/gateway'
-require "arql/version"
+require 'arql/version'
 require 'arql/id'
 require 'arql/multi_io'
 require 'arql/ext'
-require "arql/repl"
-require "arql/ssh_proxy"
-require "arql/app"
-require "arql/cli"
-require "arql/mysqldump"
-require "arql/vd"
+require 'arql/repl'
+require 'arql/ssh_proxy'
+require 'arql/app'
+require 'arql/cli'
+require 'arql/mysqldump'
+require 'arql/vd'
 require 'active_support/all'
 require 'active_record'
 require 'kaminari/activerecord'
 require 'composite_primary_keys'
 require 'ransack'
 
+require 'arql/ext/active_record/relation'
+require 'arql/ext/active_record/result'
+require 'arql/ext/ransack/search'
+
 module Arql
 end

data/oss-files-zh_CN.org

@@ -66,13 +66,13 @@
        def initialize(path, bucket: nil)
          @path = path
          unless bucket
-           bucket = Arql::App.config['oss_bucket']
+           bucket = env_config(/./)['oss_bucket']
          end
          @bucket = bucket
        end
      
        def rclone_name
-         Arql::App.config['rclone_name']
+         env_config(/./)['rclone_name']
        end
      
        def info

data/oss-files.org

@@ -66,13 +66,13 @@
        def initialize(path, bucket: nil)
          @path = path
          unless bucket
-           bucket = Arql::App.config['oss_bucket']
+           bucket = env_config(/./)['oss_bucket']
          end
          @bucket = bucket
        end
      
        def rclone_name
-         Arql::App.config['rclone_name']
+         env_config(/./)['rclone_name']
        end
      
        def info

data/sql-log-zh_CN.org

@@ -7,13 +7,18 @@
   创建一个文件 =~/.arql.d/sql_log.rb= ，内容如下：
 
   #+BEGIN_SRC ruby
-    unless Arql::App.config[:append_sql]
+    unless Arql::App.instance.options.append_sql
       log_root_dir = File.expand_path('~/.arql.d/logs')
-      log_dir = "#{log_root_dir}/%s" % Arql::App.env
+      if Arql::App.instance.environments.present?
+        log_dir = "#{log_root_dir}/%s" % Arql::App.instance.environments.join('_')
+      elsif File.file?(Arql::App.instance.options[:database])
+        log_dir = "#{log_root_dir}/%s" % File.basename(Arql::App.instance.options[:database])
+      end
+    
       FileUtils.mkdir_p(log_dir)
       now = Time.now
       log_file = "#{log_dir}/%s.%s.%s.log" % [Time.now.strftime('%Y_%m%d_%H%M%S'), `hostname -s`.chomp.downcase, Process.pid]
-      Arql::App.config[:append_sql] = log_file
+      Arql::App.instance.options.append_sql = log_file
     
       lfile = File.new(log_file, 'a')
       lfile.sync = true

data/sql-log.org

@@ -7,13 +7,18 @@
   Create a file =~/.arql.d/sql_log.rb= with the following content:
 
   #+BEGIN_SRC ruby
-    unless Arql::App.config[:append_sql]
+    unless Arql::App.instance.options.append_sql
       log_root_dir = File.expand_path('~/.arql.d/logs')
-      log_dir = "#{log_root_dir}/%s" % Arql::App.env
+      if Arql::App.instance.environments.present?
+        log_dir = "#{log_root_dir}/%s" % Arql::App.instance.environments.join('_')
+      elsif File.file?(Arql::App.instance.options[:database])
+        log_dir = "#{log_root_dir}/%s" % File.basename(Arql::App.instance.options[:database])
+      end
+    
       FileUtils.mkdir_p(log_dir)
       now = Time.now
       log_file = "#{log_dir}/%s.%s.%s.log" % [Time.now.strftime('%Y_%m%d_%H%M%S'), `hostname -s`.chomp.downcase, Process.pid]
-      Arql::App.config[:append_sql] = log_file
+      Arql::App.instance.options.append_sql = log_file
     
       lfile = File.new(log_file, 'a')
       lfile.sync = true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arql
 version: !ruby/object:Gem::Version
-  version: 0.3.31
+  version: 0.4.1
 platform: ruby
 authors:
 - Liu Xiang
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-04-12 00:00:00.000000000 Z
+date: 2024-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2
@@ -334,20 +334,21 @@ files:
 - lib/arql/commands/redefine.rb
 - lib/arql/commands/sandbox.rb
 - lib/arql/commands/show_sql.rb
-- lib/arql/commands/table.rb
-- lib/arql/commands/vd.rb
 - lib/arql/concerns.rb
 - lib/arql/concerns/global_data_definition.rb
+- lib/arql/concerns/model_extension.rb
 - lib/arql/concerns/table_data_definition.rb
-- 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/active_record/relation.rb
+- lib/arql/ext/active_record/result.rb
 - lib/arql/ext/array.rb
 - lib/arql/ext/hash.rb
 - lib/arql/ext/kernel.rb
 - lib/arql/ext/object.rb
+- lib/arql/ext/ransack/search.rb
 - lib/arql/ext/string.rb
 - lib/arql/ext/time.rb
 - lib/arql/id.rb

data/lib/arql/commands/table.rb

@@ -1,55 +0,0 @@
-require 'terminal-table'
-
-module Arql::Commands
-  module Table
-    class << self
-      def get_table_name(name)
-        name = name.to_s
-        return name if name =~ /^[a-z]/
-        if Object.const_defined?(name)
-          klass = Object.const_get(name)
-          return klass.table_name if klass < ActiveRecord::Base
-        end
-        name
-      end
-
-      def table_info_table(table_name)
-        Terminal::Table.new do |t|
-          table_info(table_name).each { |row| t << (row || :separator) }
-        end
-      end
-
-      def table_info(table_name)
-        t = []
-        t << ['PK', 'Name', 'SQL Type', 'Ruby Type', 'Limit', 'Precision', 'Scale', 'Default', 'Nullable', 'Comment']
-        t << nil
-        connection = ::ActiveRecord::Base.connection
-        connection.columns(table_name).each do |column|
-          pk = if [connection.primary_key(table_name)].flatten.include?(column.name)
-                 'Y'
-               else
-                 ''
-               end
-          t << [pk, column.name, column.sql_type,
-                column.sql_type_metadata.type, column.sql_type_metadata.limit || '',
-                column.sql_type_metadata.precision || '', column.sql_type_metadata.scale || '', column.default || '',
-                column.null, column.comment || '']
-        end
-        t
-      end
-    end
-
-    Pry.commands.block_command 't' do |name|
-      table_name = Table::get_table_name(name)
-      puts
-      puts "Table: #{table_name}"
-      puts Table::table_info_table(table_name)
-    end
-  end
-end
-
-module Kernel
-  def table(name)
-    Arql::Commands::Table::table_info(Arql::Commands::Table::get_table_name(name))
-  end
-end

data/lib/arql/commands/vd.rb

@@ -1,46 +0,0 @@
-require 'arql/vd'
-
-module Arql::Commands
-  module VD
-    class << self
-      def get_table_name(name)
-        name = name.to_s
-        return name if name =~ /^[a-z]/
-        if Object.const_defined?(name)
-          klass = Object.const_get(name)
-          return klass.table_name if klass < ActiveRecord::Base
-        end
-        name
-      end
-
-      def table_info_vd(table_name)
-        Arql::VD.new do |vd|
-          table_info(table_name).each { |row| vd << row }
-        end
-      end
-
-      def table_info(table_name)
-        t = []
-        t << ['PK', 'Name', 'SQL Type', 'Ruby Type', 'Limit', 'Precision', 'Scale', 'Default', 'Nullable', 'Comment']
-        connection = ::ActiveRecord::Base.connection
-        connection.columns(table_name).each do |column|
-          pk = if [connection.primary_key(table_name)].flatten.include?(column.name)
-                 'Y'
-               else
-                 ''
-               end
-          t << [pk, column.name, column.sql_type,
-                column.sql_type_metadata.type, column.sql_type_metadata.limit || '',
-                column.sql_type_metadata.precision || '', column.sql_type_metadata.scale || '', column.default || '',
-                column.null, column.comment || '']
-        end
-        t
-      end
-    end
-
-    Pry.commands.block_command 'vd' do |name|
-      table_name = VD::get_table_name(name)
-      VD::table_info_vd(table_name)
-    end
-  end
-end

data/lib/arql/connection.rb

@@ -1,16 +0,0 @@
-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)
-        end
-      end
-    end
-  end
-end