gadget 0.6.2 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5e7af10c8638cd881c9445106c792a8f4bb691f
-  data.tar.gz: 285a5b1832e00c9600b6e6686c0482f840fba467
+  metadata.gz: 2336757dc9fef12e7744d993fbb108a8bf3d3442
+  data.tar.gz: fbc711006e1e72f29b9db1e2dce13966c8a0dd3f
 SHA512:
-  metadata.gz: 890b7de992a613cc9261f3ca5058661caed1b7c10db4c93e7082a5a9ec3077707c89e98d637ce6878c4ed08b7e15318f76b01b696c562b98b2cd0d249dc70264
-  data.tar.gz: c6092f8d37547a928586853ca10fa7d76dd1df9b41a7712084d2fd7c52a715c7dff2a7d40e0d633dbd42622ce34b5b258eed5e136681dc4768800c530560a137
+  metadata.gz: 4e6210284a15429d708ac4d79974a377c90385a382428f417e25df22e3dbc4281e39cea98b304cb565673e34c738b12515315d9761b3f68cfb1aa41231826d4e
+  data.tar.gz: 701f4bcd234770d80e5f7ffe880d085d8e94b902366a643c1b65491519b137f8692ad2f84cf7bb6ed86ed744dff174259ab538379a1f9cc95036ce344b3b4d9a

data/Rakefile

@@ -1,9 +1,9 @@
 require "bundler/gem_tasks"
 
 task :console do
-  require 'irb'
-  require 'irb/completion'
-  require 'gadget'
+  require "irb"
+  require "irb/completion"
+  require "gadget"
   ARGV.clear
   IRB.start
 end

data/lib/gadget.rb

@@ -1,9 +1,9 @@
 # encoding: utf-8
 
-require 'pg'
-require 'tsort'
+require "pg"
+require "tsort"
 
-require 'gadget/version'
+require "gadget/version"
 
 ## monkey patch Hash to gain .extractable_options?
 class Hash
@@ -56,8 +56,8 @@ WHERE t.schemaname='public'
     END_OF_SQL
     rs = conn.exec(sql)
     tuples = rs.reduce({}) do | h, row |
-      h[row['tablename']] = {
-        :oid => row['oid'].to_i,
+      h[row["tablename"]] = {
+        oid: row["oid"].to_i,
       }
       h
     end
@@ -69,7 +69,7 @@ WHERE t.schemaname='public'
   #
   # ==== Usage
   #   columns = Gadget.columns(conn)
-  #   columns_in_table = Gadget.columns(conn, 'tablename')
+  #   columns_in_table = Gadget.columns(conn, "tablename")
   #
   # ==== Parameters
   # * +conn+ - a +PG::Connection+ to the database
@@ -85,7 +85,7 @@ WHERE t.schemaname='public'
     nspname = args.shift || "public"
 
     sql = <<-END_OF_SQL
-SELECT t.tablename, a.attname, ns.nspname
+SELECT t.tablename, a.attnum, a.attname, ns.nspname
 FROM pg_catalog.pg_attribute a
 INNER JOIN pg_catalog.pg_class c ON a.attrelid = c.oid
 INNER JOIN pg_catalog.pg_tables t ON c.relname = t.tablename
@@ -104,8 +104,8 @@ AND ns.nspname = $1
       rs = conn.exec_params(sql, [ nspname, tablename ])
     end
     tuples = rs.reduce({}) do | h, row |
-      h[row['tablename']] ||= { :columns => [] }
-      h[row['tablename']][:columns] << row['attname']
+      h[row["tablename"]] ||= { columns: {} }
+      h[row["tablename"]][:columns][row["attnum"]] = row["attname"]
       h
     end
     rs.clear
@@ -116,7 +116,7 @@ AND ns.nspname = $1
   #
   # ==== Usage
   #   fks = Gadget.foreign_keys(conn)
-  #   fks_in_table = Gadget.foreign_keys(conn, 'tablename')
+  #   fks_in_table = Gadget.foreign_keys(conn, "tablename")
   #
   # ==== Parameters
   # * +conn+ - a +PG::Connection+ to the database
@@ -154,15 +154,15 @@ AND pg_constraint.contype = 'f'
       rs = conn.exec_params(sql, [ tablename ])
     end
     tuples = rs.reduce({}) do | h, row |
-      name = row['tablename']
-      h[name] ||= { :refs => [] }
-      col_names = self.columns(conn, name, :include_dropped => true)[name][:columns]
-      refcol_names = self.columns(conn, row['refname'], :include_dropped => true)[row['refname']][:columns]
+      name = row["tablename"]
+      h[name] ||= { refs: [] }
+      col_names = self.columns(conn, name, include_dropped: true)[name][:columns]
+      refcol_names = self.columns(conn, row["refname"], include_dropped: true)[row["refname"]][:columns]
       new_ref = {
-        :name => row['name'],
-        :cols => row['cols'].sub(/\A\{|\}\z/, '').split(',').map { | idx | col_names[idx.to_i - 1] },
-        :ref_name => row['refname'],
-        :ref_cols => row['refcols'].sub(/\A\{|\}\z/, '').split(',').map { | idx | refcol_names[idx.to_i - 1] },
+        name: row["name"],
+        cols: row["cols"].sub(/\A\{|\}\z/, "").split(",").map { | attnum | col_names[attnum] },
+        ref_name: row["refname"],
+        ref_cols: row["refcols"].sub(/\A\{|\}\z/, "").split(",").map { | attnum | refcol_names[attnum] },
       }
       h[name][:refs] << new_ref
       h
@@ -175,7 +175,7 @@ AND pg_constraint.contype = 'f'
   #
   # ==== Usage
   #   constraints = Gadget.constraints(conn)
-  #   constraints_in_table = Gadget.constraints(conn, 'tablename')
+  #   constraints_in_table = Gadget.constraints(conn, "tablename")
   #
   # ==== Parameters
   # * +conn+ - a +PG::Connection+ to the database
@@ -213,26 +213,26 @@ WHERE t.schemaname = 'public'
       rs = conn.exec_params(sql, [ tablename ])
     end
     tuples = rs.reduce({}) do | h, row |
-      name = row['tablename']
-      h[name] ||= { :constraints => [] }
+      name = row["tablename"]
+      h[name] ||= { constraints: [] }
       new_constraint = {
-        :name => row['name'],
-        :kind => case row['constrainttype']
-                 when 'c'
-                   'check'
-                 when 'f'
-                   'foreign key'
-                 when 'p'
-                   'primary key'
-                 when 't'
-                   'trigger'
-                 when 'u'
-                   'unique'
-                 when 'x'
-                   'exclusion'
-                 else
-                   "*** unknown: '#{row['constrainttype']}'"
-                 end,
+        name: row["name"],
+        kind: case row["constrainttype"]
+              when "c"
+                "check"
+              when "f"
+                "foreign key"
+              when "p"
+                "primary key"
+              when "t"
+                "trigger"
+              when "u"
+                "unique"
+              when "x"
+                "exclusion"
+              else
+                %Q(*** unknown: "#{row["constrainttype"]}"")
+              end,
       }
       h[name][:constraints] << new_constraint
       h
@@ -331,9 +331,9 @@ WHERE n.nspname = 'public'
     END_OF_SQL
 
     tuples = rs.reduce({}) do | h, row |
-      h[row['proname']] = {
-        :oid => row['oid'].to_i,
-        :arg_types => row['proargtypes'].split(/\s+/).map(&:to_i),
+      h[row["proname"]] = {
+        oid: row["oid"].to_i,
+        arg_types: row["proargtypes"].split(/\s+/).map(&:to_i),
       }
       h
     end
@@ -365,8 +365,8 @@ AND n.nspname = 'public'
     END_OF_SQL
     rs = conn.exec(sql)
     tuples = rs.reduce({}) do | h, row |
-      h[row['relname']] = {
-        :oid => row['oid'].to_i,
+      h[row["relname"]] = {
+        oid: row["oid"].to_i,
       }
       h
     end
@@ -407,10 +407,10 @@ WHERE tg.tgconstrrelid = 0
       rs = conn.exec_params(sql, [ tablename ])
     end
     tuples = rs.reduce({}) do | h, row |
-      h[row['tgname']] = {
-        :oid => row['oid'].to_i,
-        :table_name => row['tablename'],
-        :function_name => row['proname'],
+      h[row["tgname"]] = {
+        oid: row["oid"].to_i,
+        table_name: row["tablename"],
+        function_name: row["proname"],
       }
       h
     end
@@ -439,8 +439,8 @@ FROM pg_catalog.pg_type t
     END_OF_SQL
 
     tuples = rs.reduce({}) do | h, row |
-      h[row['typname']] = {
-        :oid => row['oid'].to_i,
+      h[row["typname"]] = {
+        oid: row["oid"].to_i,
       }
       h
     end

data/lib/gadget/version.rb

@@ -1,3 +1,3 @@
 module Gadget
-  VERSION = "0.6.2"
+  VERSION = "0.7.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gadget
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.0
 platform: ruby
 authors:
 - Craig S. Cottingham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-05 00:00:00.000000000 Z
+date: 2016-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -165,7 +165,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Some methods for getting metadata and other deep details from a PostgreSQL