activerecord-nuodb-adapter 1.0.3 → 1.0.4

data/.travis.yml

@@ -4,9 +4,30 @@ rvm:
   - 1.9.3
 
 env:
+  - NUODB_ROOT=/opt/nuodb NUODB_VERSION=1.2
+  - NUODB_ROOT=/opt/nuodb NUODB_VERSION=1.1.1
+  - NUODB_ROOT=/opt/nuodb NUODB_VERSION=1.1
   - NUODB_ROOT=/opt/nuodb NUODB_VERSION=1.0.2
   - NUODB_ROOT=/opt/nuodb NUODB_VERSION=1.0.1
 
+install:
+  - gem install bundler
+  - gem install thread_safe
+  - gem install minitest
+  - gem install io-console
+  - gem install atomic
+  - gem install bigdecimal
+  - gem install mocha
+  - sudo apt-get update
+  - sudo apt-get install libtool libxml2 openssl sqlite
+  - sudo apt-get install rbenv
+  #- rbenv install 1.9.3-p392
+  #- rbenv global 1.9.3-p392
+  #- rbenv rehash
+  - gem install nuodb
+  - gem install activerecord-nuodb-adapter
+  - gem install rails -v "=3.2.8"
+
 notifications:
   recipients:
     - buck.robert.j@gmail.com
@@ -17,6 +38,7 @@ before_install:
   - wget http://www.nuodb.com/latest/releases/nuodb-${NUODB_VERSION}.linux.x64.deb --output-document=/var/tmp/nuodb.deb
   - sudo dpkg -i /var/tmp/nuodb.deb
   - sleep 2
+  - sudo chmod 777 active_setup_linux.sh
 
 before_script:
   - ${NUODB_ROOT}/bin/nuodb --chorus test --password bar --dba-user dba --dba-password baz --verbose debug --archive /var/tmp/nuodb --initialize --force &
@@ -24,9 +46,11 @@ before_script:
   - ${NUODB_ROOT}/bin/nuodb --chorus test --password bar --dba-user dba --dba-password baz &
   - sleep 2
   - echo "create user cloud password 'user';" | ${NUODB_ROOT}/bin/nuosql test@localhost --user dba --password baz
+  - sleep 10
 
 script:
-  - NUODB_ROOT=/opt/nuodb rake clean build test install
+  - ./active_setup_linux.sh
+  - ARCONN=nuodb ruby -I~/tmpy/rails-latest/:~/tmpy/rails-latest/activerecord/test/:/home/travis/.rvm/gems/ruby-1.9.3-p448/gems/mocha-0.14.0/lib/ ~/tmpy/rails-latest/activerecord/test/cases/migration_test.rb
 
 after_script:
-  - sudo dpkg -r nuodb
+  - sudo dpkg -r nuodb

data/{CONTRIBUTION.rdoc → CONTRIBUTION.md}

@@ -1,12 +1,12 @@
-= Contributing to the Ruby ActiveRecord NuoDB Adapter
+# Contributing to the Ruby ActiveRecord NuoDB Adapter
 
-== BUILDING THE GEM
+## BUILDING THE GEM
 
 To compile and test run this command:
 
     rake clean build
 
-== INSTALLING THE GEM
+## INSTALLING THE GEM
 
     gem install activerecord-nuodb-adapter
 
@@ -18,7 +18,7 @@ Or you can do this using Rake:
 
     rake clean build uninstall install
 
-== TESTING THE GEM
+## TESTING THE GEM
 
 Start up a minimal chorus as follows:
 
@@ -35,11 +35,12 @@ Run the tests:
 
     rake test
 
-== PUBLISHING THE GEM
+## PUBLISHING THE GEM
 
-=== TAGGING
+### TAGGING
 
-Tag the product using tags per the SemVer specification; our tags have a v-prefix:
+Tag the product using tags per the SemVer specification; our tags have a
+v-prefix:
 
     git tag -a v1.0.1 -m "SemVer Version: v1.0.1"
     git push --tags
@@ -49,29 +50,29 @@ If you make a mistake, take it back quickly:
     git tag -d v1.0.1
     git push origin :refs/tags/v1.0.1
 
-===PUBLISHING
+### PUBLISHING
 
 Here are the commands used to publish:
 
     gem push pkg/activerecord-nuodb-adapter-1.0.1.gem
 
-== INSPECTING THE GEM
+## INSPECTING THE GEM
 
-It is often useful to inspect the contents of a Gem before distribution.
-To do this you dump the contents of a gem thus:
+It is often useful to inspect the contents of a Gem before distribution. To do
+this you dump the contents of a gem thus:
 
     gem unpack pkg/activerecord-nuodb-adapter-1.0.1.gem
 
-== RUNNING ACTIVE RECORD COMPLIANCE TEST SUITES
+## RUNNING ACTIVE RECORD COMPLIANCE TEST SUITES
 
 Install both the NuoDB Ruby Gem and the NuoDB ActiveRecord Adapter Gem:
 
     gem install nuodb
     gem install activerecord-nuodb-adapter
 
-You may need to uninstall an earlier version to ensure you only have
-the version you want to install:
-    
+You may need to uninstall an earlier version to ensure you only have the
+version you want to install:
+
     gem uninstall activerecord-nuodb-adapter
 
 Run equivalent commands to the following to set up your environment:

data/Gemfile

@@ -1,4 +1,4 @@
-source 'https://rubygems.org'
+source 'http://rubygems.org'
 
 gemspec
 

data/README.md

@@ -0,0 +1,48 @@
+# Ruby ActiveRecord NuoDB Adapter [<img src="https://secure.travis-ci.org/nuodb/ruby-activerecord-nuodb-adapter.png?branch=master" alt="Continuous Integration Status" />](http://travis-ci.org/nuodb/ruby-activerecord-nuodb-adapter) [<img src="https://gemnasium.com/nuodb/ruby-activerecord-nuodb-adapter.png?travis" alt="Dependency Status" />](https://gemnasium.com/nuodb/ruby-activerecord-nuodb-adapter) [<img src="https://codeclimate.com/github/nuodb/ruby-activerecord-nuodb-adapter.png" />](https://codeclimate.com/github/nuodb/ruby-activerecord-nuodb-adapter)
+ 
+The Ruby ActiveRecord NuoDB Adapter enables the ActiveRecord ORM to work with [NuoDB](http://nuodb.com/). Together with the [Ruby NuoDB driver](https://github.com/nuodb/ruby-nuodb), this gem allows for NuoDB backed Rails applications.
+
+Note: At this time the Ruby ActiveRecord NuoDB Adapter does not support Windows.
+
+## Getting Started
+
+1.  If you haven't already, [Download and Install NuoDB](http://nuodb.com/download-nuodb/)
+
+2.  Add the ActiveRecord NuoDB Adapter to your Gemfile
+
+        gem 'activerecord-nuodb-adapter'
+
+3.  Use bundler to install
+
+        bundle install
+
+4.  Use the NuoDB Manager to create your database by starting a Storage
+    Manager (SM) and Transaction Engine (TE)
+
+        java -jar /opt/nuodb/jar/nuodbmanager.jar --broker localhost --user domain --password bird
+
+        > start process sm host localhost database blog_development archive /var/opt/nuodb/production-archives/blog_development initialize yes
+        > start process te host localhost database blog_development options '--dba-user blog --dba-password bl0gPassw0rd'
+
+5.  Update your config/database.yml file
+
+        development:
+          adapter: nuodb
+          database: blog_development@localhost
+          username: blog
+          password: bl0gPassw0rd
+          schema: blog
+
+
+## More Information
+
+*   [NuoDB Community Forum](http://www.nuodb.com/community/forum.php)
+*   [NuoDB Online Documentation](http://www.nuodb.com/community/documentation.php)
+
+
+## Contributing
+
+See [Contribution](CONTRIBUTION.md) for information about contributing to
+the Ruby ActiveRecord NuoDB Adapter.
+
+[![githalytics.com alpha](https://cruel-carlota.pagodabox.com/48a7777cbd0353a0b8e4cb380f2e530f "githalytics.com")](http://githalytics.com/nuodb/ruby-activerecord-nuodb-adapter)

data/active_setup_linux.sh

@@ -0,0 +1,97 @@
+#!/bin/bash
+#Script to set up activerecord tests on Ubuntu
+
+#installing dependencies
+# sudo apt-get update
+# sudo apt-get install libtool libxml2 openssl sqlite
+# sudo apt-get install rbenv
+# sudo apt-get install ruby-build
+
+echo "eval \"\$(rbenv init -)\"" >> ~/.bash_profile
+
+# rbenv install 1.9.3-p392
+# rbenv global 1.9.3-p392
+# rbenv rehash
+eval "$(rbenv init -)"
+
+# sudo gem list | cut -d" " -f1 | xargs gem uninstall -aIx
+# gem install bundler
+
+# Writes to .bash_profile
+echo "export NUODB_ROOT=/opt/nuodb/bin
+[[ -s "$HOME/.rvm/scripts/rvm" ]] && . "$HOME/.rvm/scripts/rvm" #  Load RVM function" >> ~/.bash_profile
+
+cd ~/
+mkdir tmpy
+git clone https://github.com/nuodb/ruby-nuodb.git ~/tmpy/ruby-nuodb-latest
+cd ~/tmpy/ruby-nuodb-latest
+bundle
+rbenv rehash
+
+cd ~/tmpy/ruby-nuodb-latest
+chmod 777 nuodb.gemspec
+sed -i '/README.rdoc/d' ./nuodb.gemspec #Removes README.rdoc to resolve rake errors
+gem build nuodb.gemspec
+#rake clean build
+#cd pkg
+sudo gem install nuodb-1.0.2.gem
+
+#Getting the driver
+# git clone https://github.com/nuodb/ruby-activerecord-nuodb-adapter.git ~/tmpy/ruby-activerecord-nuodb-adapter-latest
+# cd ~/tmpy/ruby-activerecord-nuodb-adapter-latest
+# bundle
+# rbenv rehash
+# rake clean build
+# cd pkg
+# gem install activerecord-nuodb-adapter-1.0.3.gem #Make robust
+
+#Getting rails
+git clone https://github.com/rails/rails.git ~/tmpy/rails-latest
+cd ~/tmpy/rails-latest
+git checkout v3.2.8
+bundle
+rbenv rehash
+cd activerecord
+
+echo "if ENV['NUODB_AR']
+    gem 'activerecord-nuodb-adapter'
+end" >> ~/tmpy/rails-latest/Gemfile
+
+echo "
+  nuodb:
+    arunit:
+      host: localhost
+      database: test@localhost
+      username: cloud
+      password: user
+      schema: test
+    arunit2:
+      host: localhost
+      database: test@localhost
+      username: cloud
+      password: user
+      schema: test
+" >> ~/tmpy/rails-latest/activerecord/test/config.example.yml
+
+sed -i 's/%w( mysql mysql2 postgresql/%w( nuodb mysql mysql2 postgresql/g' Rakefile
+
+echo "gem 'activerecord-nuodb-adapter'" >> ~/tmpy/rails-latest/Gemfile
+bundle install
+
+export GEM_PATH=/home/travis/.rvm/gems/ruby-1.9.3-p448
+
+#RUBYLIB="~/tmpy/rails-latest/activerecord/test/cases:$RUBYLIB"
+#export RUBYLIB
+
+
+# Helpful information, make sure that NuoDB is running
+
+# Starting NuoDB
+#java -jar /opt/nuodb/jar/nuoagent.jar --broker &
+#/opt/nuodb/bin/nuodb --chorus test --password bar --dba-user cloud --dba-password user --verbose debug --archive /var/tmp/nuodb --initialize --force &
+#/opt/nuodb/bin/nuodb --chorus test --password bar --dba-user cloud --dba-password user &
+
+# Running Tests
+#cd /tmp/rails-latest/activerecord
+#ARCONN=nuodb ruby -Itest test/cases/base_test.rb
+

data/activerecord-nuodb-adapter.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |gem|
   gem.license = 'BSD'
 
   gem.rdoc_options = %w(--charset=UTF-8)
-  gem.extra_rdoc_files = %w[README.rdoc]
+  gem.extra_rdoc_files = %w[README.md]
 
   gem.add_dependency('activerecord', '~> 3.2.11')
   gem.add_development_dependency('rake', '~> 10.0.3')

data/lib/active_record/connection_adapters/nuodb/version.rb

@@ -29,7 +29,7 @@
 module ActiveRecord
   module ConnectionAdapters
     module NuoDB
-      VERSION = '1.0.3'
+      VERSION = '1.0.4'
     end
   end
 end

data/lib/active_record/connection_adapters/nuodb_adapter.rb

@@ -37,11 +37,8 @@ require 'arel/visitors/bind_visitor'
 require 'active_support/core_ext/hash/keys'
 
 require 'nuodb'
-
 module ActiveRecord
-
   class Base
-
     def self.nuodb_connection(config) #:nodoc:
       config.symbolize_keys!
       unless config[:database]
@@ -52,7 +49,6 @@ module ActiveRecord
       config.reverse_merge! :timezone => 'UTC'
       ConnectionAdapters::NuoDBAdapter.new nil, logger, nil, config
     end
-
   end
 
   class LostConnection < WrappedDatabaseException
@@ -179,6 +175,8 @@ module ActiveRecord
             :date
           when /string/i then
             :text
+          when /binarystring/i then
+            :binary
           else
             super
         end
@@ -499,14 +497,39 @@ module ActiveRecord
         raise NotImplementedError, "rename_table is not implemented"
         #execute("RENAME TABLE #{quote_table_name(table_name)} TO #{quote_table_name(new_name)}")
       end
+
+      #Carlos Added Begins
       
       def add_column(table_name, column_name, type, options = {})
         clear_cache!
-        add_column_sql = "ALTER TABLE #{quote_table_name(table_name)} ADD COLUMN #{quote_column_name(column_name)}"
-        add_column_options!(add_column_sql, options)
-        execute(add_column_sql)
+        #Stored procedure not supported
+        #add_column_sql = "CREATE PROCEDURE PR1 BEGIN IF NOT EXISTS((SELECT * FROM information_schema.COLUMNS WHERE TABLE_SCHEMA=DATABASE()
+        #        AND COLUMN_NAME=#{quote_column_name(column_name)} AND TABLE_NAME=#{quote_table_name(table_name)})) THEN ALTER TABLE #{quote_table_name(table_name)} ADD COLUMN #{quote_column_name(column_name)} #{type.to_s} END IF"
+        if column_exists?(table_name, column_name) == false
+          add_column_sql = "ALTER TABLE #{quote_table_name(table_name)} ADD COLUMN #{quote_column_name(column_name)} #{type.to_s}"
+          add_column_options!(add_column_sql, options)
+          execute(add_column_sql)
+        end
       end
       
+      def add_index(table_name, column_name, options = {})
+        index_name, index_type, index_columns = add_index_options(table_name, column_name, options)
+        if okay_index(table_name, column_name, options = {}) == true
+          execute "CREATE #{index_type} INDEX #{quote_column_name(index_name)} ON #{quote_table_name(table_name)} (#{index_columns})"
+        end
+      end
+
+      def okay_index(table_name, column_name, options = {})
+        begin
+          execute("CREATE #{index_type} INDEX #{quote_column_name(index_name)} ON #{quote_table_name(table_name)} (#{index_columns})")
+          return true
+        rescue
+          return false
+        end
+      end
+
+      #Carlos Added Ends
+
       def remove_index!(table_name, index_name) #:nodoc:
         raise NotImplementedError, "remove_index! is not implemented"
       end
@@ -515,6 +538,18 @@ module ActiveRecord
         execute("ALTER INDEX #{quote_column_name(old_name)} RENAME TO #{quote_table_name(new_name)}")
       end
       
+      #Carlos Added
+      def column_exists?(table_name, column_name, type = nil, options = {})
+        begin
+          execute("SELECT #{quote_column_name(column_name)} FROM #{quote_table_name(table_name)}")
+          return true
+        rescue
+          return false
+        end
+      end
+
+      #ENDS
+
       def table_exists?(table_name)
         return false unless table_name
 
@@ -546,7 +581,6 @@ module ActiveRecord
 
       # Returns an array of indexes for the given table. Skip primary keys.
       def indexes(table_name, name = nil)
-
         # the following query returns something like this:
         #
         # INDEXNAME              TABLENAME NON_UNIQUE FIELD     LENGTH
@@ -578,7 +612,8 @@ module ActiveRecord
         current_index = nil
         result.map do |row|
           row.symbolize_keys!
-          index_name = row[:index_name]
+          #Carlos Added .downcase!
+          index_name = row[:index_name].downcase!
           if current_index != index_name
             next if !!(/PRIMARY/ =~ index_name)
             current_index = index_name
@@ -649,6 +684,7 @@ module ActiveRecord
             # nuodb specific types...
             :char => {:name => 'char'},
             :numeric => {:name => 'numeric(20)'},
+            :binarystring => {:name => 'varchar', :limit => 255}
         }
       end
 

data/test/.gitignore

@@ -0,0 +1 @@
+/config.yml

data/test/active_record/connection_adapters/fake_adapter.rb

@@ -0,0 +1,45 @@
+module ActiveRecord
+  module ConnectionHandling
+    def fake_connection(config)
+      ConnectionAdapters::FakeAdapter.new nil, logger
+    end
+  end
+
+  module ConnectionAdapters
+    class FakeAdapter < AbstractAdapter
+      attr_accessor :tables, :primary_keys
+
+      @columns = Hash.new { |h,k| h[k] = [] }
+      class << self
+        attr_reader :columns
+      end
+
+      def initialize(connection, logger)
+        super
+        @tables       = []
+        @primary_keys = {}
+        @columns      = self.class.columns
+      end
+
+      def primary_key(table)
+        @primary_keys[table]
+      end
+
+      def merge_column(table_name, name, sql_type = nil, options = {})
+        @columns[table_name] << ActiveRecord::ConnectionAdapters::Column.new(
+          name.to_s,
+          options[:default],
+          sql_type.to_s,
+          options[:null])
+      end
+
+      def columns(table_name)
+        @columns[table_name]
+      end
+
+      def active?
+        true
+      end
+    end
+  end
+end