Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jmg/elixir
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: ifwe/elixir
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 5 commits
  • 3 files changed
  • 1 contributor

Commits on Mar 26, 2014

  1. Initialize table_args and table_options early in __init__ 

    This allows base classes to use using_table_options which will stack with subclass calls. Previously this would fail with an attribute error
    Mike Dougherty committed Mar 26, 2014
    Configuration menu
    Copy the full SHA
    a7834e4 View commit details
    Browse the repository at this point in the history

  2. ScopedSession was renamed in (I believe) v0.8 of sqlalchemy

    Mike Dougherty committed Mar 26, 2014
    Configuration menu
    Copy the full SHA
    21594e1 View commit details
    Browse the repository at this point in the history

  3. Bumping setup.py versions for sqlalchemy and elixir -- should elixir … 

    …be >= 0.9 now?
    Mike Dougherty committed Mar 26, 2014
    Configuration menu
    Copy the full SHA
    c2e6a7e View commit details
    Browse the repository at this point in the history

  4. Catch import error when looking for ScopedSession, to be compatible w… 

    …ith sqlalchemy 0.50 through 0.8.0+
    Mike Dougherty committed Mar 26, 2014
    Configuration menu
    Copy the full SHA
    e7086b9 View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2014

  1. Update version to match setup.py

    Mike Dougherty committed Mar 28, 2014
    Configuration menu
    Copy the full SHA
    3cb0cdf View commit details
    Browse the repository at this point in the history
Loading