cfgdatabase 1.1.1 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aab950fe6ed48722462c348fca86a095c0055315857b1987cd53f47ce8f91a24
-  data.tar.gz: 4c5a5e110780ac27af1ef46e2eab019ecaaff6886c7701628cd0ae5c219593af
+  metadata.gz: 606c2258083d60aa81e7d114894d9b22fff92c33036981ce1053371a2897607b
+  data.tar.gz: 3dd8a996e9a7a233eb698bc2ae93b25aafabbf0bac0f156650daac3e911dd3da
 SHA512:
-  metadata.gz: eb7f89f857e1cc7feda3f738084d23ed9abe590e287721ec092797341453cfcafe12e1fd673ee0bcc55794a3c766377a30b5b48de31cd2ee9ff2341df962d27d
-  data.tar.gz: faab68ab131cc4e173d0510d5a7aa07798c9bee2fe009f6b5b110ba601693e7947e7af907f280952e0a264acc599184e4b770f46a27ced2fb9d41cdb642dc974
+  metadata.gz: 7f271b2a238c361ee4e497b0bcde8dc6650ea2aa370c266f906dd225cf67b8b79f5df168e294baae2dec22ddb5dfb27d52b04232bc3cd24b2afc79f86e0e7c38
+  data.tar.gz: b444cc1b1bb12fbb7ee69f8d18ab820e95fe5dda08ea8a1e6316e46b09688ab776526fc9c8ca6333e55de125b7ac33b5d292f8431ad33873a454c9cdbe848dca

data/lib/app-database.rb

@@ -1,5 +1,5 @@
+require 'pg'
 require 'sequel'
-require 'singleton'
 require 'app-config'
 require 'app-logger'
 
@@ -10,16 +10,15 @@ require 'app-logger'
 # Предполагается использование глобальной Cfg для настроек
 
 module App
-  class Database
-    include Singleton
+  module Database
     attr_reader :db
-
     ##
     # Ищем секцию настроек Cfg.db
-    def initialize
+    module_function
+    def init
       raise ArgumentError.new("Cfg not found!") if ! defined?( ::Cfg ) || ! Cfg.db || Cfg.db.empty?
       if (! defined? @db ) || ( @db.nil? ) || ( ! @db ) || ( ! @db.test_connection )
-        Log.info{ "БД #{ Cfg.db.database }." }
+        Log.debug{ "БД #{ Cfg.db.database }." }
         Sequel.extension :pg_array, :pg_inet, :pg_json, :pg_json_ops, :pg_array, :pg_array_ops, :pg_row, :pg_hstore, :pg_json_ops
         Sequel::Model.raise_on_save_failure = false
         Sequel::Model.plugin :validation_helpers
@@ -39,5 +38,15 @@ module App
       return @db
     end
 
+    def remove
+      if defined?( Db )
+        Db.disconnect if @db.test_connection
+        Kernel.send :remove_const, 'Db'
+      end
+    end
+
+    def connected?
+      !! ( defined?( Db ) && Db.test_connection )
+    end
   end
 end

data/utils/migrate.rb

@@ -0,0 +1,186 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+
+require 'bundler/setup'
+require 'fileutils'
+require 'pathname'
+require 'bunny'
+require 'logger'
+require 'yaml'
+require 'optparse'
+require 'thor'
+require 'monkey-hash'
+require 'app-config'
+require 'app-logger'
+require 'sequel'
+require 'pg'
+require 'app-database'
+
+App::Config.init( approot: Pathname.new( Dir.pwd ).expand_path )
+App::Logger.new
+App::Database.init if Cfg.db?
+Sequel.extension :migration
+
+# тупой способ определения запуска в корне проекта
+launchdir = Dir.pwd
+if launchdir != Cfg.root || ! File.exist?( "#{ Cfg.root }/Gemfile" )
+  puts "\n\tВнимание! Следует запускать migrate.rb в корне проекта.\n\n"
+  raise "\n\tВнимание! Следует запускать migrate.rb в корне проекта.\n\n"
+end
+
+class Dbtask < Thor
+  package_name 'db'
+  desc 'init', 'Создать папки и записать нулевую миграцию'
+  def init
+    mydir       = Pathname( __dir__ ).expand_path.to_s
+    migrations  = Pathname( "#{ Cfg.root }/db/migrations" ).expand_path.to_s
+    Log.info{"Создаю папку #{ migrations }"}
+    FileUtils.mkdir_p migrations
+    list = Dir[ "#{ mydir }/migrations/*rb" ]
+    Log.info{"Копирую файл#{ list.count == 1 ? '' : 'ы' } с миграциями:\n#{ list.join("\n") }"}
+    FileUtils.cp list, "#{ migrations }/"
+  end
+
+  desc "g class_name", "Создать файл миграции в db/migrations"
+  def g(class_name)
+    tstamp = Time.now.strftime "%Y%m%d%H%M%S"
+    fname = ''
+    if Dir[ "#{ Cfg.root }/db/migrations/#{ tstamp }_*.rb" ].any?
+      counter = 0
+      while Dir[ "#{ Cfg.root }/db/migrations/#{ tstamp }#{ '%02d' % counter }_*.rb" ].any? do
+        counter += 1
+      end
+      fname = "#{ Cfg.root }/db/migrations/#{ tstamp }_#{ '%02d' % counter }_#{ class_name }.rb"
+    else
+      fname = "#{ Cfg.root }/db/migrations/#{ tstamp }_#{ class_name }.rb"
+    end
+    Log.info{ "Создаю файлик миграции #{ fname }" }
+    File.open( fname, 'w' ) do |f|
+      f.write <<~EFILE
+      Sequel.migration do
+        up do
+          create_table :#{ class_name } do
+            primary_key :id, type: :Bignum
+
+            column :created_at, DateTime, null: false, index: true, default: Sequel.lit("now()")
+            column :updated_at, DateTime, null: false, index: true, default: Sequel.lit("now()")
+          end
+          run <<~EUP
+            DO $$
+            BEGIN
+              --triggers
+              IF NOT EXISTS (SELECT 1 FROM pg_trigger WHERE tgname = '#{ class_name }_update_timestamp') THEN
+                CREATE TRIGGER #{ class_name }_update_timestamp
+                  BEFORE INSERT OR UPDATE ON #{ class_name }
+                  FOR EACH ROW EXECUTE PROCEDURE update_timestamp();
+              END IF;
+            END $$;
+          EUP
+        end
+        down { run 'DROP TABLE #{ class_name } CASCADE' }
+      end
+      EFILE
+    end
+  end
+
+  desc "m", "Мигрировать миграции, можно добавить имя файла"
+  def m(point = nil)
+    point = point_from_filename(point) || nil
+    Log.warn{ "Мигрирую базу #{ point }" }
+    if point
+      Sequel::Migrator.run(Db, "db/migrations", target: point )
+    else
+      Sequel::Migrator.run(Db, "db/migrations" )
+    end
+    v
+  end
+
+  desc "r", "Откатить базу в ноль, либо к указанному файлу"
+  def r(point = '0')
+    point = point_from_filename(point) || 0
+    Log.warn{ "Откатываю базу #{ point }" }
+    if point
+      Sequel::Migrator.run(Db, "db/migrations", :target => point )
+    else
+      Sequel::Migrator.run(Db, "db/migrations" )
+    end
+    v
+  end
+
+  desc "v" , "Напечатать текущую версию в базе"
+  def v
+    version =
+    if Db.tables.include?(:schema_migrations)
+      (f = Db[:schema_migrations].all).any? ? f.last[:filename] : 'пусто'
+    else
+      'пусто'
+    end
+    puts "Последняя миграция: #{ version }"
+  end
+
+  desc "create", "Создать базу"
+  def create
+    rootdb = superdb
+    Log.warn{ "Создаю пользователя: #{ Cfg.db.user } и базу: #{ Cfg.db.database }." }
+    begin
+      rootdb["CREATE USER #{ Cfg.db.user  } WITH LOGIN PASSWORD '#{ Cfg.db.password }'"].all
+    rescue Exception => e
+      Log.info{ e.message }
+    end
+    begin
+      rootdb["CREATE DATABASE #{ Cfg.db.database } OWNER #{ Cfg.db.user  }"].all
+    rescue Exception => e
+      Log.info{ e.message }
+    end
+  end
+
+  desc "scratch", 'Удалить базу, загрузить все миграции заново'
+  def scratch(db = nil)
+    db = superdb
+    Log.debug{"Отключение от текущей базы"}
+    Db.disconnect
+    unless db.test_connection
+      Log.warn{"Не смог подключиться к базе для махинаций. #{ superuser.inspect }"}
+      exit 255
+    end
+    Log.warn{ "Удаляю базу #{ Cfg.db.database }" }
+    begin
+      db << "DROP DATABASE #{ Cfg.db.database }"
+    rescue Exception => e
+      Log.error e.message
+    end
+    create
+    m
+  end
+
+  no_commands do
+    # подключается к базе с правами админа
+    # жёстко закодировано, что админ базы 'postgres' без пароля, и схема 'public'
+    def superdb
+      if ! @rootdb || ! @rootdb.test_connection
+        superuser = Marshal.load(Marshal.dump( Cfg.db ))
+        superuser[:adapter]  = 'postgres'
+        superuser[:user]     = 'postgres'
+        superuser[:database] = 'postgres'
+        superuser.delete :password
+        Log.debug{"Попытка административного подключения #{ superuser.inspect }"}
+        @rootdb = Sequel.connect( superuser )
+      end
+      @rootdb
+    end
+
+    def point_from_filename(n)
+      Log.debug{"Поиск миграции по куску имени: '#{ n }'."}
+      return nil unless n
+      unless n =~ /^\d+/
+        Pathname.new( Dir["#{ Cfg.root }/db/migrations/*#{ n }*.rb"].sort.last ).basename.to_s[/(\d+)/, 1].to_i
+      else
+        n[/^(\d+)/, 1].to_i
+      end
+    end
+
+  end
+
+end
+
+Dbtask.start

data/utils/migrations/00000000000000_created_at_trigger.rb

@@ -0,0 +1,26 @@
+Sequel.migration do
+  up do
+    run <<~ESTOREDPROC
+    CREATE OR REPLACE FUNCTION insert_timestamp() RETURNS trigger
+      LANGUAGE plpgsql
+      AS $$
+    BEGIN
+      IF NEW.created_at IS NULL THEN
+        NEW.created_at := now();
+      END IF;
+      RETURN NEW;
+    END $$;
+
+    CREATE OR REPLACE FUNCTION update_timestamp() RETURNS trigger
+      LANGUAGE plpgsql
+      AS $$
+    BEGIN
+      IF NEW.updated_at IS NULL THEN
+        NEW.updated_at := now();
+      END IF;
+      RETURN NEW;
+    END $$;
+    ESTOREDPROC
+  end
+  down { run 'DROP FUNCTION IF EXISTS insert_timestamp(); DROP FUNCTION IF EXISTS update_timestamp();' }
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cfgdatabase
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.5
 platform: ruby
 authors:
 - deemytch
-autorequire: 
-bindir: bin
+autorequire:
+bindir: utils
 cert_chain: []
-date: 2020-05-26 00:00:00.000000000 Z
+date: 2021-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -52,18 +52,35 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+- !ruby/object:Gem::Dependency
+  name: pg
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description:
 email: aspamkiller@yandex.ru
-executables: []
+executables:
+- migrate.rb
 extensions: []
 extra_rdoc_files: []
 files:
 - lib/app-database.rb
-homepage: https://gitlab.sudo.su/amqp-lib/cfgdatabase
+- utils/migrate.rb
+- utils/migrations/00000000000000_created_at_trigger.rb
+homepage: https://github.com/deemytch/cfgdatabase
 licenses:
 - GPL-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -78,8 +95,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.13
+signing_key:
 specification_version: 4
-summary: Удобная загрузка настроек Sequel.
+summary: Удобная загрузка настроек Sequel и миграции для PostgreSQL.
 test_files: []