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

Update Fork #1

Merged
merged 868 commits into from
Feb 29, 2016
Merged

Update Fork #1

merged 868 commits into from
Feb 29, 2016

Conversation

stchr
Copy link
Owner

@stchr stchr commented Feb 29, 2016

No description provided.

deeky666 and others added 30 commits April 30, 2015 18:18
Documentation & code styling fixes
Revert the addition of the wrong bin script
… close (not unset)

This mocks connect(), sets the internal _conn to an object, then calls close, which
should re-set _conn back to null. The getWrappedConnection() call gives us access
to _conn, but does NOT trigger a re-connect, since we mocked connect() to do nothing.
Ultimately, if _conn is unset, calling getWrappedConnection() will error. If _conn
is not set to null, the test will fail. This tests all the cases.
This also simplies the allowed failures for HHVM
Remove HHVM-nightly builds
removed empty line
According to the comment

// deleting duplicated foreign keys present on both on the orphanedForeignKey
// and the removedForeignKeys from changedTables

A check must be had on the $removedForeignKey so it does point on the removed table. Currently it does unset all keys removal even the one pointing on other table.
On the MySQLPlatform::getDropForeignKeySQL table name will not be escaped if the name is passed instead of the object table itself.

Since the getLocalTableName use the localTable property the object is always available, there is no reason not to use it.
To fix the following notice-level errors:

Notice: Undefined property: Doctrine\DBAL\Connections\MasterSlaveConnection::$_conn in vendor/doctrine/dbal/lib/Doctrine/DBAL/Connections/MasterSlaveConnection.php line 154
Notice: Undefined index: slave in vendor/doctrine/dbal/lib/Doctrine/DBAL/Connections/MasterSlaveConnection.php line 165
Fix undefined notices within MasterSlaveConnection
…ue methods are passed non-null values that are not DateTime instances.
deeky666 and others added 28 commits January 10, 2016 16:43
Added support for inline comments for SQLite

fixes #1118
Identify retryable transaction errors
…tables have their FK constraints properly removed.
Fixed some broken links in the documentation
…column

Add test for schemadiff on table with renamed fk column referencing renamed table
Preserve quotation of old column name in ColumnDiff
Quote reserved keywords in TRUNCATE TABLE SQL
Added parameter "default_dbname" to pdo_pgsql driver which can be use…
Fix unnecessary check in DecimalType
Conflicts:
	lib/Doctrine/DBAL/Platforms/DB2iSeriesPlatform.php
[Oracle] Add support for Easy Connect string as connection parameter
[DB2] Move row number to the end of the field list in query limit/offset modification
Without using ``--list|-l`` you get a too many arguments error.

As an example ...

```
[ 15/02/2016 17:45:32 ] [ C:\wamp\www ] >vendor\bin\doctrine-dbal d:re mysql57 mysql


  [Symfony\Component\Console\Exception\RuntimeException]
  Too many arguments.


dbal:reserved-words [-l|--list [LIST]]


[ 15/02/2016 17:47:39 ] [ C:\wamp\www ] >vendor\bin\doctrine-dbal d:re -l mysql57 mysql


  [Symfony\Component\Console\Exception\RuntimeException]
  Too many arguments.


dbal:reserved-words [-l|--list [LIST]]


[ 15/02/2016 17:47:48 ] [ C:\wamp\www ] >vendor\bin\doctrine-dbal d:re -l mysql57 -l mysql
Checking keyword violations for mysql57, mysql...
There are 5 reserved keyword violations in your database schema:
  - Table affiliates column key keyword violations: MySQL57, MySQL
  - Table epos_landing_pages column key keyword violations: MySQL57, MySQL
  - Table purchase_notifications column trigger keyword violations: MySQL57, MySQL
  - Table xpermissions column add keyword violations: MySQL57, MySQL
  - Table xpermissions column delete keyword violations: MySQL57, MySQL
```
Multiple dialects require a --list per dialect
stchr added a commit that referenced this pull request Feb 29, 2016
@stchr stchr merged commit 8af1663 into stchr:master Feb 29, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.