sequel-vertica 0.1.0 → 0.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 224357ab7df2bccbf853e1a34c7bc5f6b1c89ebb
+  data.tar.gz: 2480bc67b31e77b8291d2fa3198f8c0bbe1bc074
+SHA512:
+  metadata.gz: 2e5f8fd7028e06c8d0e7e5d78eb60a237f490adff29fea5dff4c42e718f614e50a666c83d02c8bb049130c60b62a16784e12cbfbc694427663e1bea0b5d742ab
+  data.tar.gz: 672e91d04cd326dfa20f961f268a675381565a44a6cc44ea6b260c83983924143fe3b7b37ec3207f47c277809a3e5618e9118b77c9e17913d616aaf35482bcc0

data/.rspec

@@ -0,0 +1 @@
+--color --format doc

data/.travis.yml

@@ -0,0 +1,19 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - 2.0.0
+  - 2.1.1
+
+before_install:
+  - sudo wget -nv https://s3.amazonaws.com/circle-support-bucket/vertica_7.0.1-0_amd64.deb
+  - sudo dpkg -i vertica_7.0.1-0_amd64.deb
+  - sudo /opt/vertica/sbin/install_vertica --failure-threshold HALT --accept-eula --dba-user-password dbadmin --license CE -s localhost
+  - sudo -u dbadmin /opt/vertica/bin/adminTools -t create_db --database ci -s localhost -p dbadmin
+  # - sudo -u dbadmin openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout /home/dbadmin/ci/v_ci_node0001_catalog/server.key -out /home/dbadmin/ci/v_ci_node0001_catalog/server.crt -batch
+  # - sudo -u dbadmin chmod 600 /home/dbadmin/ci/v_ci_node0001_catalog/server.key /home/dbadmin/ci/v_ci_node0001_catalog/server.crt
+  # - sudo -u dbadmin /opt/vertica/bin/adminTools -t stop_db --database ci -p dbadmin
+  # - sudo -u dbadmin sh -c 'echo "EnableSSL = 1" > /home/dbadmin/ci/v_ci_node0001_catalog/vertica.conf'
+  # - sudo -u dbadmin /opt/vertica/bin/adminTools -t start_db --database ci -p dbadmin
+
+before_script:
+  - cp ./spec/spec_config.example.rb ./spec/spec_config.rb

data/{Readme.md → README.md}

@@ -1,9 +1,9 @@
-## Sequel-vertica
+# Sequel-vertica [![Build Status](https://travis-ci.org/camilo/sequel-vertica.svg?branch=travis)](https://travis-ci.org/camilo/sequel-vertica)
 
 A third party adapter to use Vertica through sequel, most of the actual work is
 done by sequel and the vertica gem.
 
-# Usage
+## Usage
 
 The usage is straight forward as any other Sequel adapter, just make sure to
 require sequel and the sequel-vertica gem.

data/lib/sequel-vertica/version.rb

@@ -1,5 +1,5 @@
 module Sequel
   module Vertica
-    VERSION = "0.1.0"
+    VERSION = "0.2.0"
   end
 end

data/lib/sequel/adapters/vertica.rb

@@ -1,6 +1,7 @@
 require 'vertica'
 
 module Sequel
+  extension :core_extensions
   module Vertica
 
     class CreateTableGenerator < Sequel::Schema::CreateTableGenerator
@@ -18,7 +19,7 @@ module Sequel
 
     class Database < Sequel::Database
 
-      ::Vertica::Connection.send(:alias_method,:execute, :query)
+      ::Vertica::Connection.send(:alias_method, :execute, :query)
 
       PK_NAME = 'C_PRIMARY'
       AUTO_INCREMENT = 'AUTO_INCREMENT'
@@ -33,7 +34,8 @@ module Sequel
           :port => opts[:port],
           :schema => opts[:schema],
           :database => opts[:database],
-          :ssl => opts[:ssl] )
+          :ssl => opts[:ssl] 
+        )
       end
 
       def execute(sql, opts = {}, &block)
@@ -86,27 +88,31 @@ module Sequel
         Vertica::CreateTableGenerator
       end
 
-      def tables(options = {} )
+      def tables(options = {})
         schema = options[:schema]
         filter = {}
         filter[:table_schema] = schema.to_s if schema
 
-        ds = dataset.select(:table_name).from(:v_catalog__tables).
-          filter(filter)
-
-        ds.to_a.map{ |h| h[:table_name].to_sym }
+        dataset.select(:table_name).
+          from(:v_catalog__tables).
+          filter(filter).
+          to_a.
+          map { |h| h[:table_name].to_sym }
       end
 
       def schema_parse_table(table_name, options = {})
         schema = options[:schema]
 
-        selector = [:column_name, :constraint_name, :is_nullable.as(:allow_null), 
+        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 = { :columns__table_name => table_name }
+        filter[:columns__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)
+        dataset = metadata_dataset.
+          select(*selector).
+          filter(filter).
+          from(:v_catalog__columns).
+          left_outer_join(:v_catalog__table_constraints, :table_id => :table_id)
 
         dataset.map do |row|
           row[:default] = nil if blank_object?(row[:default])
@@ -115,32 +121,30 @@ module Sequel
           [row.delete(:column_name).to_sym, row]
         end
       end
-
     end
 
     class Dataset < Sequel::Dataset
       Database::DatasetClass = self
       EXPLAIN = 'EXPLAIN '
       EXPLAIN_LOCAL = 'EXPLAIN LOCAL '
-      QUERY_PLAN = 'QUERY PLAN' 
+      QUERY_PLAN = 'QUERY PLAN'
 
       def columns
         return @columns if @columns
-        ds = unfiltered.unordered.clone(:distinct => nil, :limit => 0, :offset=>nil)
+        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| 
-          yield row 
+        execute(sql) do |row|
+          yield row
         end
       end
 
       def explain(opts={})
-        execute((opts[:local] ? EXPLAIN_LOCAL : EXPLAIN) + select_sql).map{ |k, v| k == QUERY_PLAN }.join("\$")
+        execute((opts[:local] ? EXPLAIN_LOCAL : EXPLAIN) + select_sql).map { |k, v| k == QUERY_PLAN }.join("\$")
       end
 
       def supports_regexp?

data/sequel-vertica.gemspec

@@ -2,22 +2,28 @@
 require File.expand_path('../lib/sequel-vertica/version', __FILE__)
 
 Gem::Specification.new do |gem|
+  gem.name          = "sequel-vertica"
+  gem.version       = Sequel::Vertica::VERSION
+
   gem.authors       = ["Camilo Lopez"]
   gem.email         = ["camilo@camilolopez.com"]
   gem.description   = %q{Sequel adapter for the Vertica database}
   gem.summary       = %q{Sequel adapter for the Vertica database largely based on the PostgreSQL adapter}
   gem.homepage      = "https://github.com/camilo/sequel-vertica"
+  gem.license     = "MIT"
 
   gem.requirements  = "Vertica version 6.0 or higher"
+  gem.required_ruby_version = '>= 1.9.3'
 
-  gem.add_development_dependency "rspec"
-  gem.add_runtime_dependency "sequel", "~> 3.42.0"
-  gem.add_runtime_dependency "vertica", "~> 0.10.0"
+  gem.add_runtime_dependency "sequel", "~> 4.9.0"
+  gem.add_runtime_dependency "vertica", "~> 0.11.0"
+
+  gem.add_development_dependency "rake", ">= 10"
+  gem.add_development_dependency "rspec" , "~> 2.14"
 
   gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   gem.files         = `git ls-files`.split("\n")
   gem.test_files    = `git ls-files -- {spec}/*`.split("\n")
-  gem.name          = "sequel-vertica"
+  
   gem.require_paths = ["lib"]
-  gem.version       = Sequel::Vertica::VERSION
 end

data/spec/adapters/vertica_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper.rb')
+require 'spec_helper'
 
 unless defined?(VERTICA_DB)
   VERTICA_URL = 'vertica://vertica:vertica@localhost:5432/reality_spec' unless defined? VERTICA_URL
@@ -28,7 +28,7 @@ VERTICA_DB.create_table! :test4 do
   bytea :value
 end
 
-describe "A Vertica database" do 
+describe "A Vertica database" do
 
   before do
     @db = VERTICA_DB
@@ -67,7 +67,7 @@ describe "A vertica dataset" do
     @d.select(:name).sql.should == \
       'SELECT "name" FROM "test"'
 
-    @d.select('COUNT(*)'.lit).sql.should == \
+    @d.select(Sequel.lit('COUNT(*)')).sql.should == \
       'SELECT COUNT(*) FROM "test"'
 
     @d.select(:max.sql_function(:value)).sql.should == \
@@ -82,13 +82,13 @@ describe "A vertica dataset" do
     @d.order(:name.desc).sql.should == \
       'SELECT * FROM "test" ORDER BY "name" DESC'
 
-    @d.select('test.name AS item_name'.lit).sql.should == \
+    @d.select(Sequel.lit('test.name AS item_name')).sql.should == \
       'SELECT test.name AS item_name FROM "test"'
 
-    @d.select('"name"'.lit).sql.should == \
+    @d.select(Sequel.lit('"name"')).sql.should == \
       'SELECT "name" FROM "test"'
 
-    @d.select('max(test."name") AS "max_name"'.lit).sql.should == \
+    @d.select(Sequel.lit('max(test."name") AS "max_name"')).sql.should == \
       'SELECT max(test."name") AS "max_name" FROM "test"'
 
     @d.insert_sql(:x => :y).should =~ \
@@ -239,7 +239,6 @@ describe "Vertica::Database schema qualified tables" do
 
   after do
     VERTICA_DB << "DROP SCHEMA schema_test CASCADE"
-    VERTICA_DB.default_schema = nil
   end
 
   specify "should be able to create, drop, select and insert into tables in a given schema" do
@@ -247,11 +246,11 @@ describe "Vertica::Database schema qualified tables" do
     VERTICA_DB[:schema_test__table_in_schema_test].first.should == nil
     VERTICA_DB[:schema_test__table_in_schema_test].insert(:i=>1).should == 1
     VERTICA_DB[:schema_test__table_in_schema_test].first.should == {:i=>1}
-    VERTICA_DB.from('schema_test.table_in_schema_test'.lit).first.should == {:i=>1}
+    VERTICA_DB.from(Sequel.lit('schema_test.table_in_schema_test')).first.should == {:i=>1}
     VERTICA_DB.drop_table(:schema_test__table_in_schema_test)
     VERTICA_DB.create_table(:table_in_schema_test.qualify(:schema_test)){integer :i}
     VERTICA_DB[:schema_test__table_in_schema_test].first.should == nil
-    VERTICA_DB.from('schema_test.table_in_schema_test'.lit).first.should == nil
+    VERTICA_DB.from(Sequel.lit('schema_test.table_in_schema_test')).first.should == nil
     VERTICA_DB.drop_table(:table_in_schema_test.qualify(:schema_test))
   end
 

data/spec/spec_config.example.rb

@@ -1 +1 @@
-VERTICA_URL = 'vertica://dbadmin:@127.0.0.1:5433/warehouse'
+VERTICA_URL = 'vertica://dbadmin:dbadmin@127.0.0.1:5433/ci'

data/spec/spec_helper.rb

@@ -0,0 +1,55 @@
+require 'rubygems'
+require 'logger'
+require 'sequel'
+
+begin
+  require 'spec_config'
+rescue LoadError
+  $stderr.puts "Please create a file spec/spec_config.rb with a database connection string."
+  raise
+end
+
+if ENV['SEQUEL_COLUMNS_INTROSPECTION']
+  Sequel.extension :columns_introspection
+  Sequel::Dataset.introspect_all_columns
+end
+
+
+Sequel.cache_anonymous_models = false
+
+class Sequel::Database
+  def log_duration(duration, message)
+    log_info(message)
+  end
+end
+
+(defined?(RSpec) ? RSpec::Core::ExampleGroup : Spec::Example::ExampleGroup).class_eval do
+  def log
+    begin
+      INTEGRATION_DB.loggers << Logger.new(STDOUT)
+      yield
+    ensure
+      INTEGRATION_DB.loggers.pop
+    end
+  end
+
+  def self.cspecify(message, *checked, &block)
+    return specify(message, &block) if ENV['SEQUEL_NO_PENDING']
+    pending = false
+    checked.each do |c|
+      case c
+      when INTEGRATION_DB.adapter_scheme
+        pending = c
+      when Proc
+        pending = c if c.first.call(INTEGRATION_DB)
+      when Array
+        pending = c if c.first == INTEGRATION_DB.adapter_scheme && c.last == INTEGRATION_DB.call(INTEGRATION_DB)
+      end
+    end
+    if pending
+      specify(message){pending("Not yet working on #{Array(pending).join(', ')}", &block)}
+    else
+      specify(message, &block)
+    end
+  end
+end

metadata

@@ -1,64 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: sequel-vertica
 version: !ruby/object:Gem::Version
-  prerelease: 
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Camilo Lopez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-11 00:00:00.000000000 Z
+date: 2014-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: sequel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.9.0
+  type: :runtime
   prerelease: false
-  name: rspec
-  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-    none: false
+        version: 4.9.0
+- !ruby/object:Gem::Dependency
+  name: vertica
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-    none: false
-- !ruby/object:Gem::Dependency
-  prerelease: false
-  name: sequel
+        version: 0.11.0
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.42.0
-    none: false
+        version: 0.11.0
+- !ruby/object:Gem::Dependency
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 3.42.0
-    none: false
-- !ruby/object:Gem::Dependency
+        version: '10'
+  type: :development
   prerelease: false
-  name: vertica
-  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.10.0
-    none: false
+        version: '10'
+- !ruby/object:Gem::Dependency
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.10.0
-    none: false
+        version: '2.14'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.14'
 description: Sequel adapter for the Vertica database
 email:
 - camilo@camilolopez.com
@@ -67,47 +74,43 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
+- .travis.yml
 - CHANGELOG
 - Gemfile
+- README.md
 - Rakefile
-- Readme.md
 - lib/sequel-vertica.rb
 - lib/sequel-vertica/version.rb
 - lib/sequel/adapters/vertica.rb
 - sequel-vertica.gemspec
-- spec/adapters/spec_helper.rb
 - spec/adapters/vertica_spec.rb
 - spec/spec_config.example.rb
 - spec/spec_helper.rb
 homepage: https://github.com/camilo/sequel-vertica
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
-      segments:
-      - 0
-      hash: 2330074690303578723
-      version: '0'
-  none: false
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
-      segments:
-      - 0
-      hash: 2330074690303578723
       version: '0'
-  none: false
 requirements:
 - Vertica version 6.0 or higher
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Sequel adapter for the Vertica database largely based on the PostgreSQL adapter
 test_files: []
+has_rdoc: 

data/spec/adapters/spec_helper.rb

@@ -1,57 +0,0 @@
-require 'rubygems'
-require 'logger'
-
-unless Object.const_defined?('Sequel') &&  Sequel.const_defined?('Model')
-  $:.unshift(File.join(File.dirname(File.expand_path(__FILE__)), "../../lib/"))
-  require 'sequel'
-end
-
-begin
-  require File.join(File.dirname(File.dirname(File.expand_path(__FILE__))), 'spec_config.rb')
-rescue LoadError
-end
-
-if ENV['SEQUEL_COLUMNS_INTROSPECTION']
-  Sequel.extension :columns_introspection
-  Sequel::Dataset.introspect_all_columns
-end
-
-
-Sequel::Model.cache_anonymous_models = false
-
-class Sequel::Database
-  def log_duration(duration, message)
-    log_info(message)
-  end
-end
-
-(defined?(RSpec) ? RSpec::Core::ExampleGroup : Spec::Example::ExampleGroup).class_eval do
-  def log 
-    begin
-      INTEGRATION_DB.loggers << Logger.new(STDOUT)
-      yield
-    ensure
-     INTEGRATION_DB.loggers.pop
-    end 
-  end 
-
-  def self.cspecify(message, *checked, &block)
-    return specify(message, &block) if ENV['SEQUEL_NO_PENDING']
-    pending = false
-    checked.each do |c|
-      case c
-      when INTEGRATION_DB.adapter_scheme
-        pending = c
-      when Proc
-        pending = c if c.first.call(INTEGRATION_DB)
-      when Array
-        pending = c if c.first == INTEGRATION_DB.adapter_scheme && c.last == INTEGRATION_DB.call(INTEGRATION_DB)
-      end
-    end
-    if pending
-      specify(message){pending("Not yet working on #{Array(pending).join(', ')}", &block)}
-    else
-      specify(message, &block)
-    end
-  end
-end