gadget 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a24920c2e0dfbd4e9be5d21f3cbb358028612402
-  data.tar.gz: a7add1ba201f2f2084e445255f395ebc0b8ade54
+  metadata.gz: ece84105a691b5880948bbeac5dcb229ba654aa6
+  data.tar.gz: 4fc8cc56f871fdcb5c471a50a8a9a39295375b7d
 SHA512:
-  metadata.gz: 41656df40068edc50de39fdad9dcc099be8179cc5a028618a03b8047d75f3abcf599aac8fed2105f89386e20213b54430df14ff864f7295e1bf9ebc568a4f863
-  data.tar.gz: 6ffc8664913c5a759e5580cc01226a4f1ccd87d257498740c10d094165baa1f8ca52cbc195a466a6e75f41e181374e8ac7c907b405ccc5530f097abf86b2a8cf
+  metadata.gz: b18de42940505918186b4622d7e1cac13cd0e55b03b0cd687a634dc6267c2899ee6a3032593c998f3890565be16d94d7989daf6cdefbb19dc2ee6ff6ee3666e6
+  data.tar.gz: 92381cb642b34f08e841335f4c7bf4fcbcdc9607a811f7dc02385f12e61948bfb4a5b34ed8d6bb07e5273f28ef82d9b1fd50bcf914f61f8ca55e51f45f0dd6a9

data/lib/gadget.rb

@@ -43,7 +43,7 @@ WHERE a.attnum >= 0
 
   def self.foreign_keys(conn, tablename = nil)
     sql = <<-END_OF_SQL
-SELECT t1.tablename AS tablename, t2.tablename AS refname
+SELECT t1.tablename AS tablename, pg_constraint.conkey as cols, t2.tablename AS refname, pg_constraint.confkey as refcols
 FROM pg_constraint
 INNER JOIN pg_class c1 ON pg_constraint.conrelid=c1.oid
 INNER JOIN pg_tables t1 ON c1.relname=t1.tablename
@@ -59,7 +59,19 @@ AND pg_constraint.contype='f'
       sql += " AND t1.tablename=$1"
       rs = conn.exec_params(sql, [ tablename ])
     end
-    tuples = rs.reduce({}) { | h, row | h[row['tablename']] ||= { :refs => [] }; h[row['tablename']][:refs] << row['refname']; h }
+    tuples = rs.reduce({}) do | h, row |
+      name = row['tablename']
+      h[name] ||= { :refs => [] }
+      col_names = self.columns(conn, name)[name][:columns]
+      refcol_names = self.columns(conn, row['refname'])[row['refname']][:columns]
+      new_ref = {
+        :cols => row['cols'].sub(/\A\{|\}\z/, '').split(',').map { | idx | col_names[idx.to_i - 1] },
+        :refname => row['refname'],
+        :refcols => row['refcols'].sub(/\A\{|\}\z/, '').split(',').map { | idx | refcol_names[idx.to_i - 1] },
+      }
+      h[name][:refs] << new_ref
+      h
+    end
     rs.clear
     tuples
   end
@@ -71,7 +83,7 @@ AND pg_constraint.contype='f'
       h[tablename] = []
       refs = foreign_keys[tablename]
       unless refs.nil?
-        refs[:refs].each { | ref | h[tablename] << ref }
+        refs[:refs].each { | ref | h[tablename] << ref[:refname] }
       end
       h
     end

data/lib/gadget/version.rb

@@ -1,3 +1,3 @@
 module Gadget
-  VERSION = "0.0.2"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gadget
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Craig S. Cottingham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-27 00:00:00.000000000 Z
+date: 2014-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg