Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merging the "merging upstream" branch #1

Merged
merged 78 commits into from May 1, 2018

Conversation

jmarkbrooks
Copy link

Apparently "merging upstream" should have been the baseline. Given that this gem exists and is maintained, not sure why Arthrex has their own version?

masato-hi and others added 30 commits July 22, 2013 11:43
…rser

fix mysql import error. uninitialized constant.
  maintainers of adapter gems should be tasked with
  creating a file in the adapters folder instead of
  forcing a file to be present within AR-import adapters folder
  if `require` does not find a file in the first entry on the gem
  load path it will move on to the next, multiple folders that have
  adapters in them will be referenced instead of requiring that
  each adapter be registered withing AR-import, this is how
  AR has adapters that are dynamically loadable and do not
  require each adapter to be referenced in the AR gem
let load paths determine which adapter is required a la activerecord adapters
Only add columns that haven't already been added
Instead, rely on basic behavior which supports non-optimized imports.

[zdennis#131]
documentation for additional adapters
add ruby license and specify in gemspec.
…-debug-gem

Fix "ruby-debug" listed more than once "warning"
(partially, jruby and sqlite3 not runnning so far)
zdennis and others added 29 commits December 21, 2014 18:06
…time-related test which was failing with active record 3.2 due to timezone issues.
Set the ActiveRecord::Base timezone to UTC for tests
…mport

Adding the ability to use #import thru a has many association.
…anked and 2.8.1 does not seem to build on OS X 10.10
This pins the Gemfile to 1.0.3 which seems to work.
Relax restrictions on mysql for AR 3.1 and 3.2
place the id return into every model and mark the model as clean? (since it has been saved)
make the patch work for non-standard primary keys
modification showing how save a tree of objects efficiently.
pass options down into sub-objects that are imported
set the foreign key on a sub-collection when the parent is imported
tests for importing 3 levels of objects
new model for testing 3 levels of objects: chapter
move the setting of ids down into the postgresql adapter.
…ulk import, we want to bypass the proxy association and use the underlying target. Do this by marking each association as loaded
…lling some SQL. I think pulling the autofollowing of associations out helps that
…de do its job.

This removes the chance of name collision and ensures we can call the original method with super.
…mport

return the inserted ids for postgres bulk insert
@jmarkbrooks jmarkbrooks merged commit 8abc149 into fixing_for_rails_5 May 1, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet