oss/wallabag
oss/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-09-15 18:57:05 +00:00
Code Wiki Activity

We should able to get the table name unescaped

Browse source 
When we want to perform complex queries to retrieve metadata from the database
This commit is contained in:
Jeremy Benoist 2018-06-14 14:15:07 +02:00
parent bfe7a69226
commit 49b4c87598
No known key found for this signature in database
GPG key ID: BCA73962457ACC3C
2 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/DoctrineMigrations/Version20161001072726.php
View file

@ -24,7 +24,7 @@ class Version20161001072726 extends WallabagMigration
$query = $this->connection->query(" $query = $this->connection->query("
SELECT CONSTRAINT_NAME SELECT CONSTRAINT_NAME
FROM information_schema.key_column_usage FROM information_schema.key_column_usage
WHERE TABLE_NAME = '" . $this->getTable('entry_tag') . "' AND CONSTRAINT_NAME LIKE 'FK_%' WHERE TABLE_NAME = '" . $this->getTable('entry_tag', WallabagMigration::UN_ESCAPED_TABLE) . "' AND CONSTRAINT_NAME LIKE 'FK_%'
AND TABLE_SCHEMA = '" . $this->connection->getDatabase() . "'" AND TABLE_SCHEMA = '" . $this->connection->getDatabase() . "'"
); );
$query->execute(); $query->execute();
@ -42,7 +42,7 @@ class Version20161001072726 extends WallabagMigration
FROM pg_constraint c FROM pg_constraint c
JOIN pg_namespace n ON n.oid = c.connamespace JOIN pg_namespace n ON n.oid = c.connamespace
WHERE contype = 'f' WHERE contype = 'f'
AND conrelid::regclass::text = '" . $this->getTable('entry_tag') . "' AND conrelid::regclass::text = '" . $this->getTable('entry_tag', WallabagMigration::UN_ESCAPED_TABLE) . "'
AND n.nspname = 'public';" AND n.nspname = 'public';"
); );
$query->execute(); $query->execute();
@ -63,7 +63,7 @@ class Version20161001072726 extends WallabagMigration
$query = $this->connection->query(" $query = $this->connection->query("
SELECT CONSTRAINT_NAME SELECT CONSTRAINT_NAME
FROM information_schema.key_column_usage FROM information_schema.key_column_usage
WHERE TABLE_NAME = '" . $this->getTable('annotation') . "' WHERE TABLE_NAME = '" . $this->getTable('annotation', WallabagMigration::UN_ESCAPED_TABLE) . "'
AND CONSTRAINT_NAME LIKE 'FK_%' AND CONSTRAINT_NAME LIKE 'FK_%'
AND COLUMN_NAME = 'entry_id' AND COLUMN_NAME = 'entry_id'
AND TABLE_SCHEMA = '" . $this->connection->getDatabase() . "'" AND TABLE_SCHEMA = '" . $this->connection->getDatabase() . "'"
@ -83,7 +83,7 @@ class Version20161001072726 extends WallabagMigration
FROM pg_constraint c FROM pg_constraint c
JOIN pg_namespace n ON n.oid = c.connamespace JOIN pg_namespace n ON n.oid = c.connamespace
WHERE contype = 'f' WHERE contype = 'f'
AND conrelid::regclass::text = '" . $this->getTable('annotation') . "' AND conrelid::regclass::text = '" . $this->getTable('annotation', WallabagMigration::UN_ESCAPED_TABLE) . "'
AND n.nspname = 'public' AND n.nspname = 'public'
AND pg_get_constraintdef(c.oid) LIKE '%entry_id%';" AND pg_get_constraintdef(c.oid) LIKE '%entry_id%';"
); );

8
src/Wallabag/CoreBundle/Doctrine/WallabagMigration.php
View file

@ -9,6 +9,8 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
abstract class WallabagMigration extends AbstractMigration implements ContainerAwareInterface abstract class WallabagMigration extends AbstractMigration implements ContainerAwareInterface
{ {
const UN_ESCAPED_TABLE = true;
/** /**
* @var ContainerInterface * @var ContainerInterface
*/ */
@ -28,10 +30,14 @@ abstract class WallabagMigration extends AbstractMigration implements ContainerA
$this->container = $container; $this->container = $container;
} }
protected function getTable($tableName) protected function getTable($tableName, $unEscaped = false)
{ {
$table = $this->container->getParameter('database_table_prefix') . $tableName; $table = $this->container->getParameter('database_table_prefix') . $tableName;
if (self::UN_ESCAPED_TABLE === $unEscaped) {
return $table;
}
// escape table name is handled using " on postgresql // escape table name is handled using " on postgresql
if ('postgresql' === $this->connection->getDatabasePlatform()->getName()) { if ('postgresql' === $this->connection->getDatabasePlatform()->getName()) {
return '"' . $table . '"'; return '"' . $table . '"';