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.

Sign up for GitHub

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

Jump to bottom

WIP: Transaction #1318

Merged
merged 94 commits into from
Jul 9, 2015
Merged

WIP: Transaction #1318

merged 94 commits into from
Jul 9, 2015

Commits on Jul 1, 2015

  1. Empty commit for the PR

    @josenavas
    josenavas committed Jul 1, 2015
    Configuration menu
    Copy the full SHA
    2fc1a3d View commit details
    Browse the repository at this point in the history

Commits on Jul 2, 2015

  1. Adding transaction object, applying singleton pattern and adding tests

    @josenavas
    josenavas committed Jul 2, 2015
    Configuration menu
    Copy the full SHA
    269d340 View commit details
    Browse the repository at this point in the history

  2. Fixing environment manager so we can drop/make environments

    @josenavas
    josenavas committed Jul 2, 2015
    Configuration menu
    Copy the full SHA
    5f813c2 View commit details
    Browse the repository at this point in the history

  3. Fixing the base object

    @josenavas
    josenavas committed Jul 2, 2015
    Configuration menu
    Copy the full SHA
    a619d34 View commit details
    Browse the repository at this point in the history

  4. Removing conn_handler parameter from check_table_cols

    @josenavas
    josenavas committed Jul 2, 2015
    Configuration menu
    Copy the full SHA
    d9c7441 View commit details
    Browse the repository at this point in the history

  5. Fixing user object

    @josenavas
    josenavas committed Jul 2, 2015
    Configuration menu
    Copy the full SHA
    60078b5 View commit details
    Browse the repository at this point in the history

  6. Fixing call to check_table_cols

    @josenavas
    josenavas committed Jul 2, 2015
    Configuration menu
    Copy the full SHA
    a4949de View commit details
    Browse the repository at this point in the history

  7. Fixing comments

    @josenavas
    josenavas committed Jul 2, 2015
    Configuration menu
    Copy the full SHA
    178d70d View commit details
    Browse the repository at this point in the history

  8. Merge branch 'pr-1318-transaction' into pr-1318-base-user

    @josenavas
    josenavas committed Jul 2, 2015
    Configuration menu
    Copy the full SHA
    05f1c56 View commit details
    Browse the repository at this point in the history

  9. transaction -> TRN

    @josenavas
    josenavas committed Jul 2, 2015
    Configuration menu
    Copy the full SHA
    b14b0ab View commit details
    Browse the repository at this point in the history

  10. Fixing analysis and job calls so tests pass

    @josenavas
    josenavas committed Jul 2, 2015
    Configuration menu
    Copy the full SHA
    ee4a84e View commit details
    Browse the repository at this point in the history

  11. Merge pull request #1320 from josenavas/pr-1318-transaction 

    URGENT: Transaction object
    @ElDeveloper
    ElDeveloper committed Jul 2, 2015
    Configuration menu
    Copy the full SHA
    7712758 View commit details
    Browse the repository at this point in the history

  12. Addressing comments

    @josenavas
    josenavas committed Jul 2, 2015
    Configuration menu
    Copy the full SHA
    673a0a4 View commit details
    Browse the repository at this point in the history

  13. Adding execute_fetchindex and tests

    @josenavas
    josenavas committed Jul 2, 2015
    Configuration menu
    Copy the full SHA
    7785805 View commit details
    Browse the repository at this point in the history

  14. execute()[-1] -> execute_fetchindex()

    @josenavas
    josenavas committed Jul 2, 2015
    Configuration menu
    Copy the full SHA
    f610409 View commit details
    Browse the repository at this point in the history

  15. Merge pull request #1323 from josenavas/pr-1318-base-user 

    Fixing base and user objects
    @ElDeveloper
    ElDeveloper committed Jul 2, 2015
    Configuration menu
    Copy the full SHA
    f0a34fc View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2015

  1. Fixing util

    @josenavas
    josenavas committed Jul 3, 2015
    Configuration menu
    Copy the full SHA
    62d2e9c View commit details
    Browse the repository at this point in the history

  2. Fixing calls to util functions that changed the API

    @josenavas
    josenavas committed Jul 3, 2015
    Configuration menu
    Copy the full SHA
    c2a4293 View commit details
    Browse the repository at this point in the history

  3. Fixing small bug

    @josenavas
    josenavas committed Jul 3, 2015
    Configuration menu
    Copy the full SHA
    a6a176c View commit details
    Browse the repository at this point in the history

  4. Fixing error in get_lat_longs

    @josenavas
    josenavas committed Jul 3, 2015
    Configuration menu
    Copy the full SHA
    1d3c0fe View commit details
    Browse the repository at this point in the history

  5. Addressing comments

    @josenavas
    josenavas committed Jul 3, 2015
    Configuration menu
    Copy the full SHA
    2e04a1d View commit details
    Browse the repository at this point in the history

  6. Fixing base template

    @josenavas
    josenavas committed Jul 3, 2015
    Configuration menu
    Copy the full SHA
    eb07511 View commit details
    Browse the repository at this point in the history

Commits on Jul 4, 2015

  1. Adding post commit/rollback functionality

    @josenavas
    josenavas committed Jul 4, 2015
    Configuration menu
    Copy the full SHA
    52d65a7 View commit details
    Browse the repository at this point in the history

  2. Addressing comments

    @josenavas
    josenavas committed Jul 4, 2015
    Configuration menu
    Copy the full SHA
    7a4aedd View commit details
    Browse the repository at this point in the history

  3. Ensuring FS-DB sync with post commit/rollback funcs

    @josenavas
    josenavas committed Jul 4, 2015
    Configuration menu
    Copy the full SHA
    0bc8638 View commit details
    Browse the repository at this point in the history

  4. Addressing comments

    @josenavas
    josenavas committed Jul 4, 2015
    Configuration menu
    Copy the full SHA
    90b985d View commit details
    Browse the repository at this point in the history

  5. Adding comment

    @josenavas
    josenavas committed Jul 4, 2015
    Configuration menu
    Copy the full SHA
    ad9f87e View commit details
    Browse the repository at this point in the history

  6. Adding execute_flatten function

    @josenavas
    josenavas committed Jul 4, 2015
    Configuration menu
    Copy the full SHA
    c0c72ff View commit details
    Browse the repository at this point in the history

  7. Make use of fetchflatten

    @josenavas
    josenavas committed Jul 4, 2015
    Configuration menu
    Copy the full SHA
    49c302f View commit details
    Browse the repository at this point in the history

  8. Improving add function methods

    @josenavas
    josenavas committed Jul 4, 2015
    Configuration menu
    Copy the full SHA
    703c01f View commit details
    Browse the repository at this point in the history

  9. Removing unused import

    @josenavas
    josenavas committed Jul 4, 2015
    Configuration menu
    Copy the full SHA
    8d18255 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #1324 from josenavas/pr-1318-util 

    URGENT: Fix util
    @ElDeveloper
    ElDeveloper committed Jul 4, 2015
    Configuration menu
    Copy the full SHA
    e4764b2 View commit details
    Browse the repository at this point in the history

  11. Merge branch 'transaction' of https://github.com/biocore/qiita into p… 

    …r-1318-metadata
    @josenavas
    josenavas committed Jul 4, 2015
    Configuration menu
    Copy the full SHA
    534a109 View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2015

  1. Fixing base template

    @josenavas
    josenavas committed Jul 5, 2015
    Configuration menu
    Copy the full SHA
    27cc242 View commit details
    Browse the repository at this point in the history

  2. Fixing sample template

    @josenavas
    josenavas committed Jul 5, 2015
    Configuration menu
    Copy the full SHA
    5273385 View commit details
    Browse the repository at this point in the history

  3. Fixing ST tests

    @josenavas
    josenavas committed Jul 5, 2015
    Configuration menu
    Copy the full SHA
    76a35f6 View commit details
    Browse the repository at this point in the history

  4. Fixing prep template

    @josenavas
    josenavas committed Jul 5, 2015
    Configuration menu
    Copy the full SHA
    417ea55 View commit details
    Browse the repository at this point in the history

  5. Fixing PT tests

    @josenavas
    josenavas committed Jul 5, 2015
    Configuration menu
    Copy the full SHA
    4a0dcf8 View commit details
    Browse the repository at this point in the history

  6. Fixing checks in the subclass

    @josenavas
    josenavas committed Jul 5, 2015
    Configuration menu
    Copy the full SHA
    40345ab View commit details
    Browse the repository at this point in the history

  7. Fixing base class tests

    @josenavas
    josenavas committed Jul 5, 2015
    Configuration menu
    Copy the full SHA
    e329982 View commit details
    Browse the repository at this point in the history

  8. Fixing qiita_db/data.py

    @josenavas
    josenavas committed Jul 5, 2015
    Configuration menu
    Copy the full SHA
    0fc73a0 View commit details
    Browse the repository at this point in the history

  9. fixing pep8 errors and test in qiita_pet

    @josenavas
    josenavas committed Jul 5, 2015
    Configuration menu
    Copy the full SHA
    86923a7 View commit details
    Browse the repository at this point in the history

Commits on Jul 6, 2015

  1. Fixing comments

    @josenavas
    josenavas committed Jul 6, 2015
    Configuration menu
    Copy the full SHA
    b8a73ee View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1327 from josenavas/pr-1318-data 

    Fixing qiita_db/data.py
    @ElDeveloper
    ElDeveloper committed Jul 6, 2015
    Configuration menu
    Copy the full SHA
    d5c16d5 View commit details
    Browse the repository at this point in the history

  3. Addressing comment

    @josenavas
    josenavas committed Jul 6, 2015
    Configuration menu
    Copy the full SHA
    8b481d2 View commit details
    Browse the repository at this point in the history

  4. fixing analysis obj

    @josenavas
    josenavas committed Jul 6, 2015
    Configuration menu
    Copy the full SHA
    366f8ab View commit details
    Browse the repository at this point in the history

  5. Fixing tests

    @josenavas
    josenavas committed Jul 6, 2015
    Configuration menu
    Copy the full SHA
    4338726 View commit details
    Browse the repository at this point in the history

  6. Fixing job object

    @josenavas
    josenavas committed Jul 6, 2015
    Configuration menu
    Copy the full SHA
    186f955 View commit details
    Browse the repository at this point in the history

Commits on Jul 7, 2015

  1. Merge branch 'transaction' of https://github.com/biocore/qiita into p… 

    …r-1318-metadata
    @josenavas
    josenavas committed Jul 7, 2015
    Configuration menu
    Copy the full SHA
    7f0c8d9 View commit details
    Browse the repository at this point in the history

  2. Adding the 'd' character that @ElDeveloper requested in the other PR … 

    …and broke the tests
    @josenavas
    josenavas committed Jul 7, 2015
    Configuration menu
    Copy the full SHA
    d1c0025 View commit details
    Browse the repository at this point in the history

  3. Fixing study and studyperson

    @josenavas
    josenavas committed Jul 7, 2015
    Configuration menu
    Copy the full SHA
    b89dcd9 View commit details
    Browse the repository at this point in the history

  4. Fixing tests and adding more tests

    @josenavas
    josenavas committed Jul 7, 2015
    Configuration menu
    Copy the full SHA
    6506118 View commit details
    Browse the repository at this point in the history

  5. Adding missing test

    @josenavas
    josenavas committed Jul 7, 2015
    Configuration menu
    Copy the full SHA
    304b50d View commit details
    Browse the repository at this point in the history

  6. Fixing reference object

    @josenavas
    josenavas committed Jul 7, 2015
    Configuration menu
    Copy the full SHA
    e963a76 View commit details
    Browse the repository at this point in the history

  7. Fixing meta_util.py

    @josenavas
    josenavas committed Jul 7, 2015
    Configuration menu
    Copy the full SHA
    89f829e View commit details
    Browse the repository at this point in the history

  8. Fixing parameters.py

    @josenavas
    josenavas committed Jul 7, 2015
    Configuration menu
    Copy the full SHA
    11b688e View commit details
    Browse the repository at this point in the history

  9. Fixing ontology object

    @josenavas
    josenavas committed Jul 7, 2015
    Configuration menu
    Copy the full SHA
    99ea9bf View commit details
    Browse the repository at this point in the history

  10. Fixing the logger object

    @josenavas
    josenavas committed Jul 7, 2015
    Configuration menu
    Copy the full SHA
    5d5ee12 View commit details
    Browse the repository at this point in the history

  11. Merge pull request #1326 from josenavas/pr-1318-metadata 

    Fix metadata template object for transaction
    @ElDeveloper
    ElDeveloper committed Jul 7, 2015
    Configuration menu
    Copy the full SHA
    6a45c6a View commit details
    Browse the repository at this point in the history

  12. Merge branch 'transaction' of https://github.com/biocore/qiita into p… 

    …r-1318-analysis-job
    @josenavas
    josenavas committed Jul 7, 2015
    Configuration menu
    Copy the full SHA
    5c7a6b8 View commit details
    Browse the repository at this point in the history

  13. Merge branch 'transaction' of https://github.com/biocore/qiita into p… 

    …r-1318-study-reference
    @josenavas
    josenavas committed Jul 7, 2015
    Configuration menu
    Copy the full SHA
    511c893 View commit details
    Browse the repository at this point in the history

  14. Merge branch 'master' of https://github.com/biocore/qiita into pr-131… 

    …8-metaparatologylog
    @josenavas
    josenavas committed Jul 7, 2015
    Configuration menu
    Copy the full SHA
    67ae8de View commit details
    Browse the repository at this point in the history

  15. Fixing the search engine, and adding a check in the sql connection ha… 

    …ndler
    @josenavas
    josenavas committed Jul 7, 2015
    Configuration menu
    Copy the full SHA
    507f3c3 View commit details
    Browse the repository at this point in the history

  16. Fixing commands

    @josenavas
    josenavas committed Jul 7, 2015
    Configuration menu
    Copy the full SHA
    da51816 View commit details
    Browse the repository at this point in the history

  17. Merge branch 'transaction' of https://github.com/biocore/qiita into p… 

    …r-1318-search-cmds
    @josenavas
    josenavas committed Jul 7, 2015
    Configuration menu
    Copy the full SHA
    f7402ec View commit details
    Browse the repository at this point in the history

  18. Reverting changes in StudyPerson.create

    @josenavas
    josenavas committed Jul 7, 2015
    Configuration menu
    Copy the full SHA
    59becaa View commit details
    Browse the repository at this point in the history

  19. Fixing patches

    @josenavas
    josenavas committed Jul 7, 2015
    Configuration menu
    Copy the full SHA
    9264500 View commit details
    Browse the repository at this point in the history

  20. Fixing environment mgr

    @josenavas
    josenavas committed Jul 7, 2015
    Configuration menu
    Copy the full SHA
    be388d0 View commit details
    Browse the repository at this point in the history

  21. Removing code duplication in tornado_test_base

    @josenavas
    josenavas committed Jul 7, 2015
    Configuration menu
    Copy the full SHA
    ff299a7 View commit details
    Browse the repository at this point in the history

  22. Addressing comments

    @josenavas
    josenavas committed Jul 7, 2015
    Configuration menu
    Copy the full SHA
    8954a61 View commit details
    Browse the repository at this point in the history

  23. JOIN ... ON ... -> JOIN ... USING (...)

    @josenavas
    josenavas committed Jul 7, 2015
    Configuration menu
    Copy the full SHA
    20b5c97 View commit details
    Browse the repository at this point in the history

  24. FROm -> FROM

    @josenavas
    josenavas committed Jul 7, 2015
    Configuration menu
    Copy the full SHA
    ab223ff View commit details
    Browse the repository at this point in the history

  25. Fixing test

    @josenavas
    josenavas committed Jul 7, 2015
    Configuration menu
    Copy the full SHA
    c4e6a09 View commit details
    Browse the repository at this point in the history

  26. pep8ing

    @josenavas
    josenavas committed Jul 7, 2015
    Configuration menu
    Copy the full SHA
    4d5ac06 View commit details
    Browse the repository at this point in the history

  27. Addressing comment

    @josenavas
    josenavas committed Jul 7, 2015
    Configuration menu
    Copy the full SHA
    f95983d View commit details
    Browse the repository at this point in the history

  28. Merge pull request #1335 from josenavas/pr-1318-search-cmds 

    Transactionize the search engine and commands
    @squirrelo
    squirrelo committed Jul 7, 2015
    Configuration menu
    Copy the full SHA
    7f1ace0 View commit details
    Browse the repository at this point in the history

  29. Merge pull request #1332 from josenavas/pr-1318-analysis-job 

    Transactionize the analysis and job objects
    @squirrelo
    squirrelo committed Jul 7, 2015
    Configuration menu
    Copy the full SHA
    1c4db37 View commit details
    Browse the repository at this point in the history

  30. Merge pull request #1333 from josenavas/pr-1318-study-reference 

    Transactionize the Study, StudyPerson and Reference
    @squirrelo
    squirrelo committed Jul 7, 2015
    Configuration menu
    Copy the full SHA
    09149f5 View commit details
    Browse the repository at this point in the history

  31. Merge pull request #1334 from josenavas/pr-1318-metaparatologylog 

    Transactionize meta_util, parameters, ontology and logger
    @squirrelo
    squirrelo committed Jul 7, 2015
    Configuration menu
    Copy the full SHA
    c0bb23d View commit details
    Browse the repository at this point in the history

  32. Merge pull request #1337 from josenavas/pr-1318-patches-env-mgr 

    Transactionaize patches and environment mgr
    @squirrelo
    squirrelo committed Jul 7, 2015
    Configuration menu
    Copy the full SHA
    a4773e1 View commit details
    Browse the repository at this point in the history

  33. Fixing merge conflicts

    @josenavas
    josenavas committed Jul 7, 2015
    Configuration menu
    Copy the full SHA
    0ac0c22 View commit details
    Browse the repository at this point in the history

  34. Adding transactionizer wrapper

    @josenavas
    josenavas committed Jul 7, 2015
    Configuration menu
    Copy the full SHA
    f01dd8a View commit details
    Browse the repository at this point in the history

  35. fixing test

    @josenavas
    josenavas committed Jul 7, 2015
    Configuration menu
    Copy the full SHA
    09a0f8b View commit details
    Browse the repository at this point in the history

  36. Merge pull request #1338 from josenavas/transaction-mc 

    Solving merge conflicts
    @squirrelo
    squirrelo committed Jul 7, 2015
    Configuration menu
    Copy the full SHA
    236f089 View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2015

  1. Fixing import so we make sure it happens in the workers

    @josenavas
    josenavas committed Jul 8, 2015
    Configuration menu
    Copy the full SHA
    2e588ab View commit details
    Browse the repository at this point in the history

  2. Merge branch 'transaction' of https://github.com/biocore/qiita into t… 

    …ransaction
    @josenavas
    josenavas committed Jul 8, 2015
    Configuration menu
    Copy the full SHA
    4483a1f View commit details
    Browse the repository at this point in the history

  3. Transactionize portals

    @josenavas
    josenavas committed Jul 8, 2015
    Configuration menu
    Copy the full SHA
    e82e3c0 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #1340 from josenavas/pr-1318-portal 

    Transactionize portals and decorator
    @squirrelo
    squirrelo committed Jul 8, 2015
    Configuration menu
    Copy the full SHA
    5b4d741 View commit details
    Browse the repository at this point in the history

  5. Adding decorators

    @josenavas
    josenavas committed Jul 8, 2015
    Configuration menu
    Copy the full SHA
    f015338 View commit details
    Browse the repository at this point in the history

  6. Removing queue code

    @josenavas
    josenavas committed Jul 8, 2015
    Configuration menu
    Copy the full SHA
    17d6fb2 View commit details
    Browse the repository at this point in the history

  7. Transactionize everything

    @josenavas
    josenavas committed Jul 8, 2015
    Configuration menu
    Copy the full SHA
    8eac15d View commit details
    Browse the repository at this point in the history

  8. Yay pep8....

    @josenavas
    josenavas committed Jul 8, 2015
    Configuration menu
    Copy the full SHA
    acc92e0 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #1347 from josenavas/pr-1318-qiita-pet 

    Transactionize QIITA-pet
    @squirrelo
    squirrelo committed Jul 8, 2015
    Configuration menu
    Copy the full SHA
    5fe0630 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #1353 from josenavas/pr-1318-remove-query 

    Removing queue code
    @antgonza
    antgonza committed Jul 8, 2015
    Configuration menu
    Copy the full SHA
    df93a50 View commit details
    Browse the repository at this point in the history