sequel-annotate 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 024d60493f6cff6f11e88759519c7bea3527e085d0bd888f8cc84ed74dba112c
-  data.tar.gz: 722da23fe55ebe66b84377ff62ac851d20417950173bb977f21bd7678710f279
+  metadata.gz: 6bc04d174477ed481ef99f6d4173ed4ad691f55d4283c42cb971b8a32772bb41
+  data.tar.gz: d8bfaa715162f40446c079e91dfa32555e18200578dce2f1ad218580157c8ca3
 SHA512:
-  metadata.gz: 1340b7bc98e1650fc91075a5cdd34d4e5f56c21a6c58b8b9c460b68d0bb8fb0997b82f7294d04d9f90b377b2b236057901f711c16a0233ff951948f1f48f39da
-  data.tar.gz: e64ebdcbe577333c76b94fbd45ea795eb918193e46493dd8dba76789214250faba6ab97b5c765d4143be68ecf28d7f29cc7bc76b52750b0ad1ff96e445b4a211
+  metadata.gz: c45070f85dd3dd1acf89946a18463dd7f2245adb2881888b145c93b54dec5b294235adc603a1033ddb6ba2a611d198694d152950f8626a8f101a846c1977e8d8
+  data.tar.gz: 574cee166afd77a7a9353fbeb3ebd4bbbaf2afeb4055265f0371c67218676596594ee316758e4cda2641f7da51a923d271ecfab64c429baf65f583a2ac3301cc

data/CHANGELOG

@@ -1,3 +1,7 @@
+=== 1.3.1 (2018-09-27)
+
+* Make sure all annotation lines are commented by handling newlines inside annotations (jeremyevans)
+
 === 1.3.0 (2018-07-17)
 
 * Support :namespace option to specify namespace to add for models nested in namespaces (jeremyevans)

data/lib/sequel/annotate.rb

@@ -101,7 +101,7 @@ module Sequel
       end
 
       rows.map do |r|
-        "#  #{r.zip(lengths).map{|c, l| c.ljust(l)}.join(' | ')}".strip
+        "#  #{r.zip(lengths).map{|c, l| c.ljust(l).gsub("\n", "\n#    ")}.join(' | ')}".strip
       end
     end
 

data/spec/sequel-annotate_spec.rb

@@ -16,7 +16,7 @@ end
 
 DB.drop_function(:valid_price) rescue nil
 [DB, SDB].each do |db|
-  db.drop_table?(:items, :manufacturers, :categories)
+  db.drop_table?(:newline_tests, :items, :manufacturers, :categories)
 
   db.create_table :categories do
     primary_key :id
@@ -45,6 +45,12 @@ DB.drop_function(:valid_price) rescue nil
     index [:manufacturer_name, :manufacturer_location], :name=>:name, :unique=>true
     index [:manufacturer_name], :name=>:manufacturer_name
   end
+
+  db.create_table :newline_tests do
+    Integer :abcde_fghi_id
+    Integer :jkl_mnopqr_id
+    constraint(:valid_stuvw_xyz0, Sequel.case({{:abcde_fghi_id=>[5,6]}=>Sequel.~(:jkl_mnopqr_id=>nil)}, :jkl_mnopqr_id=>nil))
+  end
 end
 
 DB.run <<SQL
@@ -75,6 +81,7 @@ class ::Manufacturer < Sequel::Model; end
 class ::SItem < Sequel::Model(SDB[:items]); end
 class ::SCategory < Sequel::Model(SDB[:categories]); end
 class ::SManufacturer < Sequel::Model(SDB[:manufacturers]); end
+class ::NewlineTest < Sequel::Model; end
 
 # Abstract Base Class
 ABC = Class.new(Sequel::Model)
@@ -146,6 +153,19 @@ OUTPUT
 #  manufacturers_pkey | PRIMARY KEY btree (name, location)
 # Referenced By:
 #  items | items_manufacturer_name_fkey | (manufacturer_name, manufacturer_location) REFERENCES manufacturers(name, location)
+OUTPUT
+
+    Sequel::Annotate.new(NewlineTest).schema_comment.must_equal((<<OUTPUT).chomp)
+# Table: newline_tests
+# Columns:
+#  abcde_fghi_id | integer |
+#  jkl_mnopqr_id | integer |
+# Check constraints:
+#  valid_stuvw_xyz0 | (
+#    CASE
+#        WHEN abcde_fghi_id = ANY (ARRAY[5, 6]) THEN jkl_mnopqr_id IS NOT NULL
+#        ELSE jkl_mnopqr_id IS NULL
+#    END)
 OUTPUT
 
     Sequel::Annotate.new(SItem).schema_comment.must_equal((<<OUTPUT).chomp)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sequel-annotate
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-17 00:00:00.000000000 Z
+date: 2018-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel