stack-service-base 0.0.17 → 0.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 19fe497cb600a2f7618d3ae4ec8cf25862381804c0b51c2e73096f9ed3493e40
-  data.tar.gz: d9d9c062161159b12895ebb3aa143d08b80cff20de829a2c85b68392647c395c
+  metadata.gz: 5dae1479ab73fda6e9e34193fd90cffa89aebaa126633a786e7bd24b335c15cd
+  data.tar.gz: 815f0c8d16d52c00e434897dbf8155aa7dfc7f7fae47fedaf9dcb53c073acb3a
 SHA512:
-  metadata.gz: 41303c5e2005b8669959f8fbfc29d8318da4101a9a9b166a49d7fb768cad82c598731801b2cf892f1d3323bd682950397c751ead4ab1184ccea019393934602f
-  data.tar.gz: a3337e079cc9053b267b955e472b9994e90062e1254ab27ae2d857c0aa3c55307214492f945355c03d53c1763246485082af97fc40ad9adbdc64dd5a63fe69ad
+  metadata.gz: 30b56b345fc51bcac0f26071e7b71dd1b6567f71440a5a5f7b42283dea2c57662a4b691402ea9608b8abd899fdb675a9c118dcda955fa1803caa89b9ddcc94be
+  data.tar.gz: d602c98f64e443df371bd75a42b460736284ac00b4af0051738f7d0a8df819aed398989590ed2a623420e400a4c0ee112f2d1f644dd6b14208c7d9ddd053a834

data/lib/stack-service-base/database.rb

@@ -0,0 +1,63 @@
+class Time
+  def to_json(*_args)
+    strftime('%d.%m.%Y %H:%M').to_json
+  end
+end
+
+# DB.extension :pg_enum
+# module Sequel::Postgres::EnumDatabaseMethods
+#   def create_enum?(enum, values)
+#     create_enum(enum, values) unless from(:pg_type).where(typname: enum.to_s).count > 0
+#   end
+# end
+
+module IdempotentMigration
+  def table_add_column table, name, *opts
+    return if self[table].columns.include? name
+    alter_table table do
+      add_column name, *opts
+    end
+  end
+
+  def table_drop_column table, name, *opts
+    return unless self[table].columns.include? name
+    alter_table table do
+      drop_column name, *opts
+    end
+  end
+
+  def table_rename_column table, name, *opts
+    return unless self[table].columns.include? name
+    alter_table table do
+      rename_column name, *opts
+    end
+  end
+
+  def table_add_index(table, *opts)
+    this = self
+    alter_table table do
+      this.indexes(table).each do |_name, index|
+        if index[:columns].join === opts.join
+          return
+        end
+      end
+      add_index *opts
+    end
+  end
+
+  def table_add_unique_constraint table, *opts
+    this = self
+    alter_table table do
+      this.indexes(table).each do |name, index|
+        if index[:columns].join === opts.join
+          return
+          # drop_constraint name, type: :unique
+        end
+      end
+      add_unique_constraint *opts
+    end
+  end
+end
+
+Sequel::Database.prepend IdempotentMigration
+

data/lib/stack-service-base/fiber_pool.rb

@@ -8,8 +8,9 @@ class FiberConnectionPool < Sequel::ConnectionPool
 
   def log(msg)
     otl_current_span{ |span|
-      span.add_event("Fiber:log", attributes:{
-        event: 'Success', message: msg
+      span.add_event("FiberPool", attributes: {
+        F: Fiber.current.__id__, T: Thread.current.__id__, A: self.__id__,
+        message: msg
       }.transform_keys(&:to_s) )
     }
 
@@ -37,7 +38,7 @@ class FiberConnectionPool < Sequel::ConnectionPool
     log_connection_execute(conn, sql)
     true
   rescue =>e_
-    conn.close rescue
+    conn.close rescue nil
     false
   end
 
@@ -79,10 +80,10 @@ class FiberConnectionPool < Sequel::ConnectionPool
   def max_size = @sp.limit
   # def preconnect(_concurrent = false) = :unimplemented
   def disconnect(symbol)
-     until @stock.empty?
-       log 'disconnect connection (fiber pool)'
-       @stock.shift.close
-     end
+    until @stock.empty?
+      log 'disconnect connection (fiber pool)'
+      @stock.shift.close
+    end
   end
   # def servers = []
   def pool_type = :fiber # :threaded
@@ -99,8 +100,10 @@ require 'sequel/adapters/postgres'
 class Sequel::Postgres::Adapter
   def execute_query(sql, args)
     $stdout.puts "F:#{Fiber.current.__id__} : T:#{Thread.current.__id__} : A:#{self.__id__} : #{sql[0..60]}" unless defined? PERFORMANCE
+    log "query: #{sql.slice(0, 60)}"
     @db.log_connection_yield(sql, self, args){args ? async_exec_params(sql, args) : async_exec(sql)}
   rescue => e
+    log "Error: #{e.message}"
     $stdout.puts e.message
     raise
   end

data/lib/stack-service-base/rack_helpers.rb

@@ -1,3 +1,5 @@
+require 'rack'
+
 module RackHelpers
   def Rack.middleware_klass(&block)
     Class.new do

data/lib/stack-service-base.rb

@@ -25,6 +25,8 @@ module StackServiceBase
         end
 
         if defined? Sequel
+          require 'stack-service-base/database'
+
           Sequel::Database.after_initialize { _1.loggers << LOGGER }
 
           attempts= 10

data/lib/version.rb

@@ -1,5 +1,5 @@
 module StackServiceBase
   class Base
-    VERSION = '0.0.17'
+    VERSION = '0.0.19'
   end
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: stack-service-base
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.19
 platform: ruby
 authors:
 - ''
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-06-19 00:00:00.000000000 Z
+date: 2025-06-25 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rack
+  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'
 - !ruby/object:Gem::Dependency
   name: async
   requirement: !ruby/object:Gem::Requirement
@@ -171,6 +185,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/stack-service-base.rb
+- lib/stack-service-base/database.rb
 - lib/stack-service-base/fiber_pool.rb
 - lib/stack-service-base/logging.rb
 - lib/stack-service-base/open_telemetry.rb