gadget 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2bf83e177e0c22d39fbdd338c5df052bcf7ea6e
-  data.tar.gz: 092f282fbacd8cb1858bbf96fff28e4cd74033e6
+  metadata.gz: 871bc48234116c2a7488eba4a4a354c3cb8d4961
+  data.tar.gz: 74561ca3469ef7dbc9f5acc8e5d7813a39daa5a4
 SHA512:
-  metadata.gz: e4dd82afa75702c5c8953d4dceb7086cde36b787365d61e0a6441f6edd25e79fc3322ac92654a60972279ff9988b3f470618f95bf78883ecccf66296cfd7c564
-  data.tar.gz: ee495b40222d0a17d18864d526ea84af4e2721204b016fe6639e8870093423dc49c974872ecdda070162cad9271bb536d475a4af3ad8d9c8877dab293944fc25
+  metadata.gz: e671d7aaf1b8227c5811967c7abb3355de0d72323f3bb1104405a22e8caaba24dd0bbe4fabbd1def1145b5955c8434bf2f4625d82ae5e938f0f02257858560ee
+  data.tar.gz: 0a9135347a3cdf0cc941ab753f2584d33df9dfa73041f3211e555cb175edd8458d559f8f9b729c8356f433a2caa798830f030a93cd282ff72e915a59d0a85e52

data/Rakefile

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

data/lib/gadget.rb

@@ -82,22 +82,26 @@ WHERE t.schemaname='public'
   def self.columns(conn, *args)
     options = args.extract_options!
     tablename = args.shift
+    nspname = args.shift || "public"
 
     sql = <<-END_OF_SQL
-SELECT t.tablename, a.attname
+SELECT t.tablename, 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
+INNER JOIN pg_catalog.pg_namespace ns ON c.relnamespace = ns.oid
 WHERE a.attnum >= 0
+AND t.schemaname = ns.nspname
+AND ns.nspname = $1
     END_OF_SQL
     unless options[:include_dropped]
       sql += " AND a.attisdropped IS FALSE"
     end
     if tablename.nil?
-      rs = conn.exec(sql)
+      rs = conn.exec_params(sql, [ nspname ])
     else
-      sql += " AND t.tablename = $1"
-      rs = conn.exec_params(sql, [ tablename ])
+      sql += " AND t.tablename = $2"
+      rs = conn.exec_params(sql, [ nspname, tablename ])
     end
     tuples = rs.reduce({}) do | h, row |
       h[row['tablename']] ||= { :columns => [] }

data/lib/gadget/version.rb

@@ -1,3 +1,3 @@
 module Gadget
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gadget
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Craig S. Cottingham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-26 00:00:00.000000000 Z
+date: 2014-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg