pg_examiner 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36c51dbbc8e2fccfd5eee408216749e98c20086d
-  data.tar.gz: 373bfeb979ed1012d4a05daf1dd5d4720b8c8a65
+  metadata.gz: 697245ba4c753820e5ebb80a41c5776db2b5251b
+  data.tar.gz: d363b5efac3c568c25bf2976185674c9a0473023
 SHA512:
-  metadata.gz: 982b849a8951bf7f9b783cf6ccb9e29d78d55c52a8d0158ec0f15dd474a1986a43a2b88931e0aff1a80915cb7683d82fd1e71b09c192374bb38c8a4650d5aa9c
-  data.tar.gz: 79cb8766ad4867ea4170dc6e5445ed86f849bba61e900982800a4a4355aa600fae7779f7c7176190fa3481375b649db028d4a175b1b79eb81cd466cbdb3dba0b
+  metadata.gz: fd7e6790209d5af475aa27d2f4309b2da294fb33e0ba58f09de18c610a2b7559e7bc1527a72b403a6e5586fb891c298cf751af727772f065dcd099fe09a6b61d
+  data.tar.gz: 0b4520614f4f8eeb35b12ce5810ca8a996989d29e2f41531c32a80666c9e402082f7190f8f5bf8af158f17b87fe5a8dfee1af6f862b47c6593d9ab0ec5ddfa6e

data/lib/pg_examiner/result/column.rb

@@ -29,7 +29,7 @@ module PGExaminer
           @default
         else
           @default_calculated = true
-          @default = result.pg_attrdef.find{|d| d['adrelid'] == row['attrelid']}['default'] if row['atthasdef'] == 't'
+          @default = result.pg_attrdef.find{|d| d['adrelid'] == row['attrelid'] && d['adnum'] == row['attnum']}['default'] if row['atthasdef'] == 't'
         end
       end
     end

data/lib/pg_examiner/result.rb

@@ -106,7 +106,7 @@ module PGExaminer
       SQL
 
       @pg_attrdef = execute <<-SQL
-        SELECT oid, adrelid, pg_get_expr(adbin, adrelid) AS default
+        SELECT oid, adrelid, adnum, pg_get_expr(adbin, adrelid) AS default
         FROM pg_attrdef
       SQL
 

data/lib/pg_examiner/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PGExaminer
-  VERSION = '0.4.1'
+  VERSION = '0.4.2'
 end

data/spec/extension_spec.rb

@@ -6,13 +6,13 @@ describe PGExaminer do
   it "should be able to examine the extensions in the db" do
     result1 = examine "SELECT 1"
     result1.should be_an_instance_of PGExaminer::Result
-    result1.extensions.map(&:name).should == ['plpgsql']
+    result1.extensions.map(&:name).should == ['plpgsql', 'uuid-ossp']
 
     result2 = examine <<-SQL
       CREATE EXTENSION citext;
     SQL
 
-    result2.extensions.length.should == 2
+    result2.extensions.length.should == 3
 
     citext, plpgsql = result2.extensions # Ordered by name
 

data/spec/spec_helper.rb

@@ -12,6 +12,9 @@ CONNECTION = PG::Connection.open :host     => uri.host,
                                  :port     => uri.port || 5432,
                                  :dbname   => uri.path[1..-1]
 
+CONNECTION.set_notice_receiver {|n| n}
+CONNECTION.async_exec('CREATE EXTENSION IF NOT EXISTS "uuid-ossp"')
+
 RSpec.configure do |config|
   config.expect_with(:rspec) { |c| c.syntax = [:expect, :should] }
 

data/spec/table_spec.rb

@@ -154,17 +154,36 @@ describe PGExaminer do
       )
     SQL
 
+    a.should_not == b
+
+    a.diff(b).should == {"schemas"=>{"public"=>{"tables"=>{"test_table"=>{"columns"=>{"a"=>{"type"=>{"int4"=>"text"}}}}}}}}
+  end
+
+  it "should consider tables with columns that have differing defaults not equivalent" do
+    a = examine <<-SQL
+      CREATE TABLE test_table (
+        a uuid default uuid_generate_v4(),
+        b timestamptz default now()
+      );
+    SQL
+
+    b = examine <<-SQL
+      CREATE TABLE test_table (
+        a uuid default uuid_generate_v4(),
+        b timestamptz default now()
+      );
+    SQL
+
     c = examine <<-SQL
       CREATE TABLE test_table (
-        a integer default 5
+        a uuid,
+        b timestamptz default now()
       );
     SQL
 
-    a.should_not == b
+    a.should == b
     a.should_not == c
-
-    a.diff(b).should == {"schemas"=>{"public"=>{"tables"=>{"test_table"=>{"columns"=>{"a"=>{"type"=>{"int4"=>"text"}}}}}}}}
-    a.diff(c).should == {"schemas"=>{"public"=>{"tables"=>{"test_table"=>{"columns"=>{"a"=>{"default"=>{nil=>"5"}}}}}}}}
+    a.diff(c).should == {"schemas"=>{"public"=>{"tables"=>{"test_table"=>{"columns"=>{"a"=>{"default"=>{"uuid_generate_v4()"=>nil}}}}}}}}
   end
 
   it "should consider array types as different from scalar types" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_examiner
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Chris Hanks
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-30 00:00:00.000000000 Z
+date: 2016-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg