activerecord-nuodb-adapter 1.0.0 → 1.0.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 5dc9e5f9a4b2c788d6edc4827f2acf2eed90c1a3
+  data.tar.gz: 936c6fe1f003e90aea1d2a2a19a9597e912be953
+SHA512:
+  metadata.gz: 54151b9b46c73960f51398a54f766362b6d02d8695a99dc3c3c9b3977c0c413952ef6f550e51219239f2769351330bb30ffb1c663c02b96cf183f4929e6f4ab2
+  data.tar.gz: 698fa5ee9edef596ef016e77bdd987e03a85d55b95aad1ab38be47e9f859013078163bfeb3f86471ac34593df97be16285ecb42d18327206ceb111e5f9585a2b

data/.travis.yml

@@ -0,0 +1,31 @@
+language: ruby
+
+rvm:
+  - 1.9.3
+
+env:
+  - NUODB_ROOT=/opt/nuodb
+
+notifications:
+  recipients:
+    - buck.robert.j@gmail.com
+    - rbuck@nuodb.com
+    - lbayas@nuodb.com
+
+before_install:
+  - wget http://www.nuodb.com/latest/nuodb-1.0.2.linux.x64.deb --output-document=/var/tmp/nuodb.deb
+  - sudo dpkg -i /var/tmp/nuodb.deb
+  - sleep 2
+
+before_script:
+  - ${NUODB_ROOT}/bin/nuodb --chorus test --password bar --dba-user dba --dba-password baz --verbose debug --archive /var/tmp/nuodb --initialize --force &
+  - sleep 2
+  - ${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
+
+script:
+  - NUODB_ROOT=/opt/nuodb rake clean build test install
+
+after_script:
+  - sudo dpkg -r nuodb

data/CONTRIBUTION.rdoc

@@ -0,0 +1,97 @@
+= Contributing to the Ruby ActiveRecord NuoDB Adapter
+
+== BUILDING THE GEM
+
+To compile and test run this command:
+
+    rake clean build
+
+== INSTALLING THE GEM
+
+    gem install activerecord-nuodb-adapter
+
+Or from the source tree:
+
+    gem install pkg/activerecord-nuodb-adapter-1.0.1.gem
+
+Or you can do this using Rake:
+
+    rake clean build uninstall install
+
+== TESTING THE GEM
+
+Start up a minimal chorus as follows:
+
+    java -jar ${NUODB_ROOT}/jar/nuoagent.jar --broker &
+    ${NUODB_ROOT}/bin/nuodb --chorus test --password bar --dba-user dba --dba-password baz &
+
+Create a user in the database:
+
+    ${NUODB_ROOT}/bin/nuosql test@localhost --user dba --password baz
+    > create user cloud password 'user';
+    > exit
+
+Run the tests:
+
+    rake test
+
+== PUBLISHING THE GEM
+
+=== TAGGING
+
+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
+
+If you make a mistake, take it back quickly:
+
+    git tag -d v1.0.1
+    git push origin :refs/tags/v1.0.1
+
+===PUBLISHING
+
+Here are the commands used to publish:
+
+    gem push pkg/activerecord-nuodb-adapter-1.0.1.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:
+
+    gem unpack pkg/activerecord-nuodb-adapter-1.0.1.gem
+
+== 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:
+    
+    gem uninstall activerecord-nuodb-adapter
+
+Run equivalent commands to the following to set up your environment:
+
+    export NUODB_AR=1
+    export NUODB_ROOT=/Users/rbuck/tmp/nuodb
+    export PATH=${NUODB_ROOT}/bin:${PATH}
+
+Start up NuoDB as follows:
+
+    java -jar ${NUODB_ROOT}/jar/nuoagent.jar --broker &
+    ${NUODB_ROOT}/bin/nuodb --chorus arunit --password bar --dba-user dba --dba-password baz --force &
+
+Configure your RVM environment:
+
+    cd rails
+    bundle install
+
+Run the test suite as follows:
+
+    cd activerecord
+    ARCONN=nuodb ruby -Itest test/cases/base_test.rb
+

data/README.rdoc

@@ -1,172 +1,42 @@
-= Ruby ActiveRecord NuoDB Adapter
+= 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]
 
-== DESCRIPTION
+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.
 
-This is the NuoDB ActiveRecord Adapter.
+Note: At this time the Ruby ActiveRecord NuoDB Adapter does not support Windows.
 
-== RUNNING A SAMPLE APPLICATION
+== Getting Started
 
-Let me walk you through the creation of a sample Ruby application to the point
-of having it running against NuoDB...
+1. If you haven't already, {Download and Install NuoDB}[http://nuodb.com/download-nuodb/]
 
-Start up a minimal chorus as follows:
-
-    export NUODB_ROOT=/Users/Path/To/NuoDB
-    java -jar ${NUODB_ROOT}/jar/nuoagent.jar --broker &
-    ${NUODB_ROOT}/bin/nuodb --chorus test --password bar --dba-user dba --dba-password baz --verbose debug --archive /var/tmp/nuodb --initialize --force &
-    ${NUODB_ROOT}/bin/nuodb --chorus test --password bar --dba-user dba --dba-password baz &
-
-Create a user in the database:
-
-    ${NUODB_ROOT}/bin/nuosql test@localhost --user dba --password baz
-    > create user cloud password 'user';
-    > exit
-
-Install our Gems; the following shows how to do this if you have copies
-of the gems locally, but is easier if you install them from rubygems.org.
-
-    gem install nuodb-1.0.0.gem
-    gem install activerecord-nuodb-adapter-1.0.0.gem
-
-Prepare a sample application:
-
-    rails new slambook
-    cd slambook/
-
-Add the following Gems to your Gemfile:
-
-    gem 'nuodb', '=1.0.0'
-    gem 'activerecord-nuodb-adapter', '=1.0.0'
-
-Update your config/database.yml file as follows:
-
-    development:
-      adapter: nuodb
-      database: test@localhost
-      username: cloud
-      password: user
-      schema: test
-
-    test:
-      adapter: nuodb
-      database: test@localhost
-      username: cloud
-      password: user
-      schema: test
-
-    production:
-      adapter: nuodb
-      database: test@localhost
-      username: cloud
-      password: user
-      schema: test
-
-6. Build the application and prepare your databases:
+2. Add the ActiveRecord NuoDB Adapter to your Gemfile
 
+    gem 'activerecord-nuodb-adapter'
+    
+3. Use bundler to install
+    
     bundle install
-    rake db:create
-    rake db:migrate
-
-7. Start the Rails server:
-
-    bundle exec rails server
-
-8. Open up your browser:
-
-    chrome http://localhost:3000
-
-== BUILDING THE GEM
-
-To compile and test run this command:
-
-    rake clean build
-
-== INSTALLING THE GEM
-
-    gem install activerecord-nuodb-adapter-1.0.0.gem
-
-Or from the source tree:
-
-    gem install pkg/activerecord-nuodb-adapter-1.0.0.gem
-
-Or you can do this using Rake:
-
-    rake clean build uninstall install
-
-== TESTING THE GEM
-
-Start up a minimal chorus as follows:
-
-    java -jar ${NUODB_ROOT}/jar/nuoagent.jar --broker &
-    ${NUODB_ROOT}/bin/nuodb --chorus test --password bar --dba-user dba --dba-password baz &
-
-Create a user in the database:
-
-    ${NUODB_ROOT}/bin/nuosql test@localhost --user dba --password baz
-    > create user cloud password 'user';
-    > exit
-
-Run the tests:
-
-    rake test
-
-== PUBLISHING THE GEM
-
-=== TAGGING
-
-Tag the product using tags per the SemVer specification; our tags have a v-prefix:
-
-    git tag -a v1.0.0 -m "SemVer Version: v1.0.0"
-    git push --tags
-
-If you make a mistake, take it back quickly:
-
-    git tag -d v1.0.0
-    git push origin :refs/tags/v1.0.0
-
-===PUBLISHING
-
-Here are the commands used to publish:
-
-    gem push pkg/nuodb-1.0.0.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:
-
-    gem unpack pkg/activerecord-nuodb-adapter-1.0.0.gem
-
-== 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:
     
-    gem uninstall activerecord-nuodb-adapter
+4. Use the NuoDB Manager to create your database by starting a Storage Manager (SM) and Transaction Engine (TE)
 
-Run equivalent commands to the following to set up your environment:
-
-    export NUODB_AR=1
-    export NUODB_ROOT=/Users/rbuck/tmp/nuodb
-    export PATH=${NUODB_ROOT}/bin:${PATH}
-
-Start up NuoDB as follows:
-
-    java -jar ${NUODB_ROOT}/jar/nuoagent.jar --broker &
-    ${NUODB_ROOT}/bin/nuodb --chorus arunit --password bar --dba-user dba --dba-password baz --force &
+    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'
 
-Configure your RVM environment:
+5. Update your config/database.yml file
+    
+    development:
+      adapter: nuodb
+      database: blog_development@localhost
+      username: blog
+      password: bl0gPassw0rd
+      schema: blog
 
-    cd rails
-    bundle install
+== More Information
 
-Run the test suite as follows:
+* {NuoDB Community Forum}[http://www.nuodb.com/community/forum.php]
+* {NuoDB Online Documentation}[http://www.nuodb.com/community/documentation.php]
 
-    cd activerecord
-    ARCONN=nuodb ruby -Itest test/cases/base_test.rb
+== Contributing
 
+See {Contribution}[link:CONTRIBUTION.rdoc] for information about contributing to the Ruby ActiveRecord NuoDB Adapter.

data/Rakefile

@@ -126,7 +126,7 @@ task :build do
 end
 
 task :install => :build do
-  sh %{gem install pkg/#{GEM_NAME}-#{ActiveRecord::ConnectionAdapters::NuoDB::VERSION} --no-rdoc --no-ri}
+  sh %{gem install pkg/#{GEM_NAME}-#{ActiveRecord::ConnectionAdapters::NuoDB::VERSION}.gem --no-rdoc --no-ri}
 end
 
 task :uninstall do

data/activerecord-nuodb-adapter.gemspec

@@ -15,9 +15,9 @@ Gem::Specification.new do |gem|
   gem.extra_rdoc_files = %w[README.rdoc]
 
   gem.add_dependency('activerecord', '~> 3.2.8')
-  gem.add_development_dependency('rake', '~> 0.9')
+  gem.add_development_dependency('rake', '~> 10.0.3')
   gem.add_development_dependency('rdoc', '~> 3.10')
-  gem.add_dependency('nuodb', '~> 1.0.0')
+  gem.add_dependency('nuodb', '~> 1.0.2')
 
   gem.files = `git ls-files`.split($\)
   gem.test_files = gem.files.grep(%r{^(test|spec|features)/})

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

@@ -29,7 +29,7 @@
 module ActiveRecord
   module ConnectionAdapters
     module NuoDB
-      VERSION = '1.0.0'
+      VERSION = '1.0.1'
     end
   end
 end

data/lib/active_record/connection_adapters/nuodb_adapter.rb

@@ -135,8 +135,6 @@ module ActiveRecord
             4
           when /^bigint/i
             8
-          when /\(max\)/, /decimal/, /numeric/
-            nil
           else
             super
         end
@@ -146,6 +144,12 @@ module ActiveRecord
         case field_type
           when /bit/i then
             :boolean
+          when /timestamp/i then
+            :timestamp
+          when /time/i then
+            :time
+          when /date/i then
+            :date
           else
             super
         end
@@ -386,20 +390,49 @@ module ActiveRecord
 
       def change_column(table_name, column_name, type, options = {})
         raise NotImplementedError, "change_column is not implemented"
+        #execute("ALTER TABLE #{quote_table_name(table_name)} #{change_column_sql(table_name, column_name, type, options)}")
       end
 
       def change_column_default(table_name, column_name, default)
         raise NotImplementedError, "change_column_default is not implemented"
+        #column = column_for(table_name, column_name)
+        #change_column table_name, column_name, column.sql_type, :default => default
+      end
+
+      def change_column_null(table_name, column_name, null, default = nil)
+        raise NotImplementedError, "change_column_null is not implemented"
+        #column = column_for(table_name, column_name)
+        #unless null || default.nil?
+        #  execute("UPDATE #{quote_table_name(table_name)} SET #{quote_column_name(column_name)}=#{quote(default)} WHERE #{quote_column_name(column_name)} IS NULL")
+        #end
+        #change_column table_name, column_name, column.sql_type, :null => null
       end
 
       def rename_column(table_name, column_name, new_column_name)
         raise NotImplementedError, "rename_column is not implemented"
+        #execute("ALTER TABLE #{quote_table_name(table_name)} #{rename_column_sql(table_name, column_name, new_column_name)}")
       end
 
       def rename_table(table_name, new_name)
         raise NotImplementedError, "rename_table is not implemented"
+        #execute("RENAME TABLE #{quote_table_name(table_name)} TO #{quote_table_name(new_name)}")
+      end
+      
+      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)
+      end
+      
+      def remove_index!(table_name, index_name) #:nodoc:
+        raise NotImplementedError, "remove_index! is not implemented"
       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 table_exists?(table_name)
         return false unless table_name
 
@@ -519,7 +552,7 @@ module ActiveRecord
             :binary => {:name => 'binary'},
             :boolean => {:name => 'boolean'},
             :date => {:name => 'date'},
-            :datetime => {:name => 'datetime'},
+            :datetime => {:name => 'timestamp'},
             :decimal => {:name => 'decimal'},
             :float => {:name => 'float', :limit => 8},
             :integer => {:name => 'integer'},
@@ -534,21 +567,58 @@ module ActiveRecord
         }
       end
 
+      # jruby version -- no original
+      def modify_types(tp)
+        tp[:primary_key] = 'int not null generated always primary key'
+        tp[:boolean] = {:name => 'boolean'}
+        tp[:date] = {:name => 'date', :limit => nil}
+        tp[:datetime] = {:name => 'timestamp', :limit => nil}
+        tp[:decimal] = {:name => 'decimal'}
+        tp[:integer] = {:name => 'int', :limit => 4}
+        tp[:string] = {:name => 'string'}
+        tp[:time] = {:name => 'time', :limit => nil}
+        tp[:timestamp] = {:name => 'timestamp', :limit => nil}
+        tp
+      end
+
+      # jruby version
       # maps logical rails types to nuodb-specific data types.
       def type_to_sql(type, limit = nil, precision = nil, scale = nil)
         case type.to_s
           when 'integer'
             return 'integer' unless limit
             case limit
-              when 1, 2
+              when 1..2
                 'smallint'
-              when 3, 4
+              when 3..4
                 'integer'
               when 5..8
                 'bigint'
               else
                 raise(ActiveRecordError, "No integer type has byte size #{limit}. Use a numeric with precision 0 instead.")
             end
+          when 'timestamp'
+            column_type_sql = 'timestamp'
+            unless precision.nil?
+              case precision
+                when 0..9
+                  column_type_sql << "(#{precision})"
+                else
+                  nil
+              end
+            end
+            column_type_sql
+          when 'time'
+            column_type_sql = 'time'
+            unless precision.nil?
+              case precision
+                when 0..9
+                  column_type_sql << "(#{precision})"
+                else
+                  nil
+              end
+            end
+            column_type_sql
           else
             super
         end
@@ -610,6 +680,14 @@ module ActiveRecord
 
       public
 
+      def select_rows(sql, name = nil)
+        exec_query(sql, name).rows
+      end
+      
+      def select_values(sql, name = nil)
+        exec_query(sql, name).values
+      end
+
       def outside_transaction?
         nil
       end
@@ -643,7 +721,7 @@ module ActiveRecord
       end
 
       def default_sequence_name(table, column)
-        result = exec_query(<<-eosql, 'SCHEMA')
+        result = exec_query(<<-eosql, 'SCHEMA', [table.to_s, column.to_s])
           SELECT generator_sequence FROM system.fields WHERE tablename='#{table}' AND field='#{column}'
         eosql
         result.rows.first.first
@@ -735,12 +813,6 @@ module ActiveRecord
         exec_query(sql, name, binds.map { |col, val| type_cast(val, col) }).to_a
       end
 
-      protected
-
-      def select_rows(sql, name = nil)
-        exec_query(sql, name).rows
-      end
-
       private
 
       def column_names (result)

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-nuodb-adapter
 version: !ruby/object:Gem::Version
-  version: 1.0.0
-  prerelease: 
+  version: 1.0.1
 platform: ruby
 authors:
 - Robert Buck
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-08 00:00:00.000000000 Z
+date: 2013-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,23 +27,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 10.0.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 10.0.3
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,19 +55,17 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: nuodb
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.2
 description: An adapter for ActiveRecord and AREL to support the NuoDB distributed
   database backend.
 email:
@@ -86,7 +77,9 @@ extra_rdoc_files:
 files:
 - .buildpath
 - .gitignore
+- .travis.yml
 - AUTHORS
+- CONTRIBUTION.rdoc
 - COPYING
 - Gemfile
 - History.txt
@@ -103,28 +96,27 @@ files:
 homepage: http://nuodb.github.com/ruby-activerecord-nuodb-adapter/
 licenses:
 - BSD
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --charset=UTF-8
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: ActiveRecord adapter with AREL support for NuoDB.
 test_files:
 - test/test_simple.rb