annotato 0.2.1 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad60c697f9ee0213951d02981190dee26a8db0a2e48ab36d3118c1aaf95d4d40
-  data.tar.gz: 43a5f89b6509a636d579416c92bbbc52c63e15b8029701b46c525bd651a049a1
+  metadata.gz: d46bed9c8d25cf14624fc0381d1742eead5efd0777705e8a55044ac797e0625a
+  data.tar.gz: af4276aea78359e7feb0dff649b5a185fb6074e81cb287ee5dd724b329c2dbe1
 SHA512:
-  metadata.gz: 7753fdc81bfc3568053c99f3f4f98107d0ca3b2ad1b64b127e19902e00f35a8b889b86b2219a431ea2dd673bab86000d0705b59d7a88ef1c68192be2cf012d3e
-  data.tar.gz: d05dd1bb4dd969a77555c3685ab129a9f31a479c5d2f69ef80c9ed7971677c044bc918ec2fd7e1212bc90eb49e678acd306f8afe66d7c9b743ea3b9dc3b9e650
+  metadata.gz: f430a13536edb3f88e2bfcb414c08c7fa38e369cd78b17957940ff7f0366a5b2da4846814e21a65c11b208cff1874850a53180634a142a885e2834b3f6a56fdc
+  data.tar.gz: 7a8cca116a125eff5e994905bb2f2947a567a4146fe9f9a48b6116217d009eb3441ac5e3c109e008fb78c6db9fa439c63756cb5893bf642a4fa5c50ce837d0ac

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    annotato (0.2.1)
+    annotato (0.2.3)
       rails (>= 6.0)
 
 GEM

data/lib/annotato/column_formatter.rb

@@ -1,9 +1,12 @@
 # frozen_string_literal: true
 
 require "json"
+require_relative "wrap_helper"
 
 module Annotato
   class ColumnFormatter
+    extend WrapHelper
+
     # Main entry: returns an array of comment lines per column, flattened.
     def self.format(model, connection)
       table_name     = model.table_name
@@ -23,11 +26,12 @@ module Annotato
         type = col.sql_type
 
         # Build the left-hand side and calculate indent.
-        left  = "#  %-#{name_width}s :%-#{type_width}s" % [name, type]
-        # " default(" is 9 chars; +2 gives the extra gap.
+        # Strip trailing padding spaces immediately — output must never have trailing whitespace.
+        left = ("#  %-#{name_width}s :%-#{type_width}s" % [name, type]).rstrip
+        # indent_size aligns multiline default content under the opening "default(" token.
         indent_size = left.length + 1
         indent_str  = " " * indent_size
-        closing_indent_str  = " " * (indent_size - 2)
+        closing_indent_str = " " * (indent_size - 2)
 
         # Gather all options, pulling out default_lines if multiline.
         opts         = []
@@ -57,10 +61,14 @@ module Annotato
           lines << closing
           lines
         else
-          # single-line comment
-          line = left
-          line += " #{opts.join(', ')}" unless opts.empty?
-          [line.rstrip]
+          # single-line comment; wrap options onto continuation line if too long
+          opts_str = opts.join(", ")
+          line = opts_str.empty? ? left : "#{left} #{opts_str}"
+          if line.length > WrapHelper::MAX_LINE && !opts_str.empty?
+            [left, "#    #{opts_str}"]
+          else
+            [line]
+          end
         end
       end
     end

data/lib/annotato/trigger_formatter.rb

@@ -3,11 +3,28 @@
 module Annotato
   class TriggerFormatter
     def self.format(conn, table_name)
-      conn.exec_query(
-        "SELECT tgname FROM pg_trigger WHERE tgrelid = $1::regclass AND NOT tgisinternal",
-        "SQL",
-        [table_name]
-      ).map { |r| "#  #{r['tgname']}" }
+      rows = case conn.adapter_name.downcase
+             when "postgresql"
+               conn.exec_query(
+                 "SELECT tgname AS name FROM pg_trigger WHERE tgrelid = $1::regclass AND NOT tgisinternal",
+                 "SQL", [table_name]
+               )
+             when "mysql2", "mysql", "trilogy"
+               conn.exec_query(
+                 "SELECT TRIGGER_NAME AS name FROM information_schema.TRIGGERS " \
+                 "WHERE EVENT_OBJECT_SCHEMA = DATABASE() AND EVENT_OBJECT_TABLE = ?",
+                 "SQL", [table_name]
+               )
+             when "sqlite3"
+               conn.exec_query(
+                 "SELECT name FROM sqlite_master WHERE type = 'trigger' AND tbl_name = ?",
+                 "SQL", [table_name]
+               )
+             else
+               return []
+             end
+
+      rows.map { |r| "#  #{r['name']}" }
     end
   end
 end

data/lib/annotato/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Annotato
-  VERSION = "0.2.1"
+  VERSION = "0.2.3"
 end

data/lib/annotato/wrap_helper.rb

@@ -2,7 +2,7 @@
 
 module Annotato
   module WrapHelper
-    MAX_LINE = 100
+    MAX_LINE = 120
 
     # Produces one or more lines, each already prefixed with "#    "
     # First line: "#    where (..."

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: annotato
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.3
 platform: ruby
 authors:
 - Serhii Bodnaruk