Skip to content

Commit

Permalink
Merge pull request #137 from spdawson/eliminate-sqlite-dependency
Browse files Browse the repository at this point in the history
Eliminate sqlite dependency
  • Loading branch information
joelhawksley committed Nov 26, 2019
2 parents 7f72cc0 + 3142bb6 commit 68c2c42
Show file tree
Hide file tree
Showing 9 changed files with 4 additions and 29 deletions.
1 change: 0 additions & 1 deletion .github/workflows/ruby_on_rails.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ jobs:
ruby-version: ${{ matrix.ruby_version }}
- name: Build and test with Rake
run: |
sudo apt-get install libsqlite3-dev
gem install bundler:1.14.0
bundle update
bundle install --jobs 4 --retry 3
Expand Down
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,5 @@ build-iPhoneSimulator/
# .ruby-version
# .ruby-gemset

/**/*.sqlite3

# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
.rvmrc
1 change: 0 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,3 @@ gemspec
rails_version = "#{ENV['RAILS_VERSION'] || '6.0.0'}"

gem "rails", rails_version == "master" ? { github: "rails/rails" } : rails_version
gem "sqlite3", rails_version >= "6.0.0" ? ">= 1.4.0" : "< 1.4.0"
2 changes: 0 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,6 @@ GEM
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
sqlite3 (1.4.1)
temple (0.8.1)
thor (0.20.3)
thread_safe (0.3.6)
Expand All @@ -172,7 +171,6 @@ DEPENDENCIES
rubocop (= 0.74)
rubocop-github (~> 0.13.0)
slim (~> 4.0)
sqlite3 (>= 1.4.0)

BUNDLED WITH
1.17.3
5 changes: 0 additions & 5 deletions test/app/models/application_record.rb

This file was deleted.

5 changes: 4 additions & 1 deletion test/app/models/post.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
# frozen_string_literal: true

class Post < ApplicationRecord
class Post
include ActiveModel::Model

attr_accessor :title
end
1 change: 0 additions & 1 deletion test/config/application.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

require File.expand_path("../boot", __FILE__)

require "active_record/railtie"
require "active_model/railtie"
require "action_controller/railtie"
require "action_view/railtie"
Expand Down
8 changes: 0 additions & 8 deletions test/config/database.yml

This file was deleted.

8 changes: 0 additions & 8 deletions test/test_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,3 @@
def trim_result(html)
html.delete(" \t\r\n")
end

ActiveRecord::Base.establish_connection(adapter: "sqlite3", database: ":memory:")

ActiveRecord::Schema.define do
create_table :posts, force: true do |t|
t.string :title
end
end

0 comments on commit 68c2c42

Please sign in to comment.