Added support for column inline comments in SQLite #819
Conversation
|
Hello, thank you for creating this pull request. I have automatically opened an issue http://www.doctrine-project.org/jira/browse/DBAL-1176 We use Jira to track the state of pull requests and the versions they got |
| $createSql = $this->_conn->fetchAll("SELECT sql FROM (SELECT * FROM sqlite_master UNION ALL SELECT * FROM sqlite_temp_master) WHERE type = 'table' AND name = '$table'"); | ||
| $createSql = isset($createSql[0]['sql']) ? $createSql[0]['sql'] : ''; | ||
| // inspect column collation and comments | ||
| $createSql = $this->_conn->fetchColumn("SELECT sql FROM (SELECT * FROM sqlite_master UNION ALL SELECT * FROM sqlite_temp_master) WHERE type = 'table' AND name = '$table'"); |
There was a problem hiding this comment.
Uhm... why is DBAL not using a prepared statement here? :|
| @@ -570,6 +578,14 @@ public function getForUpdateSql() | |||
| /** | |||
| * {@inheritDoc} | |||
| */ | |||
| public function getInlineColumnCommentSQL($comment) | |||
| { | |||
| return "--{$comment}\n"; | |||
There was a problem hiding this comment.
Shouldn't we make sure here that $comment does not contain \n? Otherwise the generated SQL will be invalid. We could either strip newlines or throw exception...
hason
force-pushed
the
sqlite_comment
branch
2 times, most recently
from
4fca981 to
c27e90f
Compare
| $createSql = $this->_conn->fetchColumn( | ||
| 'SELECT sql FROM (SELECT * FROM sqlite_master UNION ALL SELECT * FROM sqlite_temp_master) WHERE type = "table" AND name = ?', | ||
| array(str_replace('.', '__', $table)) | ||
| ); |
There was a problem hiding this comment.
@hason this change is not part of your PR, is it? Can we try to not mix different things here?
|
@deeky666 This is necessary for correct handling custom types in ORM |
Added support for inline comments for SQLite fixes #1118
Ocramius
changed the title
No description provided.