gadget 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 974283a8788c4a40b2a75f8d8350f6c316836ff5
-  data.tar.gz: 66abb23005b88002c0fae59554f7695b6f452bf0
+  metadata.gz: a9eefefd9392371161169e66ec7c6ecfc9e855dd
+  data.tar.gz: e1b1b8b2cd5be52ca74dfad670e833176f41ac16
 SHA512:
-  metadata.gz: 95e4383e87f251b97eb861e406d6452c3a7ca684d42e384f30311ff6e85a53b2a1ce72bcbd673191fb6fabfb8dd4d6512cd97b1e3372e2c680649b5e163df165
-  data.tar.gz: 167996bc9821904dd2e036de143b02d522aae6d2415536a8508b8059e5bb3c2fdbb209c209bb37d228ba8aaf97faa65697dd3e53178004c1cd7b76cedd6a0c82
+  metadata.gz: 86a0ddd76729246d2e3e81043d1e47af8fefd760ba358f2a11b716870bb68468dbd1d1765f516275fbd0746df99ebf9188ee9aff9c9b22f478ae2fecc4ca3a31
+  data.tar.gz: bf10d81863eded6472abbb34f16b5284a5a99acbcf19142278d1852e8083b700dd7e7a565ecba94dfe69620762003e8fd426580d932db2eff2d9981644d0432e

data/bin/gadget

@@ -4,23 +4,29 @@ require 'gadget'
 
 require 'pg'
 
-(command, dbname) = ARGV
+(dbname, command, *cmdargs) = ARGV
 
 conn = PG::Connection.open(:dbname => dbname, :host => 'localhost')
 result = nil
 case command
+when 'columns'
+  result = Gadget.columns(conn, cmdargs.shift)
 when 'dependencies'
   result = Gadget.dependencies(conn)
 when 'dependency-graph'
   result = Gadget.dependency_graph(conn)
 when 'dependency-order'
   result = Gadget.tables_in_dependency_order(conn)
+when 'foreign-keys', 'fks'
+  result = Gadget.foreign_keys(conn, cmdargs.shift)
 when 'functions'
   result = Gadget.functions(conn)
 when 'tables'
   result = Gadget.tables(conn)
 when 'triggers'
   result = Gadget.triggers(conn)
+else
+  result = "unknown command '#{command}'"
 end
 conn.close
 p result

data/lib/gadget.rb

@@ -26,14 +26,14 @@ module Gadget
     sql = <<-END_OF_SQL
 SELECT t.tablename, a.attname
 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
+INNER JOIN pg_catalog.pg_class c ON a.attrelid = c.oid
+INNER JOIN pg_catalog.pg_tables t ON c.relname = t.tablename
 WHERE a.attnum >= 0
     END_OF_SQL
     if tablename.nil?
       rs = conn.exec(sql)
     else
-      sql += " AND t.tablename=$1"
+      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 }
@@ -43,20 +43,22 @@ WHERE a.attnum >= 0
 
   def self.foreign_keys(conn, tablename = nil)
     sql = <<-END_OF_SQL
-SELECT t1.tablename AS tablename, pg_constraint.conkey as cols, t2.tablename AS refname, pg_constraint.confkey as refcols
+SELECT pg_constraint.conname AS name,
+       t1.tablename AS tablename, pg_constraint.conkey AS cols,
+       t2.tablename AS refname, pg_constraint.confkey AS refcols
 FROM pg_catalog.pg_constraint
-INNER JOIN pg_catalog.pg_class c1 ON pg_constraint.conrelid=c1.oid
-INNER JOIN pg_catalog.pg_tables t1 ON c1.relname=t1.tablename
-INNER JOIN pg_catalog.pg_class c2 ON pg_constraint.confrelid=c2.oid
-INNER JOIN pg_catalog.pg_tables t2 ON c2.relname=t2.tablename
-WHERE t1.schemaname='public'
-AND t2.schemaname='public'
-AND pg_constraint.contype='f'
+INNER JOIN pg_catalog.pg_class c1 ON pg_constraint.conrelid = c1.oid
+INNER JOIN pg_catalog.pg_tables t1 ON c1.relname = t1.tablename
+INNER JOIN pg_catalog.pg_class c2 ON pg_constraint.confrelid = c2.oid
+INNER JOIN pg_catalog.pg_tables t2 ON c2.relname = t2.tablename
+WHERE t1.schemaname = 'public'
+AND t2.schemaname = 'public'
+AND pg_constraint.contype = 'f'
     END_OF_SQL
     if tablename.nil?
       rs = conn.exec(sql)
     else
-      sql += " AND t1.tablename=$1"
+      sql += " AND t1.tablename = $1"
       rs = conn.exec_params(sql, [ tablename ])
     end
     tuples = rs.reduce({}) do | h, row |
@@ -65,6 +67,7 @@ AND pg_constraint.contype='f'
       col_names = self.columns(conn, name)[name][:columns]
       refcol_names = self.columns(conn, row['refname'])[row['refname']][:columns]
       new_ref = {
+        :name => row['name'],
         :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] },

data/lib/gadget/version.rb

@@ -1,3 +1,3 @@
 module Gadget
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

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