activerecord-redshift-adapter 0.8.0 → 0.9.0

data/.gitignore

@@ -21,4 +21,6 @@ spec/dummy/log/*.log
 spec/dummy/tmp/
 spec/dummy/.sass-cache
 spec/dummy/config/database.yml
-spec/dummy/db/schema.rb
+spec/dummy/db/schema.rb
+
+Gemfile.lock

data/activerecord-redshift-adapter.gemspec

@@ -18,4 +18,5 @@ Gem::Specification.new do |s|
  s.homepage    = 'http://github.com/fiksu/activerecord-redshift-adapter'
  s.add_dependency "pg"
  s.add_dependency "rails", '>= 3.0.0'
+ s.add_development_dependency 'rspec'
 end

data/lib/active_record/connection_adapters/redshift_adapter.rb

@@ -37,6 +37,10 @@ module ActiveRecord
         super(name, self.class.extract_value_from_default(default), sql_type, null)
       end
 
+      def ==(other)
+        name == other.name && default == other.default && sql_type == other.sql_type && null == other.null
+      end
+
       # :stopdoc:
       class << self
         attr_accessor :money_precision
@@ -766,8 +770,8 @@ module ActiveRecord
 
       # Returns the list of all tables in the schema search path or a specified schema.
       def tables(name = nil)
-        query(<<-SQL, 'SCHEMA').map { |row| row[0] }
-          SELECT tablename
+        query(<<-SQL, 'SCHEMA').map { |row| "#{row[0]}.#{row[1]}" }
+          SELECT schemaname, tablename
           FROM pg_tables
           WHERE schemaname = ANY (current_schemas(false))
         SQL
@@ -804,41 +808,7 @@ module ActiveRecord
 
       # Returns an array of indexes for the given table.
       def indexes(table_name, name = nil)
-         result = query(<<-SQL, 'SCHEMA')
-           SELECT distinct i.relname, d.indisunique, d.indkey, pg_get_indexdef(d.indexrelid), t.oid
-           FROM pg_class t
-           INNER JOIN pg_index d ON t.oid = d.indrelid
-           INNER JOIN pg_class i ON d.indexrelid = i.oid
-           WHERE i.relkind = 'i'
-             AND d.indisprimary = 'f'
-             AND t.relname = '#{table_name}'
-             AND i.relnamespace IN (SELECT oid FROM pg_namespace WHERE nspname = ANY (current_schemas(false)) )
-          ORDER BY i.relname
-        SQL
-
-
-        result.map do |row|
-          index_name = row[0]
-          unique = row[1] == 't'
-          indkey = row[2].split(" ")
-          inddef = row[3]
-          oid = row[4]
-
-          columns = Hash[query(<<-SQL, "SCHEMA")]
-          SELECT a.attnum, a.attname
-          FROM pg_attribute a
-          WHERE a.attrelid = #{oid}
-          AND a.attnum IN (#{indkey.join(",")})
-          SQL
-
-          column_names = columns.values_at(*indkey).compact
-
-          # add info on sort order for columns (only desc order is explicitly specified, asc is the default)
-          desc_order_columns = inddef.scan(/(\w+) DESC/).flatten
-          orders = desc_order_columns.any? ? Hash[desc_order_columns.map {|order_column| [order_column, :desc]}] : {}
-
-          column_names.empty? ? nil : IndexDefinition.new(table_name, index_name, unique, column_names, [], orders)
-        end.compact
+        []
       end
 
       # Returns the list of all column definitions for a table.
@@ -1036,12 +1006,14 @@ module ActiveRecord
         execute "ALTER TABLE #{quote_table_name(table_name)} RENAME COLUMN #{quote_column_name(column_name)} TO #{quote_column_name(new_column_name)}"
       end
 
+      def add_index(*)
+        # XXX nothing to do
+      end
+
       def remove_index!(table_name, index_name) #:nodoc:
-        execute "DROP INDEX #{quote_table_name(index_name)}"
       end
 
       def rename_index(table_name, old_name, new_name)
-        execute "ALTER INDEX #{quote_column_name(old_name)} RENAME TO #{quote_table_name(new_name)}"
       end
 
       def index_name_length

data/lib/activerecord_redshift_adapter/version.rb

@@ -1,4 +1,4 @@
 module ActiverecordRedshiftAdapter
   # the current version of this gem
-  VERSION = "0.8.0"
+  VERSION = "0.9.0"
 end

data/spec/active_record/base_spec.rb

@@ -0,0 +1,8 @@
+require "spec_helper"
+
+describe ActiveRecord::Base do
+  it "opens a connection" do
+    connection = ActiveRecord::Base.redshift_connection(TEST_CONNECTION_HASH)
+    connection.active?.should be_true
+  end
+end

data/spec/active_record/connection_adapters/redshift_adapter_spec.rb

@@ -0,0 +1,97 @@
+require "spec_helper"
+
+describe ActiveRecord::ConnectionAdapters::RedshiftAdapter do
+  before(:all) do
+    @connection =  ActiveRecord::Base.redshift_connection(TEST_CONNECTION_HASH)
+
+    @connection.query <<-sql
+    CREATE TABLE public.test ( "id" INTEGER NULL, "name" VARCHAR(80) NULL );
+    CREATE TABLE public.test2 ( "id" INTEGER, "name" VARCHAR );
+    INSERT INTO public.test VALUES (1, 'first');
+    INSERT INTO public.test VALUES (2, 'second');
+    CREATE TABLE test.test ( "id" INTEGER NOT NULL, "is" BOOL NOT NULL );
+    CREATE TABLE test.test2 ( "id" INTEGER, "is" BOOL );
+    sql
+  end
+
+  after(:all) do
+    @connection.query <<-sql
+    DROP TABLE public.test, public.test2, test.test, test.test2;
+    sql
+  end
+
+  describe "#initialize" do
+    it "opens a connection" do
+      @connection.active?.should be_true
+    end
+  end
+
+  describe "#tables" do
+    it "returns all tables in public schema" do
+      @connection.schema_search_path = "public"
+      @connection.tables.should == ["public.test", "public.test2"]
+    end
+
+    it "returns all tables in all schemas" do
+      @connection.schema_search_path = "public, test"
+      @connection.tables.should == ["public.test", "public.test2", "test.test", "test.test2"]
+    end
+  end
+
+  describe "#columns" do
+    it "returns all columns in table in public schema" do
+      id = ActiveRecord::ConnectionAdapters::RedshiftColumn.new("id", "", "integer", true)
+      name =  ActiveRecord::ConnectionAdapters::RedshiftColumn.new("name", "", "character varying(80)", true)
+      @connection.columns("test").should == [id, name]
+    end
+
+    it "returns all columns in table" do
+      id = ActiveRecord::ConnectionAdapters::RedshiftColumn.new("id", "", "integer", false)
+      is =  ActiveRecord::ConnectionAdapters::RedshiftColumn.new("is", "", "boolean", false)
+      @connection.columns("test.test").should == [id, is]
+    end
+  end
+
+  describe "#table_exists?" do
+    it "checks if table in schema exists" do
+      @connection.table_exists?("public.test").should be_true
+    end
+
+    it "checks if unknown table in schema doesn't exist" do
+      @connection.table_exists?("public.null").should be_false
+    end
+
+    it "checks if table in implied schema exists" do
+      @connection.table_exists?("test2").should be_true
+    end
+  end
+
+  describe "#current_database" do
+    it "returns current database" do
+      @connection.current_database.should == TEST_CONNECTION_HASH[:database]
+    end
+  end
+
+  describe "#schema_search_path" do
+    it "returns current database" do
+      @connection.schema_search_path = '"$user", public'
+      @connection.schema_search_path.should == '"$user", public'
+    end
+  end
+
+  describe "#update_sql" do
+    it "returns the number of updated rows" do
+      @connection.update_sql("UPDATE public.test SET name = 'test'").should == 2
+    end
+  end
+
+  describe "#quote_string" do
+    it "quotes the string without surrouding quotes" do
+      @connection.quote_string("quote'd").should == "quote''d"
+    end
+
+    it "returns identical string when no quoting is required" do
+      @connection.quote_string("quote").should == "quote"
+    end
+  end
+end

data/spec/dummy/config/database.example.yml

@@ -0,0 +1,10 @@
+# CREATE USER test_user WITH PASSWORD 'test_password';
+# CREATE SCHEMA test AUTHORIZATION test_user;
+host: CLUSTERNAME.IDENTIFIER.REGION.redshift.amazonaws.com
+port: 5432
+username: test_user
+password: test_password
+database: dev
+# ssl: true
+# search_path:
+# role:

data/spec/spec_helper.rb

@@ -0,0 +1,33 @@
+require "active_record"
+require "yaml"
+require "active_record/connection_adapters/redshift_adapter"
+
+# This file was generated by the `rspec --init` command. Conventionally, all
+# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
+# Require this file using `require "spec_helper"` to ensure that it is only
+# loaded once.
+#
+# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+RSpec.configure do |config|
+  config.treat_symbols_as_metadata_keys_with_true_values = true
+  config.run_all_when_everything_filtered = true
+  config.filter_run :focus
+
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = 'random'
+end
+
+TEST_CONNECTION_FILENAME = File.expand_path("../dummy/config/database.yml", __FILE__)
+
+if File.exist?(TEST_CONNECTION_FILENAME)
+  TEST_CONNECTION_HASH = YAML.load(File.read(TEST_CONNECTION_FILENAME)).with_indifferent_access
+else
+  puts
+  puts "Create #{TEST_CONNECTION_FILENAME} with connection info "
+  puts "for your Redshift test database in order to run the test suite."
+  puts
+  exit(1)
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-redshift-adapter
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
   prerelease: 
 platform: ruby
 authors:
@@ -43,6 +43,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: This gem provides the Rails 3 with database adapter for AWS RedShift.
 email: keith@fiksu.com
 executables: []
@@ -58,6 +74,10 @@ files:
 - lib/active_record/connection_adapters/redshift_adapter.rb
 - lib/activerecord_redshift_adapter.rb
 - lib/activerecord_redshift_adapter/version.rb
+- spec/active_record/base_spec.rb
+- spec/active_record/connection_adapters/redshift_adapter_spec.rb
+- spec/dummy/config/database.example.yml
+- spec/spec_helper.rb
 homepage: http://github.com/fiksu/activerecord-redshift-adapter
 licenses:
 - New BSD License
@@ -79,8 +99,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Rails 3 database adapter support for AWS RedShift.
-test_files: []
+test_files:
+- spec/active_record/base_spec.rb
+- spec/active_record/connection_adapters/redshift_adapter_spec.rb
+- spec/dummy/config/database.example.yml
+- spec/spec_helper.rb