schema_to_dbml 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9032720a1b5f18280931f1c79673a0f1bd19fe11984b7648fe8a51daa4845cad
-  data.tar.gz: e255d62a37be7d8c1980ef5920f447993bff019119ac86cb45e2102d35a65ff1
+  metadata.gz: 01e5c423d835476a25d170272a5d89e762f051951176a21df6b6d62235b0a9c0
+  data.tar.gz: 51a2746ca61db2fae5125b0cf368c4bbca195d7f042b07b5444740e393c0a381
 SHA512:
-  metadata.gz: 51f4a20647f1a6a050b08e45c4d6d0a7c8be8dab2ae1ffed85bcfb94b08d002dd1291247bf6487494e661f5ce993e4378e5ef540542282bee5ae9c4096fb90f9
-  data.tar.gz: 84e5fdc4390ed090174685f6ac18c9f29e278bc82ea99452f5d8dccae9f874c49031daac59bc135c31a2befb990f1ad3795ec024d72bd12bea91697dff0634cc
+  metadata.gz: 9aaefc5b170b0cb209df1b8ab12f80ae7293eb9859cc5470d07af3a84cc55a6546917e23c401de24ba17dc630bd08e297b901af838d6fceac5340d69ed4fe277
+  data.tar.gz: bd6ae1da9afff47e053d851e538a3e3e36a266dc822a98ddfd1b2b81989b814100ba0a6dece7e3c47cadb538530315e582d042fe6bc193e1a36a01dba41cad96

data/.rubocop.yml

@@ -76,4 +76,4 @@ Gemspec/DevelopmentDependencies:
   Enabled: false
 
 Metrics/ParameterLists:
-  Max: 7
+  Max: 8

data/.ruby-version

@@ -0,0 +1 @@
+3.1.2

data/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: .
   specs:
-    schema_to_dbml (0.0.3)
+    schema_to_dbml (0.0.4)
       activesupport (>= 6.1.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.5)
+    activesupport (7.0.6)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -17,15 +17,16 @@ GEM
     concurrent-ruby (1.2.2)
     diff-lcs (1.5.0)
     docile (1.4.0)
-    i18n (1.13.0)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
     json (2.6.3)
-    minitest (5.18.0)
+    language_server-protocol (3.17.0.3)
+    minitest (5.18.1)
     parallel (1.23.0)
     parser (3.2.2.3)
       ast (~> 2.4.1)
       racc
-    racc (1.7.0)
+    racc (1.7.1)
     rainbow (3.1.1)
     rake (13.0.6)
     regexp_parser (2.8.1)
@@ -43,8 +44,9 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.0)
-    rubocop (1.52.1)
+    rubocop (1.54.0)
       json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
       parser (>= 3.2.2.3)
       rainbow (>= 2.2.2, < 4.0)

data/lib/schema_to_dbml/build_dbml_file.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 require_relative 'helpers/constants'
-require_relative './dbml_tables_formatter'
-require_relative './dbml_relations_formatter'
+require_relative 'dbml_tables_formatter'
+require_relative 'dbml_relations_formatter'
 
 class SchemaConverter
   include Helpers::Constants

data/lib/schema_to_dbml/dbml_tables_formatter.rb

@@ -22,11 +22,11 @@ class DbmlTablesFormatter
   def build_columns(parsed_columns)
     columns = []
 
-    parsed_columns.scan(COLUMNS_REGEXP).each do |type, name, default, null, comment, _precision, array|
+    parsed_columns.scan(COLUMNS_REGEXP).each do |type, name, default, null, comment, _precision, array, limit|
       formatted_comment = format_comment(comment:)
       formatted_default = format_default(default:)
       formatted_null = format_null(null:)
-      formatted_type = format_type(type:, array:)
+      formatted_type = format_type(type:, array:, limit:)
 
       final_values = [formatted_default, formatted_null, formatted_comment].compact.reject(&:empty?)
       columns << build_line(name, formatted_type, final_values)

data/lib/schema_to_dbml/formatters/fields_formatter.rb

@@ -5,6 +5,10 @@ require_relative 'default_field_formatter_helper'
 module Formatters
   module FieldsFormatter
     include DefaultFieldFormatterHelper
+    COMMENT_MAPPER = [
+      { from: "'", to: "\\\\'" },
+      { from: '\"', to: '"' }
+    ].freeze
     TYPE_MAPPER = {
       string: 'varchar',
       integer: 'int',
@@ -12,12 +16,13 @@ module Formatters
       datetime: 'timestamp'
     }.freeze
 
-    def format_type(type:, array:)
+    def format_type(type:, array:, limit:)
       return '' if type.to_s.empty?
 
       parsed = TYPE_MAPPER[type.to_sym] || type.to_s
 
       return "#{parsed}[]" if array == 'true'
+      return "#{parsed}(#{limit})" if limit
 
       parsed
     end
@@ -41,7 +46,12 @@ module Formatters
     def format_comment(comment:)
       return '' if comment.to_s.empty?
 
-      "note: '#{comment.gsub("'", "\\\\'")}'"
+      note = comment.dup
+      COMMENT_MAPPER.each do |mapper|
+        note.gsub!(mapper[:from], mapper[:to])
+      end
+
+      "note: '#{note}'"
     end
   end
 end

data/lib/schema_to_dbml/helpers/constants.rb

@@ -18,9 +18,10 @@ module Helpers
       (?:
         (?:,\s+(?<default>default:[^,\n]+?(?=(?:,\s)|$)))?
         (?:,\s+(?<null>null:\s+\w+))?
-        (?:,\s+comment:\s+"(?<comment>[^"]+)")?
+        (?:,\s+comment:\s+"(?<comment>[^"\\]*(?:\\.[^"\\]*)*)")?
         (?:,\s+precision:\s+(?<precision>\d+))?
         (?:,\s+array:\s+(?<array>true|false))?
+        (?:,\s+limit:\s+(?<limit>\d+))?
       )*
     /x
 

data/lib/schema_to_dbml/schema_converter.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 require_relative 'helpers/constants'
-require_relative './dbml_tables_formatter'
-require_relative './dbml_relations_formatter'
+require_relative 'dbml_tables_formatter'
+require_relative 'dbml_relations_formatter'
 
 class SchemaConverter
   include Helpers::Constants

data/lib/schema_to_dbml/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class SchemaToDbml
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: schema_to_dbml
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Ricardo Ribeiro
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-06-21 00:00:00.000000000 Z
+date: 2023-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -118,6 +118,7 @@ extra_rdoc_files: []
 files:
 - ".rspec"
 - ".rubocop.yml"
+- ".ruby-version"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - CONTRIBUTE.md