From 7a5fe330679995374c3235821fef6b9590babbbd Mon Sep 17 00:00:00 2001 From: Ben Atkins Date: Fri, 9 May 2014 12:08:02 -0400 Subject: [PATCH] close #317; close #314; Travis can now test against MySQL properly --- .travis.yml | 4 ---- CHANGELOG.md | 4 +++- README.md | 1 + 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 30ef99dfd..40b4212d9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,9 +10,6 @@ env: - DB=postgres - DB=sqlite -before_install: - - gem update --system 2.2.1 - before_script: - sh -c "if [ \"$DB\" = 'mysql' ]; then mysql -e 'create database paper_trail_test;'; fi" - sh -c "if [ \"$DB\" = 'mysql' ]; then mysql -e 'create database paper_trail_bar; '; fi" @@ -32,5 +29,4 @@ matrix: gemfile: Gemfile - rvm: 1.8.7 gemfile: Gemfile - - env: DB=mysql \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 51d239e7c..ace56a055 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,9 @@ `PaperTrail::Rails::Controller` should hook into all controller types, and should not get loaded unless `ActionController` is. - [#346](https://github.com/airblade/paper_trail/pull/346) - `user_for_paper_trail` method should accommodate different types for return values from `current_user` method. + - [#344](https://github.com/airblade/paper_trail/pull/344) - Gem is now tested against `MySQL` and `PostgreSQL` in addition to `SQLite`. + - [#317](https://github.com/airblade/paper_trail/issues/317) / [#314](https://github.com/airblade/paper_trail/issues/314) - + `versions` should default to ordering via the primary key if it is an integer to avoid timestamp comparison issues. - `PaperTrail::Cleaner.clean_versions!` should group versions by `PaperTrail.timestamp_field` when deciding which ones to keep / destroy, instead of always grouping by the `created_at` field. - If a `Version` instance is reified and then persisted at that state, it's source version @@ -13,7 +16,6 @@ become the live instance. - If `destroy` actions are tracked for a versioned model, invoking `destroy` on the model will cause the corresponding version that gets generated to be assigned as the source version (`model_instance#version_association_name`, usually `model_instance#version`). - - Gem is now tested against `MySQL` and `PostgreSQL` in addition to `SQLite`. ## 3.0.1 diff --git a/README.md b/README.md index bfd10daa5..2752fff2e 100644 --- a/README.md +++ b/README.md @@ -1046,6 +1046,7 @@ Please use GitHub's [issue tracker](http://github.com/airblade/paper_trail/issue Many thanks to: +* [Russell Osborne](https://github.com/rposborne) * [Zachery Hostens](http://github.com/zacheryph) * [Jeremy Weiskotten](http://github.com/jeremyw) * [Phan Le](http://github.com/revo)