fix travis build

Author: byroot

.travis.yml

@@ -1,15 +1,14 @@
 language: ruby
 
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.0
+  - 1.9
+  - 2.0
   - 2.1
-
 gemfile:
   - gemfiles/Gemfile.ar-3.2
   - gemfiles/Gemfile.ar-4.0
   - gemfiles/Gemfile.ar-4.1
+  - gemfiles/Gemfile.ar-4.2
   - gemfiles/Gemfile.ar-edge
 
 env:

gemfiles/Gemfile.ar-4.2

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'activerecord', '~> 4.2.0-rc1'
+gem 'activerecord', '~> 4.2.0-rc2'
 gem 'bundler', '~> 1.3'
 gem 'rake'
 gem 'rspec'

spec/support/models.rb

@@ -72,8 +72,10 @@ def self.up
         execute "create extension if not exists hstore"
         recreate_table(:postgres_hstore_typed_store_models) { |t| t.hstore :settings; t.text :untyped_settings }
 
-        #execute "create extension if not exists json"
-        recreate_table(:postgres_json_typed_store_models) { |t| t.json :settings; t.text :untyped_settings }
+        if ENV['POSTGRES_JSON']
+          execute "create extension if not exists json"
+          recreate_table(:postgres_json_typed_store_models) { |t| t.json :settings; t.text :untyped_settings }
+        end
       end
     end
 
@@ -140,11 +142,13 @@ class PostgresHstoreTypedStoreModel < ActiveRecord::Base
       end
     end
 
-    class PostgresJsonTypedStoreModel < ActiveRecord::Base
-      establish_connection ENV['POSTGRES_URL'] || :test_postgresql
-      store :untyped_settings, accessors: [:title]
-      typed_store :settings, coder: ColumnCoder.new(AsJson) do |s|
-        define_store_columns(s)
+    if ENV['POSTGRES_JSON']
+      class PostgresJsonTypedStoreModel < ActiveRecord::Base
+        establish_connection ENV['POSTGRES_URL'] || :test_postgresql
+        store :untyped_settings, accessors: [:title]
+        typed_store :settings, coder: ColumnCoder.new(AsJson) do |s|
+          define_store_columns(s)
+        end
       end
     end