GeezerVison

The World Wide Web, restored to 800 pixels of glory.

GeezerVison is showing github.com — Simplify DSN stuff again · php-enqueue/enqueue-dev@1bdad59

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

docker-compose.yml
pkg/dbal
- DbalConnectionFactory.php

Expand file treeCollapse file tree

Open diff view settings

Collapse file

`‎docker-compose.yml‎`

Copy file name to clipboardExpand all lines: docker-compose.yml

+1-1Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ services:`
`29`	`29`	`- STOMP_DSN=stomp://guest:guest@rabbitmq:61613/mqdev`
`30`	`30`	`- RABITMQ_STOMP_DSN=stomp+rabbitmq://guest:guest@rabbitmq:61613/mqdev`
`31`	`31`	`- RABBITMQ_MANAGMENT_DSN=http://guest:guest@rabbitmq:15672/mqdev`
`32`		`- - DOCTRINE_DSN=mysql+pdo://root:rootpass@mysql/mqdev`
	`32`	`+ - DOCTRINE_DSN=mysql://root:rootpass@mysql/mqdev`
`33`	`33`	`- DOCTRINE_POSTGRES_DSN=postgres://postgres:pass@postgres/template1`
`34`	`34`	`- MYSQL_DSN=mysql://root:rootpass@mysql/mqdev`
`35`	`35`	`- POSTGRES_DSN=postgres://postgres:pass@postgres/postgres`

Collapse file

`‎pkg/dbal/DbalConnectionFactory.php‎`

Copy file name to clipboardExpand all lines: pkg/dbal/DbalConnectionFactory.php

+12-18Lines changed: 12 additions & 18 deletions

Original file line number	Diff line number	Diff line change
`@@ -106,18 +106,21 @@ private function parseDsn(string $dsn, ?array $config = null): array`
`106`	`106`	`{`
`107`	`107`	`$parsedDsn = Dsn::parseFirst($dsn);`
`108`	`108`
	`109`	`+ // enqueue scheme => dbal scheme`
	`110`	`+ // out of the box dbal 4 schemes: pdo_mysql, pdo_sqlite, pdo_pgsql, pdo_oci, oci8, ibm_db2, pdo_sqlsrv, mysqli, pgsql, sqlsrv, sqlite3`
	`111`	`+ // in case of multiple drivers like mysqli vs pdo_mysql the pdo variant is preferred`
`109`	`112`	`$supported = [`
`110`		`- 'db2' => 'db2',`
`111`		`- 'ibm-db2' => 'ibm-db2',`
`112`		`- 'mssql' => 'mssql',`
	`113`	`+ 'db2' => 'ibm_db2',`
	`114`	`+ 'ibm-db2' => 'ibm_db2',`
	`115`	`+ 'mssql' => 'pdo_sqlsrv',`
`113`	`116`	`'sqlsrv+pdo' => 'pdo_sqlsrv',`
`114`		`- 'mysql' => 'mysql',`
`115`		`- 'mysql2' => 'mysql2',`
	`117`	`+ 'mysql' => 'pdo_mysql',`
	`118`	`+ 'mysql2' => 'mysqli',`
`116`	`119`	`'mysql+pdo' => 'pdo_mysql',`
`117`	`120`	`'pgsql' => 'pgsql',`
`118`		`- 'postgres' => 'postgres',`
	`121`	`+ 'postgres' => 'pdo_pgsql',`
`119`	`122`	`'pgsql+pdo' => 'pdo_pgsql',`
`120`		`- 'sqlite' => 'sqlite',`
	`123`	`+ 'sqlite' => 'sqlite3',`
`121`	`124`	`'sqlite3' => 'sqlite3',`
`122`	`125`	`'sqlite+pdo' => 'pdo_sqlite',`
`123`	`126`	`];`
`@@ -148,15 +151,11 @@ private function parseDsn(string $dsn, ?array $config = null): array`
`148`	`151`	`$dsn = $parsedDsn->getScheme().'://root@localhost';`
`149`	`152`	`}`
`150`	`153`
`151`		`- $doctrineSupported = [];`
`152`		`- foreach ($supported as $k => $v) {`
`153`		`- $doctrineSupported[$this->prepareDsnForDoctrine($k)] = $this->prepareDsnForDoctrine($v);`
`154`		`- }`
`155`		`- $dsnParser = new DsnParser($doctrineSupported);`
	`154`	`+ $dsnParser = new DsnParser($supported);`
`156`	`155`
`157`	`156`	`return [`
`158`	`157`	`'lazy' => true,`
`159`		`- 'connection' => $dsnParser->parse($this->prepareDsnForDoctrine($dsn)),`
	`158`	`+ 'connection' => $dsnParser->parse($dsn),`
`160`	`159`	`];`
`161`	`160`	`}`
`162`	`161`
`@@ -169,9 +168,4 @@ private function parseDsn(string $dsn, ?array $config = null): array`
`169`	`168`	`'connection' => ['url' => $dsn],`
`170`	`169`	`];`
`171`	`170`	`}`
`172`		`-`
`173`		`- private function prepareDsnForDoctrine(string $dsn): string`
`174`		`- {`
`175`		`- return preg_replace('/^([a-z0-9]+)\+pdo/i', 'pdo-$1', $dsn);`
`176`		`- }`
`177`	`171`	`}`

0 commit comments

Comments

0 (0)

You are visitor 01402520 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.