gadget 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81afaef3c2ab2c77023e0e8b89ecbf4b2f38795b
-  data.tar.gz: 5e36fbf9faeaf870d7d9d9c4039d4fffe881d19c
+  metadata.gz: 4c4ee82ad59af21e41af87425042ad51394fd412
+  data.tar.gz: 80aa411a7b0e3cad37dcd6b27f88dd8e31a85e82
 SHA512:
-  metadata.gz: a81e148597a096d48f7557ce50a51460faee9fea0bdf9ce43d98cc954417735b8cfbf7e2c697a49d7aeabaa7751584f591d6f5cbd9a7fc09e2f297ae6e368a10
-  data.tar.gz: 70e7140504c889acd899be663c4e02a3ada4356d5843e8a2e74f745f098bb1b7d092f87a81d27dd3688d5405421e6166119f2bdb08cf7490d6b9e52e863ebb19
+  metadata.gz: 3bfca7af601de89b47c3111839ba5fcc88b7ca8d4b6721114fd29e4a25896147ac495372a280fef7901428d56c13211c097f993afd6b12b0a35bae5972f57125
+  data.tar.gz: 62dbac736ffa02902e9c4cf63183e79a9f83681e49cb0da8cee44b0736322152e526c5562765ae6ee63ceaf1bb833ee6571c995b600574bd20f33af6325fe2bf

data/lib/gadget.rb

@@ -17,7 +17,12 @@ module Gadget
 
   def self.tables(conn)
     rs = conn.exec("SELECT c.oid, t.tablename FROM pg_tables t INNER JOIN pg_class c ON c.relname=t.tablename WHERE t.schemaname='public' ORDER BY t.tablename")
-    tuples = rs.reduce({}) { | h, row | h[row['tablename']] = { :oid => row['oid'] }; h }
+    tuples = rs.reduce({}) do | h, row |
+      h[row['tablename']] = {
+        :oid => row['oid'].to_i,
+      }
+      h
+    end
     rs.clear
     tuples
   end
@@ -36,7 +41,11 @@ WHERE a.attnum >= 0
       sql += " AND t.tablename = $1"
       rs = conn.exec_params(sql, [ tablename ])
     end
-    tuples = rs.reduce({}) { | h, row | h[row['tablename']] ||= { :columns => [] }; h[row['tablename']][:columns] << row['attname']; h }
+    tuples = rs.reduce({}) do | h, row |
+      h[row['tablename']] ||= { :columns => [] }
+      h[row['tablename']][:columns] << row['attname']
+      h
+    end
     rs.clear
     tuples
   end
@@ -155,27 +164,57 @@ WHERE t.schemaname = 'public'
 
   def self.functions(conn)
     rs = conn.exec(<<-END_OF_SQL)
-SELECT p.oid, p.proname
+SELECT p.oid, p.proname, p.proargtypes
 FROM pg_catalog.pg_proc p
 INNER JOIN pg_catalog.pg_namespace n ON p.pronamespace = n.oid
 WHERE n.nspname = 'public'
     END_OF_SQL
 
-    tuples = rs.reduce({}) { | h, row | h[row['proname']] = { :oid => row['oid'] }; h }
+    tuples = rs.reduce({}) do | h, row |
+      h[row['proname']] = {
+        :oid => row['oid'].to_i,
+        :arg_types => row['proargtypes'].split(/\s+/).map(&:to_i),
+      }
+      h
+    end
     rs.clear
     tuples
   end
 
   def self.triggers(conn)
     rs = conn.exec(<<-END_OF_SQL)
-SELECT tg.oid, tg.tgname, t.tablename
+SELECT tg.oid, tg.tgname, t.tablename, p.proname
 FROM pg_catalog.pg_trigger tg
 INNER JOIN pg_catalog.pg_class c ON tg.tgrelid = c.oid
 INNER JOIN pg_catalog.pg_tables t ON c.relname = t.tablename
+INNER JOIN pg_catalog.pg_proc p ON tg.tgfoid = p.oid
 WHERE tg.tgconstrrelid = 0
     END_OF_SQL
 
-    tuples = rs.reduce({}) { | h, row | h[row['tgname']] = { :oid => row['oid'], :tablename => row['tablename'] }; h }
+    tuples = rs.reduce({}) do | h, row |
+      h[row['tgname']] = {
+        :oid => row['oid'].to_i,
+        :tablename => row['tablename'],
+        :functionname => row['proname'],
+      }
+      h
+    end
+    rs.clear
+    tuples
+  end
+
+  def self.types(conn)
+    rs = conn.exec(<<-END_OF_SQL)
+SELECT t.oid, t.typname
+FROM pg_catalog.pg_type t
+    END_OF_SQL
+
+    tuples = rs.reduce({}) do | h, row |
+      h[row['typname']] = {
+        :oid => row['oid'].to_i,
+      }
+      h
+    end
     rs.clear
     tuples
   end

data/lib/gadget/version.rb

@@ -1,3 +1,3 @@
 module Gadget
-  VERSION = "0.3.2"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gadget
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Craig S. Cottingham