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] Upsert support prototype. #163

Closed
wants to merge 6 commits into from
Closed

[WIP] Upsert support prototype. #163

wants to merge 6 commits into from

Commits on Jun 29, 2012

  1. Upsert support protoype.

    @kimhemsoe
    kimhemsoe committed Jun 29, 2012
    Copy the full SHA
    3322794 View commit details
    Browse the repository at this point in the history

  2. [UPSERT] Removed a sneaky .DS_Store file. 

    [UPSERT] Added locking when not using native upsert support.
    @kimhemsoe
    kimhemsoe committed Jun 29, 2012
    Copy the full SHA
    a2f602d View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2012

  1. [UPSERT] Exclusive locking. Fixed that we insert/update with the righ… 

    …t values.
    @kimhemsoe
    kimhemsoe committed Jul 1, 2012
    Copy the full SHA
    024410a View commit details
    Browse the repository at this point in the history

  2. Fixed pg not supporting aggretated functions wth "FOR UPDATE"

    @kimhemsoe
    kimhemsoe committed Jul 1, 2012
    Copy the full SHA
    03840fc View commit details
    Browse the repository at this point in the history

Commits on Sep 22, 2012

  1. tmp

    @kimhemsoe
    kimhemsoe committed Sep 22, 2012
    Copy the full SHA
    a5581ae View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into upsert 

    Conflicts:
	lib/Doctrine/DBAL/Connection.php
    @kimhemsoe
    kimhemsoe committed Sep 22, 2012
    Copy the full SHA
    4c261ef View commit details
    Browse the repository at this point in the history