Merge pull request #2093 from riyad/remove-sqlite

Remove SQLite support
This commit is contained in:
Valeriy Sizov 2012-11-27 13:41:07 -08:00
commit 99e1d9d8b9
5 changed files with 5 additions and 50 deletions

View file

@ -11,7 +11,6 @@ end
gem "rails", "3.2.9"
# Supported DBs
gem "sqlite3", group: :sqlite
gem "mysql2", group: :mysql
gem "pg", group: :postgres

View file

@ -410,7 +410,6 @@ GEM
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sqlite3 (1.3.6)
stamp (0.3.0)
test_after_commit (0.0.1)
therubyracer (0.10.2)
@ -518,7 +517,6 @@ DEPENDENCIES
simplecov
six
spinach-rails
sqlite3
stamp
test_after_commit
therubyracer

View file

@ -1,31 +0,0 @@
#
# PRODUCTION
#
# SQLite version 3.x
# gem install sqlite3
#
# Ensure the SQLite 3 gem is defined in your Gemfile
# gem 'sqlite3'
production:
adapter: sqlite3
database: db/production.sqlite3
pool: 5
timeout: 5000
#
# Development specific
#
development:
adapter: sqlite3
database: db/development.sqlite3
pool: 5
timeout: 5000
# 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.
test: &test
adapter: sqlite3
database: db/test.sqlite3
pool: 5
timeout: 5000

View file

@ -1,12 +1,8 @@
# Databases:
GitLab use mysql as default database but you are free to use PostgreSQL or SQLite.
GitLab use MySQL as default database but you are free to use PostgreSQL.
## SQLite
sudo apt-get install -y sqlite3 libsqlite3-dev
## MySQL
sudo apt-get install -y mysql-server mysql-client libmysqlclient-dev
@ -47,9 +43,6 @@ GitLab use mysql as default database but you are free to use PostgreSQL or SQLit
#### Select the database you want to use
# SQLite
sudo -u gitlab cp config/database.yml.sqlite config/database.yml
# Mysql
sudo -u gitlab cp config/database.yml.mysql config/database.yml
@ -61,11 +54,7 @@ GitLab use mysql as default database but you are free to use PostgreSQL or SQLit
#### Install gems
# mysql
sudo -u gitlab -H bundle install --without development test sqlite postgres --deployment
sudo -u gitlab -H bundle install --without development test postgres --deployment
# or postgres
sudo -u gitlab -H bundle install --without development test sqlite mysql --deployment
# or sqlite
sudo -u gitlab -H bundle install --without development test mysql postgres --deployment
sudo -u gitlab -H bundle install --without development test mysql --deployment

View file

@ -178,7 +178,7 @@ and ensure you have followed all of the above steps carefully.
sudo gem install charlock_holmes --version '0.6.9'
sudo gem install bundler
sudo -u gitlab -H bundle install --without development test sqlite postgres --deployment
sudo -u gitlab -H bundle install --without development test postgres --deployment
#### Configure git client
@ -269,7 +269,7 @@ You can login via web using admin generated with setup:
# Advanced setup tips:
_Checkout databases.md for postgres or sqlite_
_Checkout databases.md for PostgreSQL_
## Customizing Resque's Redis connection