Delete development database for travis

3 files changed, 37 insertions, 32 deletions

diff --git a/.travis.yml b/.travis.yml
index a81440cf9..5adbb9b48 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,23 +1,15 @@
 language: ruby
 rvm:
   - 1.8.7
+  - jruby-18mode
 before_install:
   - sudo apt-get install build-essential ruby-dev libproj-dev libgeos-dev libffi-dev libsparsehash-dev zlib1g-dev libxslt1-dev libxml2-dev libbz2-dev
 before_script: 
   - "psql -c 'create database chouette_test;' -U postgres"
   - "psql -c 'create database chouette_production_test;' -U postgres"
-  - "psql -c 'create database jdbc_chouette_test;' -U postgres"
-  - "psql -c 'create database jdbc_chouette_production_test;' -U postgres"
-  - rake ci:prepare_travis
-script: "rake spec"
+  - "RAILS_ENV=test rake ci:prepare_travis"
+script: "RAILS_ENV=test rake spec"
 branches:
   only:
     - master
-    - production
-matrix:
-  include:
-    - rvm: jruby-18mode
-      env: JRUBY_OPTS="--1.8 --server -Xcext.enabled=false -Xcompile.invokedynamic=false"
-notifications:
-  recipients:
-    - luc.donnet@dryade.net
\ No newline at end of file
+    - production
\ No newline at end of file
diff --git a/config/database.yml.travis b/config/database.yml.travis
index 6163c9a89..27552cbec 100644
--- a/config/database.yml.travis
+++ b/config/database.yml.travis
@@ -1,9 +1,3 @@
-development:
-  adapter: <%= RUBY_PLATFORM == "java" ? "jdbcpostgresql" : "postgresql" %>
-  database: <%= RUBY_PLATFORM == "java" ? "jdbc" : "" + (ENV["GIT_BRANCH"].nil? || ENV["GIT_BRANCH"] == "master") ? "chouette_dev" : "chouette_" + ENV["GIT_BRANCH"] + "_dev" %>
-  encoding: utf8
-  username: postgres
-
 test:
   adapter: <%= RUBY_PLATFORM == "java" ? "jdbcpostgresql" : "postgresql" %>
   database: <%= (ENV["GIT_BRANCH"].nil? || ENV["GIT_BRANCH"] == "master") ? "chouette_test" : "chouette_" + ENV["GIT_BRANCH"] + "_test" %>
diff --git a/db/schema.rb b/db/schema.rb
index d5d99ea89..cbbd696ab 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -115,8 +115,8 @@ ActiveRecord::Schema.define(:version => 20121025112852) do
     t.datetime "failed_at"
     t.string   "locked_by"
     t.string   "queue"
-    t.datetime "created_at",                :null => false
-    t.datetime "updated_at",                :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
   add_index "delayed_jobs", ["priority", "run_at"], :name => "delayed_jobs_priority"
@@ -127,8 +127,8 @@ ActiveRecord::Schema.define(:version => 20121025112852) do
     t.string   "arguments",  :limit => 1000
     t.integer  "position"
     t.string   "severity"
-    t.datetime "created_at",                 :null => false
-    t.datetime "updated_at",                 :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
   add_index "export_log_messages", ["export_id"], :name => "index_export_log_messages_on_export_id"
@@ -138,8 +138,8 @@ ActiveRecord::Schema.define(:version => 20121025112852) do
     t.string   "status"
     t.string   "type"
     t.string   "options"
-    t.datetime "created_at",      :null => false
-    t.datetime "updated_at",      :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
     t.string   "references_type"
     t.string   "reference_ids"
   end
@@ -199,6 +199,16 @@ ActiveRecord::Schema.define(:version => 20121025112852) do
     t.integer  "organisation_id"
   end
 
+  create_table "geometry_columns", :id => false, :force => true do |t|
+    t.string  "f_table_catalog",   :limit => 256, :null => false
+    t.string  "f_table_schema",    :limit => 256, :null => false
+    t.string  "f_table_name",      :limit => 256, :null => false
+    t.string  "f_geometry_column", :limit => 256, :null => false
+    t.integer "coord_dimension",                  :null => false
+    t.integer "srid",                             :null => false
+    t.string  "type",              :limit => 30,  :null => false
+  end
+
   create_table "group_of_lines", :force => true do |t|
     t.string   "objectid",       :null => false
     t.integer  "object_version"
@@ -221,8 +231,8 @@ ActiveRecord::Schema.define(:version => 20121025112852) do
     t.string   "arguments",  :limit => 1000
     t.integer  "position"
     t.string   "severity"
-    t.datetime "created_at",                 :null => false
-    t.datetime "updated_at",                 :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
   add_index "import_log_messages", ["import_id"], :name => "index_import_log_messages_on_import_id"
@@ -230,8 +240,8 @@ ActiveRecord::Schema.define(:version => 20121025112852) do
   create_table "imports", :force => true do |t|
     t.integer  "referential_id"
     t.string   "status"
-    t.datetime "created_at",     :null => false
-    t.datetime "updated_at",     :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
     t.string   "type"
     t.string   "options"
     t.string   "file_type"
@@ -324,11 +334,12 @@ ActiveRecord::Schema.define(:version => 20121025112852) do
   create_table "referentials", :force => true do |t|
     t.string   "name"
     t.string   "slug"
-    t.datetime "created_at",      :null => false
-    t.datetime "updated_at",      :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
     t.string   "prefix"
     t.string   "projection_type"
     t.string   "time_zone"
+    t.string   "the_geom"
     t.string   "bounds"
     t.integer  "organisation_id"
   end
@@ -355,6 +366,14 @@ ActiveRecord::Schema.define(:version => 20121025112852) do
     t.integer "line_id",      :limit => 8
   end
 
+  create_table "spatial_ref_sys", :id => false, :force => true do |t|
+    t.integer "srid",                      :null => false
+    t.string  "auth_name", :limit => 256
+    t.integer "auth_srid"
+    t.string  "srtext",    :limit => 2048
+    t.string  "proj4text", :limit => 2048
+  end
+
   create_table "stop_areas", :force => true do |t|
     t.integer  "parent_id",           :limit => 8
     t.string   "objectid",                                                         :null => false
@@ -459,8 +478,8 @@ ActiveRecord::Schema.define(:version => 20121025112852) do
     t.datetime "last_sign_in_at"
     t.string   "current_sign_in_ip"
     t.string   "last_sign_in_ip"
-    t.datetime "created_at",                                           :null => false
-    t.datetime "updated_at",                                           :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
     t.integer  "organisation_id"
     t.string   "name"
     t.string   "confirmation_token"