diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2017-05-25 10:14:30 +0200 |
|---|---|---|
| committer | Julien Nabet <serval2412@yahoo.fr> | 2017-05-30 09:04:42 +0200 |
| commit | c5ea8e46626affeee5465330554e4864947b163b (patch) | |
| tree | d825b9df1fdf700f493fade4f86a3dcc95ae7c28 /connectivity | |
| parent | breeze add trackchangesbar (diff) | |
| download | core-c5ea8e46626affeee5465330554e4864947b163b.tar.gz core-c5ea8e46626affeee5465330554e4864947b163b.zip | |
Related tdf#108068: Use new name of column when it's been changed
First fix simple case, the rename of a column which is not a primary key
Change-Id: Ia0de8e531021cbec0409408008c541c25a4bcd85
Reviewed-on: https://gerrit.libreoffice.org/38014
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit c751318868f3f0082b2c86df493216d452b8ecc5)
Reviewed-on: https://gerrit.libreoffice.org/38022
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
Tested-by: Julien Nabet <serval2412@yahoo.fr>
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/source/drivers/firebird/Table.cxx | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/connectivity/source/drivers/firebird/Table.cxx b/connectivity/source/drivers/firebird/Table.cxx index 7f71d1ebfbac..eefcc9698e99 100644 --- a/connectivity/source/drivers/firebird/Table.cxx +++ b/connectivity/source/drivers/firebird/Table.cxx @@ -132,17 +132,6 @@ void SAL_CALL Table::alterColumnByName(const OUString& rColName, bool bDefaultChanged = xColumn->getPropertyValue("DefaultValue") != rDescriptor->getPropertyValue("DefaultValue"); - // TODO: quote identifiers as needed. - if (bNameChanged) - { - OUString sNewTableName; - rDescriptor->getPropertyValue("Name") >>= sNewTableName; - OUString sSql(getAlterTableColumn(rColName) - + " TO \"" + sNewTableName + "\""); - - getConnection()->createStatement()->execute(sSql); - } - if (bTypeChanged || bTypeNameChanged || bPrecisionChanged || bScaleChanged) { // If bPrecisionChanged this will only succeed if we have increased the @@ -216,6 +205,17 @@ void SAL_CALL Table::alterColumnByName(const OUString& rColName, getConnection()->createStatement()->execute(sSql); } + // TODO: quote identifiers as needed. + if (bNameChanged) + { + OUString sNewTableName; + rDescriptor->getPropertyValue("Name") >>= sNewTableName; + OUString sSql(getAlterTableColumn(rColName) + + " TO \"" + sNewTableName + "\""); + + getConnection()->createStatement()->execute(sSql); + } + m_pColumns->refresh(); } |