Permalink
Browse files

開発用に修正

  • Loading branch information...
1 parent 5a1def6 commit 8fa3fa235d329f2aa03ad6c5d01b0c38e7e2c665 @runeleaf runeleaf committed Jun 12, 2012
Showing with 13 additions and 98 deletions.
  1. +2 −0 .gitignore
  2. +2 −0 Gemfile
  3. +0 −97 Gemfile.lock
  4. +1 −1 lib/railstar.rb
  5. +8 −0 test/dummy/config/database.yml
View
@@ -6,3 +6,5 @@ test/dummy/log/*.log
test/dummy/tmp/
test/dummy/.sass-cache
.DS_Store
+vendor/
+Gemfile.lock
View
@@ -8,6 +8,8 @@ gemspec
# jquery-rails is used by the dummy application
gem "jquery-rails"
+gem "mysql2"
+
# Declare any dependencies that are still in development here instead of in
# your gemspec. These might include edge Rails or gems from your path or
# Git. Remember to move these dependencies to your gemspec before releasing
View
@@ -1,97 +0,0 @@
-PATH
- remote: .
- specs:
- railstar (0.0.10)
- rails (~> 3.2.2)
-
-GEM
- remote: http://rubygems.org/
- specs:
- actionmailer (3.2.2)
- actionpack (= 3.2.2)
- mail (~> 2.4.0)
- actionpack (3.2.2)
- activemodel (= 3.2.2)
- activesupport (= 3.2.2)
- builder (~> 3.0.0)
- erubis (~> 2.7.0)
- journey (~> 1.0.1)
- rack (~> 1.4.0)
- rack-cache (~> 1.1)
- rack-test (~> 0.6.1)
- sprockets (~> 2.1.2)
- activemodel (3.2.2)
- activesupport (= 3.2.2)
- builder (~> 3.0.0)
- activerecord (3.2.2)
- activemodel (= 3.2.2)
- activesupport (= 3.2.2)
- arel (~> 3.0.2)
- tzinfo (~> 0.3.29)
- activeresource (3.2.2)
- activemodel (= 3.2.2)
- activesupport (= 3.2.2)
- activesupport (3.2.2)
- i18n (~> 0.6)
- multi_json (~> 1.0)
- arel (3.0.2)
- builder (3.0.0)
- erubis (2.7.0)
- hike (1.2.1)
- i18n (0.6.0)
- journey (1.0.3)
- jquery-rails (2.0.1)
- railties (< 5.0, >= 3.2.0)
- thor (~> 0.14)
- json (1.6.5)
- mail (2.4.4)
- i18n (>= 0.4.0)
- mime-types (~> 1.16)
- treetop (~> 1.4.8)
- mime-types (1.18)
- multi_json (1.1.0)
- polyglot (0.3.3)
- rack (1.4.1)
- rack-cache (1.1)
- rack (>= 0.4)
- rack-ssl (1.3.2)
- rack
- rack-test (0.6.1)
- rack (>= 1.0)
- rails (3.2.2)
- actionmailer (= 3.2.2)
- actionpack (= 3.2.2)
- activerecord (= 3.2.2)
- activeresource (= 3.2.2)
- activesupport (= 3.2.2)
- bundler (~> 1.0)
- railties (= 3.2.2)
- railties (3.2.2)
- actionpack (= 3.2.2)
- activesupport (= 3.2.2)
- rack-ssl (~> 1.3.2)
- rake (>= 0.8.7)
- rdoc (~> 3.4)
- thor (~> 0.14.6)
- rake (0.9.2.2)
- rdoc (3.12)
- json (~> 1.4)
- sprockets (2.1.2)
- hike (~> 1.2)
- rack (~> 1.0)
- tilt (!= 1.3.0, ~> 1.1)
- sqlite3 (1.3.5)
- thor (0.14.6)
- tilt (1.3.3)
- treetop (1.4.10)
- polyglot
- polyglot (>= 0.3.1)
- tzinfo (0.3.33)
-
-PLATFORMS
- ruby
-
-DEPENDENCIES
- jquery-rails
- railstar!
- sqlite3
View
@@ -7,7 +7,7 @@
require 'railstar/active_record_ext'
ActiveRecord::Base.send(:include, Railstar::ActiveRecordExt)
-require 'railstar/column_comment' if /mysql/i =~ Rails.configuration.database_configuration[Rails.env]["adapter"]
+#require 'railstar/column_comment' if /mysql/i =~ Rails.configuration.database_configuration[Rails.env]["adapter"]
module Railstar
def self.env
@@ -9,6 +9,14 @@ development:
pool: 5
timeout: 5000
+nightly:
+ adapter: mysql2
+ database: railstar
+ pool: 5
+ user: root
+ password:
+
+
# Warning: The database defined as "test" will be erased and
# re-generated from your development database when you run "rake".
# Do not set this db to the same as development or production.

0 comments on commit 8fa3fa2

Please sign in to comment.