sequel-annotate 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2f316737efff6528dad01a3dd9a142299d89430a
-  data.tar.gz: 1cd80a2169fd571993dceac826153c71fcf9e70f
+SHA256:
+  metadata.gz: 112ffb3483f88eacd72945f7890fac2d21b8cfa8f4559b13210eb76d80e36e53
+  data.tar.gz: b2a580e9ddc239a8d2fb948ac5c571733915d9badf2c84385f3d21aaede7ab71
 SHA512:
-  metadata.gz: 3a5d46059231408e13f9fe1752a164a038dfead63b28601184552410982eb04532a8f4083355ac42cf51adab9dfdb4ca95d3c3bed28b0fbf2b45f69a0e9a3dec
-  data.tar.gz: 36855434041c486606a055cd42029dec03a8613a62aaeefd4ce8431fce89cd28f8e07398b2d395d5b2ecec0d9a8edad85abae1556f76c0f6e572077285ff8b37
+  metadata.gz: edcaf9424b611f0ec0b08fb511ef2f7f9d245756040e8adf829101264846c0768f24e4d52d143d64fed4e8a05d58aa820758023e6f1d49e83ed0b87e64c0aa70
+  data.tar.gz: 267dbf8b5693e541abbe3d97154adddfd839d2ea0e3e88475146c0d4739b6f1b42cfd2d01959984d8d7a68851375875a0e11ec28fbf1d5ab8b5c942f2d9f9efd

data/CHANGELOG

@@ -1,3 +1,9 @@
+=== 1.2.0 (2018-04-02)
+
+* Handle PostgreSQL 10+ identity columns when running on Sequel 5.7+ (jeremyevans)
+
+* Use multiline regexps when parsing schema on PostgreSQL (jeremyevans) (#5)
+
 === 1.1.0 (2017-09-06)
 
 * Support :position=>:before option to annotate to put annotation at the beginning of the file (a0s) (#4)

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2015-2017 Jeremy Evans
+Copyright (c) 2015-2018 Jeremy Evans
 Copyright (c) 2013-2015 Kenny Meyer
 
 Permission is hereby granted, free of charge, to any person obtaining

data/Rakefile

@@ -12,7 +12,7 @@ end
 
 desc "Run specs"
 task :spec do
-  sh "#{FileUtils::RUBY} -rubygems -I lib spec/sequel-annotate_spec.rb"
+  sh "#{FileUtils::RUBY} -I lib spec/sequel-annotate_spec.rb"
 end
 
 task :default => :spec

data/lib/sequel/annotate.rb

@@ -115,7 +115,7 @@ SQL
       unless rows.empty?
         output << "# Indexes:"
         rows = rows.map do |r|
-          [r[:relname], "#{"PRIMARY KEY " if r[:indisprimary]}#{"UNIQUE " if r[:indisunique] && !r[:indisprimary]}#{r[:pg_get_indexdef].match(/USING (.+)\z/)[1]}"]
+          [r[:relname], "#{"PRIMARY KEY " if r[:indisprimary]}#{"UNIQUE " if r[:indisunique] && !r[:indisprimary]}#{r[:pg_get_indexdef].match(/USING (.+)\z/m)[1]}"]
         end
         output.concat(align(rows))
       end
@@ -129,7 +129,7 @@ SQL
       unless rows.empty?
         output << "# Check constraints:"
         rows = rows.map do |r|
-          [r[:conname], r[:pg_get_constraintdef].match(/CHECK (.+)\z/)[1]]
+          [r[:conname], r[:pg_get_constraintdef].match(/CHECK (.+)\z/m)[1]]
         end
         output.concat(align(rows))
       end
@@ -143,7 +143,7 @@ SQL
       unless rows.empty?
         output << "# Foreign key constraints:"
         rows = rows.map do |r|
-          [r[:conname], r[:condef].match(/FOREIGN KEY (.+)\z/)[1]]
+          [r[:conname], r[:condef].match(/FOREIGN KEY (.+)\z/m)[1]]
         end
         output.concat(align(rows))
       end
@@ -157,7 +157,7 @@ SQL
       unless rows.empty?
         output << "# Referenced By:"
         rows = rows.map do |r|
-          [r[:conrelid], r[:conname], r[:condef].match(/FOREIGN KEY (.+)\z/)[1]]
+          [r[:conrelid], r[:conname], r[:condef].match(/FOREIGN KEY (.+)\z/m)[1]]
         end
         output.concat(align(rows))
       end
@@ -171,7 +171,7 @@ SQL
       unless rows.empty?
         output << "# Triggers:"
         rows = rows.map do |r|
-          [r[:tgname], r[:pg_get_triggerdef].match(/((?:BEFORE|AFTER) .+)\z/)[1]]
+          [r[:tgname], r[:pg_get_triggerdef].match(/((?:BEFORE|AFTER) .+)\z/m)[1]]
         end
         output.concat(align(rows))
       end
@@ -185,7 +185,7 @@ SQL
       output << "# Columns:"
       rows = model.columns.map do |col|
         sch = model.db_schema[col]
-        [col.to_s, sch[:db_type], "#{"PRIMARY KEY #{"AUTOINCREMENT " if sch[:auto_increment] && model.db.database_type != :postgres}" if sch[:primary_key] && !cpk}#{"NOT NULL " if sch[:allow_null] == false && !sch[:primary_key]}#{"DEFAULT #{sch[:default]}" if sch[:default]}"]
+        [col.to_s, sch[:db_type], "#{"PRIMARY KEY #{"AUTOINCREMENT " if sch[:auto_increment] && model.db.database_type != :postgres}" if sch[:primary_key] && !cpk}#{"NOT NULL " if sch[:allow_null] == false && !sch[:primary_key]}#{"DEFAULT #{sch[:default]}" if sch[:default]}#{"GENERATED BY DEFAULT AS IDENTITY" if sch[:auto_increment] && !sch[:default] && model.db.database_type == :postgres && model.db.server_version >= 100000}"]
       end
       output.concat(align(rows))
     end

data/spec/sequel-annotate_spec.rb

@@ -66,6 +66,13 @@ class ::SManufacturer < Sequel::Model(SDB[:manufacturers]); end
 
 
 describe Sequel::Annotate do
+  def fix_pg_comment(comment)
+    if DB.server_version >= 100002 && (Sequel::MAJOR > 5 || (Sequel::MAJOR == 5 && Sequel::MINOR >= 7))
+      comment = comment.sub(/DEFAULT nextval\('[a-z]+_id_seq'::regclass\)/, 'GENERATED BY DEFAULT AS IDENTITY')
+    end
+    comment
+  end
+
   before do
     Dir.mkdir('spec/tmp') unless File.directory?('spec/tmp')
   end
@@ -74,7 +81,7 @@ describe Sequel::Annotate do
   end
 
   it "#schema_info should return the model schema comment" do
-    Sequel::Annotate.new(Item).schema_comment.must_equal((<<OUTPUT).chomp)
+    Sequel::Annotate.new(Item).schema_comment.must_equal(fix_pg_comment((<<OUTPUT).chomp))
 # Table: items
 # Columns:
 #  id                    | integer               | PRIMARY KEY DEFAULT nextval('items_id_seq'::regclass)
@@ -97,7 +104,7 @@ describe Sequel::Annotate do
 #  valid_price | BEFORE INSERT OR UPDATE ON items FOR EACH ROW EXECUTE PROCEDURE valid_price()
 OUTPUT
 
-    Sequel::Annotate.new(Category).schema_comment.must_equal((<<OUTPUT).chomp)
+    Sequel::Annotate.new(Category).schema_comment.must_equal(fix_pg_comment((<<OUTPUT).chomp))
 # Table: categories
 # Columns:
 #  id   | integer | PRIMARY KEY DEFAULT nextval('categories_id_seq'::regclass)
@@ -165,7 +172,9 @@ OUTPUT
         filename = model.name.downcase
         2.times do
           Sequel::Annotate.new(model).annotate("spec/tmp/#{filename}.rb", *args)
-          File.read("spec/tmp/#{filename}.rb").must_equal File.read("spec/annotated_#{pos}/#{filename}.rb")
+          expected = File.read("spec/annotated_#{pos}/#{filename}.rb")
+          expected = fix_pg_comment(expected) if model.db == DB
+          File.read("spec/tmp/#{filename}.rb").must_equal expected
         end
       end
     end
@@ -177,7 +186,9 @@ OUTPUT
         Sequel::Annotate.annotate(Dir["spec/tmp/*.rb"], *args)
         [Item, Category, Manufacturer, SItem, SCategory, SManufacturer].each do |model|
           filename = model.name.downcase
-          File.read("spec/tmp/#{filename}.rb").must_equal File.read("spec/annotated_#{pos}/#{filename}.rb")
+          expected = File.read("spec/annotated_#{pos}/#{filename}.rb")
+          expected = fix_pg_comment(expected) if model.db == DB
+          File.read("spec/tmp/#{filename}.rb").must_equal expected
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sequel-annotate
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-06 00:00:00.000000000 Z
+date: 2018-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -133,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Annotate Sequel models with schema information