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

bugfix: when tableName is keyword, the insert operation will get afterImage fail #2053

Merged
merged 9 commits into from
Dec 18, 2019
Merged

bugfix: when tableName is keyword, the insert operation will get afterImage fail #2053

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
871369e
bugfix: if add configListener but dataId not exist, it will throw NPE
slievrly Dec 17, 2019
fc60b84
fix review
slievrly Dec 17, 2019
66c4388
bugfix: when tableName is keyword, the insert operation will get afte…
slievrly Dec 17, 2019
2808c39
bugfix: when tableName is keyword, the insert operation will get afte…
slievrly Dec 17, 2019
240052f
bugfix: when tableName is keyword, the insert operation will get afte…
slievrly Dec 17, 2019
380e9d3
bugfix: when tableName is keyword, the insert operation will get afte…
slievrly Dec 17, 2019
36593ad
Merge branch 'develop' into tableKeyWord
lovepoem Dec 18, 2019
f4f307a
Merge branch 'develop' into tableKeyWord
lovepoem Dec 18, 2019
2881304
Merge branch 'develop' into tableKeyWord
lovepoem Dec 18, 2019
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
1 change: 0 additions & 1 deletion config/seata-config-core/src/main/java/io/seata/config/ConfigurationChangeEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package io.seata.config;

/**
Expand Down
1 change: 0 additions & 1 deletion config/seata-config-core/src/main/java/io/seata/config/ConfigurationChangeListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package io.seata.config;

import java.util.concurrent.ExecutorService;
Expand Down
1 change: 0 additions & 1 deletion config/seata-config-core/src/main/java/io/seata/config/ConfigurationChangeType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package io.seata.config;

/**
Expand Down
1 change: 0 additions & 1 deletion config/seata-config-core/src/test/java/io.seata.config/FileConfigurationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package io.seata.config;

import java.util.concurrent.CountDownLatch;
Expand Down
19 changes: 10 additions & 9 deletions rm-datasource/src/main/java/io/seata/rm/datasource/exec/BaseTransactionalExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,14 @@
*/
package io.seata.rm.datasource.exec;

import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
import java.util.ArrayList;
import java.util.List;
import java.util.StringJoiner;

import io.seata.common.util.CollectionUtils;
import io.seata.common.util.StringUtils;
import io.seata.core.context.RootContext;
Expand All @@ -31,14 +39,6 @@
import io.seata.rm.datasource.sql.struct.TableRecords;
import io.seata.rm.datasource.undo.SQLUndoLog;

import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
import java.util.ArrayList;
import java.util.List;
import java.util.StringJoiner;

/**
* The type Base transactional executor.
*
Expand Down Expand Up @@ -346,7 +346,8 @@ protected TableRecords buildTableRecords(TableMeta tableMeta, String selectSQL,
protected TableRecords buildTableRecords(List<Object> pkValues) throws SQLException {
TableRecords afterImage;
String pk = getTableMeta().getPkName();
StringJoiner pkValuesJoiner = new StringJoiner(" , ", "SELECT * FROM " + getTableMeta().getTableName() + " WHERE " + pk + " in (", ")");
StringJoiner pkValuesJoiner = new StringJoiner(" , ",
"SELECT * FROM " + getFromTableInSQL() + " WHERE " + pk + " in (", ")");
for (Object pkValue : pkValues) {
pkValuesJoiner.add("?");
}
Expand Down