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

Fix setting persistent option for PDO connection #2092

Merged
merged 9 commits into from
Jul 4, 2022
Merged

Fix setting persistent option for PDO connection #2092

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7a49fa2
support PDO persistent connection
May 10, 2022
74a77af
Fixing style errors.
stickler-ci May 10, 2022
2b86062
SQL server PDO driver not supports persistent connections
May 10, 2022
f604777
Merge remote-tracking branch 'origin/feature/pdo-persistent-connectio…
May 10, 2022
e62466e
not testing SQL server PDO driver for unsupported attribute
May 10, 2022
bc9f3d7
Apply assertTrue & assertFalse suggestions from code review
paulermo May 11, 2022
ee97d51
syntax fix after applying suggestions
May 11, 2022
cff3d7f
Update SqlServerAdapter.php
MasterOdin Jul 4, 2022
7d0a7e5
Update SqlServerAdapter.php
MasterOdin Jul 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/Phinx/Db/Adapter/MysqlAdapter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,11 @@ public function connect()
$driverOptions[PDO::ATTR_DEFAULT_FETCH_MODE] = constant('\PDO::FETCH_' . strtoupper($options['fetch_mode']));
}

// pass \PDO::ATTR_PERSISTENT to driver options instead of useless setting it after instantiation
if (isset($options['attr_persistent'])) {
$driverOptions[PDO::ATTR_PERSISTENT] = $options['attr_persistent'];
}

// support arbitrary \PDO::MYSQL_ATTR_* driver options and pass them to PDO
// http://php.net/manual/en/ref.pdo-mysql.php#pdo-mysql.constants
foreach ($options as $key => $option) {
Expand Down
5 changes: 5 additions & 0 deletions src/Phinx/Db/Adapter/PostgresAdapter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,11 @@ public function connect()
$driverOptions[PDO::ATTR_DEFAULT_FETCH_MODE] = constant('\PDO::FETCH_' . strtoupper($options['fetch_mode']));
}

// pass \PDO::ATTR_PERSISTENT to driver options instead of useless setting it after instantiation
if (isset($options['attr_persistent'])) {
$driverOptions[PDO::ATTR_PERSISTENT] = $options['attr_persistent'];
}

$db = $this->createPdoConnection($dsn, $options['user'] ?? null, $options['pass'] ?? null, $driverOptions);

try {
Expand Down
5 changes: 5 additions & 0 deletions src/Phinx/Db/Adapter/SQLiteAdapter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,11 @@ public function connect()
$driverOptions[PDO::ATTR_DEFAULT_FETCH_MODE] = constant('\PDO::FETCH_' . strtoupper($options['fetch_mode']));
}

// pass \PDO::ATTR_PERSISTENT to driver options instead of useless setting it after instantiation
if (isset($options['attr_persistent'])) {
$driverOptions[PDO::ATTR_PERSISTENT] = $options['attr_persistent'];
}

$db = $this->createPdoConnection($dsn, null, null, $driverOptions);

$this->setConnection($db);
Expand Down
12 changes: 12 additions & 0 deletions tests/Phinx/Db/Adapter/MysqlAdapterTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2214,4 +2214,16 @@ public function testGetPhinxTypeFromSQLDefinition(string $sqlDefinition, array $
$this->assertSame($expectedResponse['name'], $result['name'], "Type mismatch - got '{$result['name']}' when expecting '{$expectedResponse['name']}'");
$this->assertSame($expectedResponse['limit'], $result['limit'], "Field upper boundary mismatch - got '{$result['limit']}' when expecting '{$expectedResponse['limit']}'");
}

public function testPdoPersistentConnection()
{
$adapter = new MysqlAdapter(MYSQL_DB_CONFIG + ['attr_persistent' => true]);
$this->assertEquals(true, $adapter->getConnection()->getAttribute(\PDO::ATTR_PERSISTENT));
paulermo marked this conversation as resolved.
Show resolved Hide resolved
}

public function testPdoNotPersistentConnection()
{
$adapter = new MysqlAdapter(MYSQL_DB_CONFIG);
$this->assertEquals(false, $adapter->getConnection()->getAttribute(\PDO::ATTR_PERSISTENT));
paulermo marked this conversation as resolved.
Show resolved Hide resolved
}
}
12 changes: 12 additions & 0 deletions tests/Phinx/Db/Adapter/PostgresAdapterTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2310,4 +2310,16 @@ public function testInvalidPdoAttribute()
$this->expectExceptionMessage('Invalid PDO attribute: attr_invalid (\PDO::ATTR_INVALID)');
$adapter->connect();
}

public function testPdoPersistentConnection()
{
$adapter = new PostgresAdapter(PGSQL_DB_CONFIG + ['attr_persistent' => true]);
$this->assertEquals(true, $adapter->getConnection()->getAttribute(\PDO::ATTR_PERSISTENT));
paulermo marked this conversation as resolved.
Show resolved Hide resolved
}

public function testPdoNotPersistentConnection()
{
$adapter = new PostgresAdapter(PGSQL_DB_CONFIG);
$this->assertEquals(false, $adapter->getConnection()->getAttribute(\PDO::ATTR_PERSISTENT));
paulermo marked this conversation as resolved.
Show resolved Hide resolved
}
}
12 changes: 12 additions & 0 deletions tests/Phinx/Db/Adapter/SQLiteAdapterTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2306,4 +2306,16 @@ public function testPdoExceptionUpdateNonExistingTable()
$table = new \Phinx\Db\Table('non_existing_table', [], $this->adapter);
$table->addColumn('column', 'string')->update();
}

public function testPdoPersistentConnection()
{
$adapter = new SQLiteAdapter(SQLITE_DB_CONFIG + ['attr_persistent' => true]);
$this->assertEquals(true, $adapter->getConnection()->getAttribute(\PDO::ATTR_PERSISTENT));
paulermo marked this conversation as resolved.
Show resolved Hide resolved
}

public function testPdoNotPersistentConnection()
{
$adapter = new SQLiteAdapter(SQLITE_DB_CONFIG);
$this->assertEquals(false, $adapter->getConnection()->getAttribute(\PDO::ATTR_PERSISTENT));
paulermo marked this conversation as resolved.
Show resolved Hide resolved
}
}