sequel-vertica 0.0.4 → 0.0.5

data/lib/sequel-vertica/version.rb

@@ -1,5 +1,5 @@
 module Sequel
   module Vertica
-    VERSION = "0.0.4"
+    VERSION = "0.0.5"
   end
 end

data/lib/sequel/adapters/vertica.rb

@@ -20,10 +20,12 @@ module Sequel
       end
 
       def execute(sql, opts = {}, &block)
+        res = nil
         synchronize(opts[:server]) do |conn|
           res = conn.query(sql)
           res.each(&block)
         end
+        res
       rescue ::Vertica::Error => e
         raise_error(e)
       end
@@ -76,7 +78,7 @@ module Sequel
         selector = [:column_name, :constraint_name, :is_nullable.as(:allow_null), 
                     (:column_default).as(:default), (:data_type).as(:db_type)]
         filter = { :table_name => table_name }
-        filter [:table_schema] = schema.to_s if schema
+        filter[:table_schema] = schema.to_s if schema
 
         dataset = metadata_dataset.select(*selector).filter(filter).
           from(:v_catalog__columns).left_outer_join(:v_catalog__table_constraints, :table_id => :table_id)
@@ -97,9 +99,17 @@ module Sequel
       EXPLAIN_LOCAL = 'EXPLAIN LOCAL '
       QUERY_PLAN = 'QUERY PLAN' 
 
+      def columns
+        return @columns if @columns
+        ds = unfiltered.unordered.clone(:distinct => nil, :limit => 0, :offset=>nil)
+        res = @db.execute(ds.select_sql)
+        @columns = res.columns.map { |c| c.name }
+        @columns
+      end
+
+
       def fetch_rows(sql)
-        execute(sql) do  |row| 
-          @columns ||= row.keys 
+        execute(sql) do |row| 
           yield row 
         end
       end

data/sequel-vertica.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |gem|
   gem.homepage      = "https://github.com/camilo/sequel-vertica"
 
   gem.add_development_dependency "rspec"
-  gem.add_runtime_dependency "sequel", "~> 3.35.0"
+  gem.add_runtime_dependency "sequel", "~> 3.37.0"
   gem.add_runtime_dependency "vertica", "~> 0.9.1"
 
   gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }

data/spec/adapters/vertica_spec.rb

@@ -108,6 +108,10 @@ describe "A vertica dataset" do
     @d.filter(:name => /^bc/).count.should == 1
   end
 
+  specify "#columns should return the correct column names" do
+    @d.columns!.should == [:name, :value]
+    @d.select(:name).columns!.should == [:name]
+  end
 end
 
 
@@ -275,7 +279,6 @@ describe "Vertica::Database schema qualified tables" do
     VERTICA_DB.drop_table(:domains)
   end
 
-
   specify "#table_exists? should see if the table is in a given schema" do
     VERTICA_DB.create_table(:schema_test__schema_test){integer :i}
     VERTICA_DB.table_exists?(:schema_test__schema_test).should == true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sequel-vertica
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-07-26 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70231334656280 !ruby/object:Gem::Requirement
+  requirement: &70288174048380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,21 +21,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70231334656280
+  version_requirements: *70288174048380
 - !ruby/object:Gem::Dependency
   name: sequel
-  requirement: &70231334655100 !ruby/object:Gem::Requirement
+  requirement: &70288174047880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.35.0
+        version: 3.37.0
   type: :runtime
   prerelease: false
-  version_requirements: *70231334655100
+  version_requirements: *70288174047880
 - !ruby/object:Gem::Dependency
   name: vertica
-  requirement: &70231334654060 !ruby/object:Gem::Requirement
+  requirement: &70288174047380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: 0.9.1
   type: :runtime
   prerelease: false
-  version_requirements: *70231334654060
+  version_requirements: *70288174047380
 description: Sequel adapter for the Vertica database
 email:
 - camilo@camilolopez.com
@@ -77,7 +77,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1597059176510367984
+      hash: 3211600729631246486
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -86,7 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1597059176510367984
+      hash: 3211600729631246486
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10