You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by du...@apache.org on 2022/01/03 13:27:15 UTC
[shardingsphere] branch master updated: Unify userName to username (#14488)
This is an automated email from the ASF dual-hosted git repository.
duanzhengqiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new e527d4a Unify userName to username (#14488)
e527d4a is described below
commit e527d4abe972fd66b9d3df9f3e4f8441c8745b13
Author: Liang Zhang <te...@163.com>
AuthorDate: Mon Jan 3 21:26:21 2022 +0800
Unify userName to username (#14488)
---
.../shardingsphere-jdbc/spring-boot-starter.en.md | 4 +--
.../shardingsphere-jdbc/java-api/rules/mix.cn.md | 2 +-
.../shardingsphere-jdbc/java-api/rules/mix.en.md | 2 +-
.../spring-boot-starter/rules/mix.cn.md | 4 +--
.../spring-boot-starter/rules/mix.en.md | 4 +--
.../spring-namespace/rules/mix.cn.md | 2 +-
.../spring-namespace/rules/mix.en.md | 2 +-
.../shardingsphere-proxy/startup/docker.cn.md | 2 +-
.../shardingsphere-proxy/startup/docker.en.md | 2 +-
.../example/core/api/entity/ShadowUser.java | 22 +++++++-------
.../example/core/api/entity/User.java | 12 ++++----
.../jdbc/repository/ShadowUserRepositoryImpl.java | 8 ++---
.../core/jdbc/repository/UserRepositoryImpl.java | 8 ++---
.../core/jdbc/service/ShadowUserServiceImpl.java | 2 +-
.../example/core/jdbc/service/UserServiceImpl.java | 2 +-
.../example/core/jpa/entity/ShadowUserEntity.java | 6 ++--
.../example/core/jpa/entity/UserEntity.java | 6 ++--
.../core/jpa/service/ShadowUserServiceImpl.java | 2 +-
.../example/core/jpa/service/UserServiceImpl.java | 2 +-
.../mybatis/service/ShadowUserServiceImpl.java | 2 +-
.../core/mybatis/service/UserServiceImpl.java | 2 +-
.../META-INF/mappers/ShadowUserMapper.xml | 8 ++---
.../main/resources/META-INF/mappers/UserMapper.xml | 18 +++++------
.../zookeeper/local/application-encrypt.xml | 2 +-
.../jdbc/config/EncryptDatabasesConfiguration.java | 2 +-
.../main/resources/META-INF/encrypt-databases.yaml | 6 ++--
.../application-encrypt-databases.properties | 4 +--
.../META-INF/application-encrypt-databases.xml | 2 +-
.../jdbc/config/ShadowEncryptConfiguration.java | 2 +-
.../main/resources/META-INF/shadow-encrypt.yaml | 6 ++--
.../application-shadow-encrypt.properties | 6 ++--
.../META-INF/application-shadow-encrypt.xml | 2 +-
.../src/main/resources/template/entity/User.ftl | 14 ++++-----
.../template/jdbc/shadowExampleService.ftl | 6 ++--
.../resources/template/jdbc/userExampleService.ftl | 6 ++--
.../resources/template/jpa/userExampleService.ftl | 2 +-
.../template/mybatis/mappers/UserMapper.ftl | 6 ++--
.../template/mybatis/mappers/shadowUserMapper.ftl | 8 ++---
.../main/resources/template/properties/encrypt.ftl | 4 +--
.../src/main/resources/template/xml/encrypt.ftl | 2 +-
.../jdbc/MemoryLocalEncryptJdbcExampleService.java | 22 +++++++-------
.../example/encrypt/jdbc/entity/User.java | 12 ++++----
...EncryptSpringBootStarterJdbcExampleService.java | 29 +++++++++---------
.../spring/boot/starter/jdbc/entity/User.java | 12 ++++----
.../src/main/resources/application.properties | 4 +--
...lEncryptSpringBootStarterJpaExampleService.java | 2 +-
.../spring/boot/starter/jpa/entity/User.java | 14 ++++-----
.../src/main/resources/application.properties | 4 +--
...ryptSpringBootStarterMybatisExampleService.java | 16 ++++------
.../spring/boot/starter/mybatis/entity/User.java | 12 ++++----
.../src/main/resources/application.properties | 4 +--
.../src/main/resources/mappers/UserMapper.xml | 6 ++--
...alEncryptSpringNamespaceJdbcExampleService.java | 35 +++++++++++-----------
.../encrypt/spring/namespace/jdbc/entity/User.java | 12 ++++----
.../src/main/resources/application.xml | 4 +--
...calEncryptSpringNamespaceJpaExampleService.java | 2 +-
.../encrypt/spring/namespace/jpa/entity/User.java | 14 ++++-----
.../src/main/resources/application.xml | 2 +-
...ncryptSpringNamespaceMybatisExampleService.java | 16 ++++------
.../spring/namespace/mybatis/entity/User.java | 12 ++++----
.../src/main/resources/application.xml | 7 ++---
.../src/main/resources/mappers/UserMapper.xml | 18 +++++------
.../jdbc/MemoryLocalShadowJdbcExampleService.java | 22 +++++++-------
.../example/shadow/jdbc/entity/User.java | 12 ++++----
...lShadowSpringBootStarterJdbcExampleService.java | 18 ++++++-----
.../spring/boot/starter/jdbc/entity/User.java | 18 +++++------
...adowSpringBootStarterMybatisExampleService.java | 15 ++++------
.../spring/boot/starter/mybatis/entity/User.java | 18 +++++------
.../src/main/resources/mappers/UserMapper.xml | 8 ++---
...calShadowSpringNamespaceJdbcExampleService.java | 24 ++++++++-------
.../shadow/spring/namespace/jdbc/entity/User.java | 12 ++++----
...ShadowSpringNamespaceMybatisExampleService.java | 7 +----
.../spring/namespace/mybatis/entity/User.java | 12 ++++----
.../src/main/resources/mappers/UserMapper.xml | 8 ++---
examples/src/resources/manual_schema.sql | 4 +--
.../src/main/antlr4/imports/mysql/BaseRule.g4 | 6 ++--
.../src/main/antlr4/imports/mysql/DALStatement.g4 | 4 +--
.../src/main/antlr4/imports/mysql/DCLStatement.g4 | 34 ++++++++++-----------
.../src/main/antlr4/imports/mysql/DDLStatement.g4 | 2 +-
.../impl/MySQLDALStatementSQLVisitor.java | 4 +--
.../impl/MySQLDCLStatementSQLVisitor.java | 24 +++++++--------
.../src/main/antlr4/imports/oracle/BaseRule.g4 | 2 +-
.../src/main/antlr4/imports/oracle/DDLStatement.g4 | 14 ++++-----
.../mysql/segment/CloneInstanceSegment.java | 18 +++++------
.../dataset.xml | 4 +--
.../init-sql/h2/init-encrypt_read_ds_1.sql | 6 ++--
.../init-sql/h2/init-encrypt_write_ds_1.sql | 6 ++--
.../init-sql/mysql/init.sql | 12 ++++----
.../init-sql/oracle/init.sql | 12 ++++----
.../init-sql/postgresql/init.sql | 12 ++++----
.../init-sql/sqlserver/init.sql | 12 ++++----
.../statement/dal/impl/CloneStatementAssert.java | 2 +-
.../src/main/resources/case/dcl/alter-user.xml | 4 +--
.../resources/sql/supported/dcl/alter-user.xml | 4 +--
94 files changed, 403 insertions(+), 420 deletions(-)
diff --git a/docs/document/content/reference/api-change-history/shardingsphere-jdbc/spring-boot-starter.en.md b/docs/document/content/reference/api-change-history/shardingsphere-jdbc/spring-boot-starter.en.md
index da81c89..3381c2c 100644
--- a/docs/document/content/reference/api-change-history/shardingsphere-jdbc/spring-boot-starter.en.md
+++ b/docs/document/content/reference/api-change-history/shardingsphere-jdbc/spring-boot-starter.en.md
@@ -167,8 +167,8 @@ spring.shardingsphere.rules.sharding.tables.t_user.table-strategy.standard.shard
# Data encrypt configuration
# Table `t_user` is the name of the logical table that uses for data sharding configuration.
-spring.shardingsphere.rules.encrypt.tables.t_user.columns.user_name.cipher-column=user_name
-spring.shardingsphere.rules.encrypt.tables.t_user.columns.user_name.encryptor-name=name-encryptor
+spring.shardingsphere.rules.encrypt.tables.t_user.columns.username.cipher-column=username
+spring.shardingsphere.rules.encrypt.tables.t_user.columns.username.encryptor-name=name-encryptor
spring.shardingsphere.rules.encrypt.tables.t_user.columns.pwd.cipher-column=pwd
spring.shardingsphere.rules.encrypt.tables.t_user.columns.pwd.encryptor-name=pwd-encryptor
diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/java-api/rules/mix.cn.md b/docs/document/content/user-manual/shardingsphere-jdbc/java-api/rules/mix.cn.md
index 61f591a..74a1c0e 100644
--- a/docs/document/content/user-manual/shardingsphere-jdbc/java-api/rules/mix.cn.md
+++ b/docs/document/content/user-manual/shardingsphere-jdbc/java-api/rules/mix.cn.md
@@ -77,7 +77,7 @@ shardingRuleConfiguration.getKeyGenerators().put("snowflake", new ShardingSphere
/* 数据加密规则配置 */
Properties encryptProperties = new Properties();
encryptProperties.setProperty("aes-key-value", "123456");
-EncryptColumnRuleConfiguration columnConfigAes = new EncryptColumnRuleConfiguration("user_name", "user_name", "", "user_name_plain", "name_encryptor");
+EncryptColumnRuleConfiguration columnConfigAes = new EncryptColumnRuleConfiguration("username", "username", "", "username_plain", "name_encryptor");
EncryptColumnRuleConfiguration columnConfigTest = new EncryptColumnRuleConfiguration("pwd", "pwd", "assisted_query_pwd", "", "pwd_encryptor");
EncryptTableRuleConfiguration encryptTableRuleConfig = new EncryptTableRuleConfiguration("t_user", Arrays.asList(columnConfigAes, columnConfigTest));
diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/java-api/rules/mix.en.md b/docs/document/content/user-manual/shardingsphere-jdbc/java-api/rules/mix.en.md
index 5183627..6f05363 100644
--- a/docs/document/content/user-manual/shardingsphere-jdbc/java-api/rules/mix.en.md
+++ b/docs/document/content/user-manual/shardingsphere-jdbc/java-api/rules/mix.en.md
@@ -73,7 +73,7 @@ shardingRuleConfiguration.getKeyGenerators().put("snowflake", new ShardingSphere
/* Data encrypt rule configuration */
Properties encryptProperties = new Properties();
encryptProperties.setProperty("aes-key-value", "123456");
-EncryptColumnRuleConfiguration columnConfigAes = new EncryptColumnRuleConfiguration("user_name", "user_name", "", "user_name_plain", "name_encryptor");
+EncryptColumnRuleConfiguration columnConfigAes = new EncryptColumnRuleConfiguration("username", "username", "", "username_plain", "name_encryptor");
EncryptColumnRuleConfiguration columnConfigTest = new EncryptColumnRuleConfiguration("pwd", "pwd", "assisted_query_pwd", "", "pwd_encryptor");
EncryptTableRuleConfiguration encryptTableRuleConfig = new EncryptTableRuleConfiguration("t_user", Arrays.asList(columnConfigAes, columnConfigTest));
// Data encrypt algorithm configuration
diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/spring-boot-starter/rules/mix.cn.md b/docs/document/content/user-manual/shardingsphere-jdbc/spring-boot-starter/rules/mix.cn.md
index 93eb980..076da5c 100644
--- a/docs/document/content/user-manual/shardingsphere-jdbc/spring-boot-starter/rules/mix.cn.md
+++ b/docs/document/content/user-manual/shardingsphere-jdbc/spring-boot-starter/rules/mix.cn.md
@@ -53,8 +53,8 @@ spring.shardingsphere.rules.sharding.tables.t_user_detail.table-strategy.standar
# 数据加密配置
# `t_user` 使用分片规则配置的逻辑表名称
-spring.shardingsphere.rules.encrypt.tables.t_user.columns.user_name.cipher-column=user_name
-spring.shardingsphere.rules.encrypt.tables.t_user.columns.user_name.encryptor-name=name-encryptor
+spring.shardingsphere.rules.encrypt.tables.t_user.columns.username.cipher-column=username
+spring.shardingsphere.rules.encrypt.tables.t_user.columns.username.encryptor-name=name-encryptor
spring.shardingsphere.rules.encrypt.tables.t_user.columns.pwd.cipher-column=pwd
spring.shardingsphere.rules.encrypt.tables.t_user.columns.pwd.encryptor-name=pwd-encryptor
diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/spring-boot-starter/rules/mix.en.md b/docs/document/content/user-manual/shardingsphere-jdbc/spring-boot-starter/rules/mix.en.md
index 8d92ce7..097eafb 100644
--- a/docs/document/content/user-manual/shardingsphere-jdbc/spring-boot-starter/rules/mix.en.md
+++ b/docs/document/content/user-manual/shardingsphere-jdbc/spring-boot-starter/rules/mix.en.md
@@ -43,8 +43,8 @@ spring.shardingsphere.rules.sharding.tables.t_user.table-strategy.standard.shard
# Data encrypt configuration
# Table `t_user` is the name of the logical table that uses for data sharding configuration.
-spring.shardingsphere.rules.encrypt.tables.t_user.columns.user_name.cipher-column=user_name
-spring.shardingsphere.rules.encrypt.tables.t_user.columns.user_name.encryptor-name=name-encryptor
+spring.shardingsphere.rules.encrypt.tables.t_user.columns.username.cipher-column=username
+spring.shardingsphere.rules.encrypt.tables.t_user.columns.username.encryptor-name=name-encryptor
spring.shardingsphere.rules.encrypt.tables.t_user.columns.pwd.cipher-column=pwd
spring.shardingsphere.rules.encrypt.tables.t_user.columns.pwd.encryptor-name=pwd-encryptor
diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/spring-namespace/rules/mix.cn.md b/docs/document/content/user-manual/shardingsphere-jdbc/spring-namespace/rules/mix.cn.md
index e3b6cfb..d8cb3e6 100644
--- a/docs/document/content/user-manual/shardingsphere-jdbc/spring-namespace/rules/mix.cn.md
+++ b/docs/document/content/user-manual/shardingsphere-jdbc/spring-namespace/rules/mix.cn.md
@@ -107,7 +107,7 @@ weight = 7
<encrypt:rule id="encryptRule">
<encrypt:table name="t_user">
- <encrypt:column logic-column="user_name" cipher-column="user_name" plain-column="user_name_plain" encrypt-algorithm-ref="name_encryptor" />
+ <encrypt:column logic-column="username" cipher-column="username" plain-column="username_plain" encrypt-algorithm-ref="name_encryptor" />
<encrypt:column logic-column="pwd" cipher-column="pwd" assisted-query-column="assisted_query_pwd" encrypt-algorithm-ref="pwd_encryptor" />
</encrypt:table>
</encrypt:rule>
diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/spring-namespace/rules/mix.en.md b/docs/document/content/user-manual/shardingsphere-jdbc/spring-namespace/rules/mix.en.md
index 07eee80..ba23760 100644
--- a/docs/document/content/user-manual/shardingsphere-jdbc/spring-namespace/rules/mix.en.md
+++ b/docs/document/content/user-manual/shardingsphere-jdbc/spring-namespace/rules/mix.en.md
@@ -102,7 +102,7 @@ weight = 7
<encrypt:rule id="encryptRule">
<encrypt:table name="t_user">
- <encrypt:column logic-column="user_name" cipher-column="user_name" plain-column="user_name_plain" encrypt-algorithm-ref="name_encryptor" />
+ <encrypt:column logic-column="username" cipher-column="username" plain-column="username_plain" encrypt-algorithm-ref="name_encryptor" />
<encrypt:column logic-column="pwd" cipher-column="pwd" assisted-query-column="assisted_query_pwd" encrypt-algorithm-ref="pwd_encryptor" />
</encrypt:table>
</encrypt:rule>
diff --git a/docs/document/content/user-manual/shardingsphere-proxy/startup/docker.cn.md b/docs/document/content/user-manual/shardingsphere-proxy/startup/docker.cn.md
index 3279746..6119ee3 100644
--- a/docs/document/content/user-manual/shardingsphere-proxy/startup/docker.cn.md
+++ b/docs/document/content/user-manual/shardingsphere-proxy/startup/docker.cn.md
@@ -56,7 +56,7 @@ docker run -d -v /${your_work_dir}/conf:/opt/shardingsphere-proxy/conf -v /${you
与连接 PostgreSQL 的方式相同。
```bash
-psql -U ${your_user_name} -h ${your_host} -p 13308
+psql -U ${your_username} -h ${your_host} -p 13308
```
## FAQ
diff --git a/docs/document/content/user-manual/shardingsphere-proxy/startup/docker.en.md b/docs/document/content/user-manual/shardingsphere-proxy/startup/docker.en.md
index 2c979c0..9ff5030 100644
--- a/docs/document/content/user-manual/shardingsphere-proxy/startup/docker.en.md
+++ b/docs/document/content/user-manual/shardingsphere-proxy/startup/docker.en.md
@@ -56,7 +56,7 @@ docker run -d -v /${your_work_dir}/conf:/opt/shardingsphere-proxy/conf -v /${you
It is in the same way as connecting to PostgreSQL.
```bash
-psql -U ${your_user_name} -h ${your_host} -p 13308
+psql -U ${your_username} -h ${your_host} -p 13308
```
## FAQ
diff --git a/examples/example-core/example-api/src/main/java/org/apache/shardingsphere/example/core/api/entity/ShadowUser.java b/examples/example-core/example-api/src/main/java/org/apache/shardingsphere/example/core/api/entity/ShadowUser.java
index 3c3dd74..9ef34bc 100644
--- a/examples/example-core/example-api/src/main/java/org/apache/shardingsphere/example/core/api/entity/ShadowUser.java
+++ b/examples/example-core/example-api/src/main/java/org/apache/shardingsphere/example/core/api/entity/ShadowUser.java
@@ -27,9 +27,9 @@ public class ShadowUser implements Serializable {
private int userType;
- private String userName;
+ private String username;
- private String userNamePlain;
+ private String usernamePlain;
private String pwd;
@@ -51,20 +51,20 @@ public class ShadowUser implements Serializable {
this.userType = userType;
}
- public String getUserName() {
- return userName;
+ public String getUsername() {
+ return username;
}
- public void setUserName(String userName) {
- this.userName = userName;
+ public void setUsername(String username) {
+ this.username = username;
}
- public String getUserNamePlain() {
- return userNamePlain;
+ public String getUsernamePlain() {
+ return usernamePlain;
}
- public void setUserNamePlain(String userNamePlain) {
- this.userNamePlain = userNamePlain;
+ public void setUsernamePlain(String usernamePlain) {
+ this.usernamePlain = usernamePlain;
}
public String getPwd() {
@@ -85,7 +85,7 @@ public class ShadowUser implements Serializable {
@Override
public String toString() {
- return String.format("user_id: %d, user_type: %d, user_name: %s, user_name_plain: %s, pwd: %s, assisted_query_pwd: %s", userId, userType, userName, userNamePlain, pwd,
+ return String.format("user_id: %d, user_type: %d, username: %s, username_plain: %s, pwd: %s, assisted_query_pwd: %s", userId, userType, username, usernamePlain, pwd,
assistedQueryPwd);
}
}
diff --git a/examples/example-core/example-api/src/main/java/org/apache/shardingsphere/example/core/api/entity/User.java b/examples/example-core/example-api/src/main/java/org/apache/shardingsphere/example/core/api/entity/User.java
index 20971f2..9ea69bc 100644
--- a/examples/example-core/example-api/src/main/java/org/apache/shardingsphere/example/core/api/entity/User.java
+++ b/examples/example-core/example-api/src/main/java/org/apache/shardingsphere/example/core/api/entity/User.java
@@ -25,7 +25,7 @@ public class User implements Serializable {
private int userId;
- private String userName;
+ private String username;
private String pwd;
@@ -37,12 +37,12 @@ public class User implements Serializable {
this.userId = userId;
}
- public String getUserName() {
- return userName;
+ public String getUsername() {
+ return username;
}
- public void setUserName(final String userName) {
- this.userName = userName;
+ public void setUsername(final String username) {
+ this.username = username;
}
public String getPwd() {
@@ -55,6 +55,6 @@ public class User implements Serializable {
@Override
public String toString() {
- return String.format("user_id: %d, user_name: %s, pwd: %s", userId, userName, pwd);
+ return String.format("user_id: %d, username: %s, pwd: %s", userId, username, pwd);
}
}
diff --git a/examples/example-core/example-raw-jdbc/src/main/java/org/apache/shardingsphere/example/core/jdbc/repository/ShadowUserRepositoryImpl.java b/examples/example-core/example-raw-jdbc/src/main/java/org/apache/shardingsphere/example/core/jdbc/repository/ShadowUserRepositoryImpl.java
index 248dc46..996b03b 100644
--- a/examples/example-core/example-raw-jdbc/src/main/java/org/apache/shardingsphere/example/core/jdbc/repository/ShadowUserRepositoryImpl.java
+++ b/examples/example-core/example-raw-jdbc/src/main/java/org/apache/shardingsphere/example/core/jdbc/repository/ShadowUserRepositoryImpl.java
@@ -41,7 +41,7 @@ public final class ShadowUserRepositoryImpl implements ShadowUserRepository {
@Override
public void createTableIfNotExists() throws SQLException {
- String sql = "CREATE TABLE IF NOT EXISTS t_user (user_id INT NOT NULL AUTO_INCREMENT, user_type INT(11), user_name VARCHAR(200), pwd VARCHAR(200), PRIMARY KEY (user_id))";
+ String sql = "CREATE TABLE IF NOT EXISTS t_user (user_id INT NOT NULL AUTO_INCREMENT, user_type INT(11), username VARCHAR(200), pwd VARCHAR(200), PRIMARY KEY (user_id))";
createTableIfNotExistsShadow(sql);
createTableIfNotExistsNative(sql);
}
@@ -104,12 +104,12 @@ public final class ShadowUserRepositoryImpl implements ShadowUserRepository {
@Override
public Long insert(final ShadowUser entity) throws SQLException {
- String sql = "INSERT INTO t_user (user_id, user_type, user_name, pwd) VALUES (?, ?, ?, ?)";
+ String sql = "INSERT INTO t_user (user_id, user_type, username, pwd) VALUES (?, ?, ?, ?)";
try (Connection connection = dataSource.getConnection();
PreparedStatement preparedStatement = connection.prepareStatement(sql)) {
preparedStatement.setInt(1, entity.getUserId());
preparedStatement.setInt(2, entity.getUserType());
- preparedStatement.setString(3, entity.getUserName());
+ preparedStatement.setString(3, entity.getUsername());
preparedStatement.setString(4, entity.getPwd());
preparedStatement.executeUpdate();
}
@@ -150,7 +150,7 @@ public final class ShadowUserRepositoryImpl implements ShadowUserRepository {
ShadowUser user = new ShadowUser();
user.setUserId(resultSet.getInt("user_id"));
user.setUserType(resultSet.getInt("user_type"));
- user.setUserName(resultSet.getString("user_name"));
+ user.setUsername(resultSet.getString("username"));
user.setPwd(resultSet.getString("pwd"));
result.add(user);
}
diff --git a/examples/example-core/example-raw-jdbc/src/main/java/org/apache/shardingsphere/example/core/jdbc/repository/UserRepositoryImpl.java b/examples/example-core/example-raw-jdbc/src/main/java/org/apache/shardingsphere/example/core/jdbc/repository/UserRepositoryImpl.java
index 4af2852..52d6eb3 100644
--- a/examples/example-core/example-raw-jdbc/src/main/java/org/apache/shardingsphere/example/core/jdbc/repository/UserRepositoryImpl.java
+++ b/examples/example-core/example-raw-jdbc/src/main/java/org/apache/shardingsphere/example/core/jdbc/repository/UserRepositoryImpl.java
@@ -40,7 +40,7 @@ public final class UserRepositoryImpl implements UserRepository {
@Override
public void createTableIfNotExists() throws SQLException {
String sql = "CREATE TABLE IF NOT EXISTS t_user "
- + "(user_id INT NOT NULL AUTO_INCREMENT, user_name VARCHAR(200), pwd VARCHAR(200), PRIMARY KEY (user_id))";
+ + "(user_id INT NOT NULL AUTO_INCREMENT, username VARCHAR(200), pwd VARCHAR(200), PRIMARY KEY (user_id))";
try (Connection connection = dataSource.getConnection();
Statement statement = connection.createStatement()) {
statement.executeUpdate(sql);
@@ -67,11 +67,11 @@ public final class UserRepositoryImpl implements UserRepository {
@Override
public Long insert(final User entity) throws SQLException {
- String sql = "INSERT INTO t_user (user_id, user_name, pwd) VALUES (?, ?, ?)";
+ String sql = "INSERT INTO t_user (user_id, username, pwd) VALUES (?, ?, ?)";
try (Connection connection = dataSource.getConnection();
PreparedStatement preparedStatement = connection.prepareStatement(sql)) {
preparedStatement.setInt(1, entity.getUserId());
- preparedStatement.setString(2, entity.getUserName());
+ preparedStatement.setString(2, entity.getUsername());
preparedStatement.setString(3, entity.getPwd());
preparedStatement.executeUpdate();
}
@@ -102,7 +102,7 @@ public final class UserRepositoryImpl implements UserRepository {
while (resultSet.next()) {
User user = new User();
user.setUserId(resultSet.getInt("user_id"));
- user.setUserName(resultSet.getString("user_name"));
+ user.setUsername(resultSet.getString("username"));
user.setPwd(resultSet.getString("pwd"));
result.add(user);
}
diff --git a/examples/example-core/example-raw-jdbc/src/main/java/org/apache/shardingsphere/example/core/jdbc/service/ShadowUserServiceImpl.java b/examples/example-core/example-raw-jdbc/src/main/java/org/apache/shardingsphere/example/core/jdbc/service/ShadowUserServiceImpl.java
index 91a1256..b1059dd 100644
--- a/examples/example-core/example-raw-jdbc/src/main/java/org/apache/shardingsphere/example/core/jdbc/service/ShadowUserServiceImpl.java
+++ b/examples/example-core/example-raw-jdbc/src/main/java/org/apache/shardingsphere/example/core/jdbc/service/ShadowUserServiceImpl.java
@@ -69,7 +69,7 @@ public final class ShadowUserServiceImpl implements ExampleService {
ShadowUser user = new ShadowUser();
user.setUserId(i);
user.setUserType(i % 2);
- user.setUserName("test_" + i);
+ user.setUsername("test_" + i);
user.setPwd("pwd" + i);
userRepository.insert(user);
result.add((long) user.getUserId());
diff --git a/examples/example-core/example-raw-jdbc/src/main/java/org/apache/shardingsphere/example/core/jdbc/service/UserServiceImpl.java b/examples/example-core/example-raw-jdbc/src/main/java/org/apache/shardingsphere/example/core/jdbc/service/UserServiceImpl.java
index c62157b..beb4855 100644
--- a/examples/example-core/example-raw-jdbc/src/main/java/org/apache/shardingsphere/example/core/jdbc/service/UserServiceImpl.java
+++ b/examples/example-core/example-raw-jdbc/src/main/java/org/apache/shardingsphere/example/core/jdbc/service/UserServiceImpl.java
@@ -68,7 +68,7 @@ public final class UserServiceImpl implements ExampleService {
for (int i = 1; i <= 10; i++) {
User user = new User();
user.setUserId(i);
- user.setUserName("test_" + i);
+ user.setUsername("test_" + i);
user.setPwd("pwd" + i);
userRepository.insert(user);
result.add((long) user.getUserId());
diff --git a/examples/example-core/example-spring-jpa/src/main/java/org/apache/shardingsphere/example/core/jpa/entity/ShadowUserEntity.java b/examples/example-core/example-spring-jpa/src/main/java/org/apache/shardingsphere/example/core/jpa/entity/ShadowUserEntity.java
index daaa9ba..412db3f 100644
--- a/examples/example-core/example-spring-jpa/src/main/java/org/apache/shardingsphere/example/core/jpa/entity/ShadowUserEntity.java
+++ b/examples/example-core/example-spring-jpa/src/main/java/org/apache/shardingsphere/example/core/jpa/entity/ShadowUserEntity.java
@@ -43,10 +43,10 @@ public final class ShadowUserEntity extends ShadowUser {
return super.getUserType();
}
- @Column(name = "user_name")
+ @Column(name = "username")
@Override
- public String getUserName() {
- return super.getUserName();
+ public String getUsername() {
+ return super.getUsername();
}
@Column(name = "pwd")
diff --git a/examples/example-core/example-spring-jpa/src/main/java/org/apache/shardingsphere/example/core/jpa/entity/UserEntity.java b/examples/example-core/example-spring-jpa/src/main/java/org/apache/shardingsphere/example/core/jpa/entity/UserEntity.java
index cba86fa..66cc70b 100644
--- a/examples/example-core/example-spring-jpa/src/main/java/org/apache/shardingsphere/example/core/jpa/entity/UserEntity.java
+++ b/examples/example-core/example-spring-jpa/src/main/java/org/apache/shardingsphere/example/core/jpa/entity/UserEntity.java
@@ -37,10 +37,10 @@ public final class UserEntity extends User {
return super.getUserId();
}
- @Column(name = "user_name")
+ @Column(name = "username")
@Override
- public String getUserName() {
- return super.getUserName();
+ public String getUsername() {
+ return super.getUsername();
}
@Column(name = "pwd")
diff --git a/examples/example-core/example-spring-jpa/src/main/java/org/apache/shardingsphere/example/core/jpa/service/ShadowUserServiceImpl.java b/examples/example-core/example-spring-jpa/src/main/java/org/apache/shardingsphere/example/core/jpa/service/ShadowUserServiceImpl.java
index b67203b..28f87a4 100644
--- a/examples/example-core/example-spring-jpa/src/main/java/org/apache/shardingsphere/example/core/jpa/service/ShadowUserServiceImpl.java
+++ b/examples/example-core/example-spring-jpa/src/main/java/org/apache/shardingsphere/example/core/jpa/service/ShadowUserServiceImpl.java
@@ -69,7 +69,7 @@ public class ShadowUserServiceImpl implements ExampleService {
ShadowUserEntity user = new ShadowUserEntity();
user.setUserId(i);
user.setUserType(i % 2);
- user.setUserName("test_jpa_" + i);
+ user.setUsername("test_jpa_" + i);
user.setPwd("pwd_jpa_" + i);
userRepository.insert(user);
result.add((long) user.getUserId());
diff --git a/examples/example-core/example-spring-jpa/src/main/java/org/apache/shardingsphere/example/core/jpa/service/UserServiceImpl.java b/examples/example-core/example-spring-jpa/src/main/java/org/apache/shardingsphere/example/core/jpa/service/UserServiceImpl.java
index a6b7bc6..29e7c70 100644
--- a/examples/example-core/example-spring-jpa/src/main/java/org/apache/shardingsphere/example/core/jpa/service/UserServiceImpl.java
+++ b/examples/example-core/example-spring-jpa/src/main/java/org/apache/shardingsphere/example/core/jpa/service/UserServiceImpl.java
@@ -68,7 +68,7 @@ public class UserServiceImpl implements ExampleService {
for (int i = 1; i <= 10; i++) {
UserEntity user = new UserEntity();
user.setUserId(i);
- user.setUserName("test_jpa_" + i);
+ user.setUsername("test_jpa_" + i);
user.setPwd("pwd_jpa_" + i);
userRepository.insert(user);
result.add((long) user.getUserId());
diff --git a/examples/example-core/example-spring-mybatis/src/main/java/org/apache/shardingsphere/example/core/mybatis/service/ShadowUserServiceImpl.java b/examples/example-core/example-spring-mybatis/src/main/java/org/apache/shardingsphere/example/core/mybatis/service/ShadowUserServiceImpl.java
index aa95126..fe6833c 100644
--- a/examples/example-core/example-spring-mybatis/src/main/java/org/apache/shardingsphere/example/core/mybatis/service/ShadowUserServiceImpl.java
+++ b/examples/example-core/example-spring-mybatis/src/main/java/org/apache/shardingsphere/example/core/mybatis/service/ShadowUserServiceImpl.java
@@ -61,7 +61,7 @@ public class ShadowUserServiceImpl implements ExampleService {
ShadowUser user = new ShadowUser();
user.setUserId(i);
user.setUserType(i % 2);
- user.setUserName("test_mybatis_" + i);
+ user.setUsername("test_mybatis_" + i);
user.setPwd("pwd_mybatis_" + i);
userRepository.insert(user);
result.add((long) user.getUserId());
diff --git a/examples/example-core/example-spring-mybatis/src/main/java/org/apache/shardingsphere/example/core/mybatis/service/UserServiceImpl.java b/examples/example-core/example-spring-mybatis/src/main/java/org/apache/shardingsphere/example/core/mybatis/service/UserServiceImpl.java
index 9816e73..2cf7ebd 100644
--- a/examples/example-core/example-spring-mybatis/src/main/java/org/apache/shardingsphere/example/core/mybatis/service/UserServiceImpl.java
+++ b/examples/example-core/example-spring-mybatis/src/main/java/org/apache/shardingsphere/example/core/mybatis/service/UserServiceImpl.java
@@ -60,7 +60,7 @@ public class UserServiceImpl implements ExampleService {
for (int i = 1; i <= 10; i++) {
User user = new User();
user.setUserId(i);
- user.setUserName("test_mybatis_" + i);
+ user.setUsername("test_mybatis_" + i);
user.setPwd("pwd_mybatis_" + i);
userRepository.insert(user);
result.add((long) user.getUserId());
diff --git a/examples/example-core/example-spring-mybatis/src/main/resources/META-INF/mappers/ShadowUserMapper.xml b/examples/example-core/example-spring-mybatis/src/main/resources/META-INF/mappers/ShadowUserMapper.xml
index 2850a54..91be367 100644
--- a/examples/example-core/example-spring-mybatis/src/main/resources/META-INF/mappers/ShadowUserMapper.xml
+++ b/examples/example-core/example-spring-mybatis/src/main/resources/META-INF/mappers/ShadowUserMapper.xml
@@ -21,17 +21,17 @@
<resultMap id="baseResultMap" type="org.apache.shardingsphere.example.core.api.entity.ShadowUser">
<result column="user_id" property="userId" jdbcType="INTEGER"/>
<result column="user_type" property="userType" jdbcType="INTEGER"/>
- <result column="user_name" property="userName" jdbcType="VARCHAR"/>
+ <result column="username" property="username" jdbcType="VARCHAR"/>
<result column="pwd" property="pwd" jdbcType="VARCHAR"/>
<result column="assisted_query_pwd" property="assistedQueryPwd" jdbcType="VARCHAR"/>
</resultMap>
<update id="createTableIfNotExistsNative">
- CREATE TABLE IF NOT EXISTS t_user (user_id INT NOT NULL AUTO_INCREMENT, user_type INT(11), user_name VARCHAR(200), pwd VARCHAR(200), PRIMARY KEY (user_id));
+ CREATE TABLE IF NOT EXISTS t_user (user_id INT NOT NULL AUTO_INCREMENT, user_type INT(11), username VARCHAR(200), pwd VARCHAR(200), PRIMARY KEY (user_id));
</update>
<update id="createTableIfNotExistsShadow">
- CREATE TABLE IF NOT EXISTS t_user (user_id INT NOT NULL AUTO_INCREMENT, user_type INT(11), user_name VARCHAR(200), pwd VARCHAR(200), PRIMARY KEY (user_id)) /*shadow:true,foo:bar*/;
+ CREATE TABLE IF NOT EXISTS t_user (user_id INT NOT NULL AUTO_INCREMENT, user_type INT(11), username VARCHAR(200), pwd VARCHAR(200), PRIMARY KEY (user_id)) /*shadow:true,foo:bar*/;
</update>
<update id="truncateTableNative">
@@ -51,7 +51,7 @@
</update>
<insert id="insert">
- INSERT INTO t_user (user_id, user_type, user_name, pwd) VALUES (#{userId,jdbcType=INTEGER}, #{userType,jdbcType=INTEGER}, #{userName,jdbcType=VARCHAR}, #{pwd,jdbcType=VARCHAR});
+ INSERT INTO t_user (user_id, user_type, username, pwd) VALUES (#{userId,jdbcType=INTEGER}, #{userType,jdbcType=INTEGER}, #{username,jdbcType=VARCHAR}, #{pwd,jdbcType=VARCHAR});
</insert>
<delete id="deleteOne">
diff --git a/examples/example-core/example-spring-mybatis/src/main/resources/META-INF/mappers/UserMapper.xml b/examples/example-core/example-spring-mybatis/src/main/resources/META-INF/mappers/UserMapper.xml
index 28359ca..c115f3c 100644
--- a/examples/example-core/example-spring-mybatis/src/main/resources/META-INF/mappers/UserMapper.xml
+++ b/examples/example-core/example-spring-mybatis/src/main/resources/META-INF/mappers/UserMapper.xml
@@ -20,31 +20,31 @@
<mapper namespace="org.apache.shardingsphere.example.core.mybatis.repository.MybatisUserRepository">
<resultMap id="baseResultMap" type="org.apache.shardingsphere.example.core.api.entity.User">
<result column="user_id" property="userId" jdbcType="INTEGER"/>
- <result column="user_name" property="userName" jdbcType="VARCHAR"/>
+ <result column="username" property="username" jdbcType="VARCHAR"/>
<result column="pwd" property="pwd" jdbcType="VARCHAR"/>
<result column="assisted_query_pwd" property="assistedQueryPwd" jdbcType="VARCHAR"/>
</resultMap>
-
+
<update id="createTableIfNotExists">
- CREATE TABLE IF NOT EXISTS t_user (user_id INT NOT NULL AUTO_INCREMENT, user_name VARCHAR(200), pwd VARCHAR(200), PRIMARY KEY (user_id));
+ CREATE TABLE IF NOT EXISTS t_user (user_id INT NOT NULL AUTO_INCREMENT, username VARCHAR(200), pwd VARCHAR(200), PRIMARY KEY (user_id));
</update>
-
+
<update id="truncateTable">
TRUNCATE TABLE t_user;
</update>
-
+
<update id="dropTable">
DROP TABLE IF EXISTS t_user;
</update>
-
+
<insert id="insert">
- INSERT INTO t_user (user_id, user_name, pwd) VALUES (#{userId,jdbcType=INTEGER}, #{userName,jdbcType=VARCHAR}, #{pwd,jdbcType=VARCHAR})
+ INSERT INTO t_user (user_id, username, pwd) VALUES (#{userId,jdbcType=INTEGER}, #{username,jdbcType=VARCHAR}, #{pwd,jdbcType=VARCHAR})
</insert>
-
+
<delete id="delete">
DELETE FROM t_user WHERE user_id = #{userId,jdbcType=INTEGER};
</delete>
-
+
<select id="selectAll" resultMap="baseResultMap">
SELECT * FROM t_user;
</select>
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-spring-namespace-mybatis-example/src/main/resources/META-INF/zookeeper/local/application-encrypt.xml b/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-spring-namespace-mybatis-example/src/main/resources/META-INF/zookeeper/local/application-encrypt.xml
index 2972775..97035cb 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-spring-namespace-mybatis-example/src/main/resources/META-INF/zookeeper/local/application-encrypt.xml
+++ b/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-spring-namespace-mybatis-example/src/main/resources/META-INF/zookeeper/local/application-encrypt.xml
@@ -50,7 +50,7 @@
<encrypt:rule id="encryptRule">
<encrypt:table name="t_user">
- <encrypt:column logic-column="user_name" cipher-column="user_name" encrypt-algorithm-ref="name_encryptor" />
+ <encrypt:column logic-column="username" cipher-column="username" encrypt-algorithm-ref="name_encryptor" />
<encrypt:column logic-column="pwd" cipher-column="pwd" assisted-query-column="assisted_query_pwd" encrypt-algorithm-ref="pwd_encryptor" />
</encrypt:table>
</encrypt:rule>
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/encrypt-example/encrypt-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/encrypt/raw/jdbc/config/EncryptDatabasesConfiguration.java b/examples/shardingsphere-jdbc-example/single-feature-example/encrypt-example/encrypt-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/encrypt/raw/jdbc/config/EncryptDatabasesConfiguration.java
index 0359a93..eda528f 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/encrypt-example/encrypt-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/encrypt/raw/jdbc/config/EncryptDatabasesConfiguration.java
+++ b/examples/shardingsphere-jdbc-example/single-feature-example/encrypt-example/encrypt-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/encrypt/raw/jdbc/config/EncryptDatabasesConfiguration.java
@@ -39,7 +39,7 @@ public final class EncryptDatabasesConfiguration implements ExampleConfiguration
public DataSource getDataSource() {
Properties props = new Properties();
props.setProperty("aes-key-value", "123456");
- EncryptColumnRuleConfiguration columnConfigAes = new EncryptColumnRuleConfiguration("user_name", "user_name", "", "user_name_plain", "name_encryptor");
+ EncryptColumnRuleConfiguration columnConfigAes = new EncryptColumnRuleConfiguration("username", "username", "", "username_plain", "name_encryptor");
EncryptColumnRuleConfiguration columnConfigTest = new EncryptColumnRuleConfiguration("pwd", "pwd", "assisted_query_pwd", "", "pwd_encryptor");
EncryptTableRuleConfiguration encryptTableRuleConfig = new EncryptTableRuleConfiguration("t_user", Arrays.asList(columnConfigAes, columnConfigTest), null);
Map<String, ShardingSphereAlgorithmConfiguration> encryptAlgorithmConfigs = new LinkedHashMap<>(2, 1);
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/encrypt-example/encrypt-raw-jdbc-example/src/main/resources/META-INF/encrypt-databases.yaml b/examples/shardingsphere-jdbc-example/single-feature-example/encrypt-example/encrypt-raw-jdbc-example/src/main/resources/META-INF/encrypt-databases.yaml
index 422c2f6..e306985 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/encrypt-example/encrypt-raw-jdbc-example/src/main/resources/META-INF/encrypt-databases.yaml
+++ b/examples/shardingsphere-jdbc-example/single-feature-example/encrypt-example/encrypt-raw-jdbc-example/src/main/resources/META-INF/encrypt-databases.yaml
@@ -28,9 +28,9 @@ rules:
tables:
t_user:
columns:
- user_name:
- plainColumn: user_name_plain
- cipherColumn: user_name
+ username:
+ plainColumn: username_plain
+ cipherColumn: username
encryptorName: name-encryptor
pwd:
cipherColumn: pwd
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/encrypt-example/encrypt-spring-boot-mybatis-example/src/main/resources/application-encrypt-databases.properties b/examples/shardingsphere-jdbc-example/single-feature-example/encrypt-example/encrypt-spring-boot-mybatis-example/src/main/resources/application-encrypt-databases.properties
index 55df84e..778515e 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/encrypt-example/encrypt-spring-boot-mybatis-example/src/main/resources/application-encrypt-databases.properties
+++ b/examples/shardingsphere-jdbc-example/single-feature-example/encrypt-example/encrypt-spring-boot-mybatis-example/src/main/resources/application-encrypt-databases.properties
@@ -28,8 +28,8 @@ spring.shardingsphere.rules.encrypt.encryptors.name-encryptor.props.aes-key-valu
spring.shardingsphere.rules.encrypt.encryptors.pwd-encryptor.type=AES
spring.shardingsphere.rules.encrypt.encryptors.pwd-encryptor.props.aes-key-value=123456abc
-spring.shardingsphere.rules.encrypt.tables.t_user.columns.user_name.cipher-column=user_name
-spring.shardingsphere.rules.encrypt.tables.t_user.columns.user_name.encryptor-name=name-encryptor
+spring.shardingsphere.rules.encrypt.tables.t_user.columns.username.cipher-column=username
+spring.shardingsphere.rules.encrypt.tables.t_user.columns.username.encryptor-name=name-encryptor
spring.shardingsphere.rules.encrypt.tables.t_user.columns.pwd.cipher-column=pwd
spring.shardingsphere.rules.encrypt.tables.t_user.columns.pwd.encryptor-name=pwd-encryptor
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/encrypt-example/encrypt-spring-namespace-mybatis-example/src/main/resources/META-INF/application-encrypt-databases.xml b/examples/shardingsphere-jdbc-example/single-feature-example/encrypt-example/encrypt-spring-namespace-mybatis-example/src/main/resources/META-INF/application-encrypt-databases.xml
index 9dcce7d..ef653a3 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/encrypt-example/encrypt-spring-namespace-mybatis-example/src/main/resources/META-INF/application-encrypt-databases.xml
+++ b/examples/shardingsphere-jdbc-example/single-feature-example/encrypt-example/encrypt-spring-namespace-mybatis-example/src/main/resources/META-INF/application-encrypt-databases.xml
@@ -51,7 +51,7 @@
<encrypt:rule id="encryptRule">
<encrypt:table name="t_user">
- <encrypt:column logic-column="user_name" cipher-column="user_name" plain-column="user_name_plain" encrypt-algorithm-ref="name_encryptor" />
+ <encrypt:column logic-column="username" cipher-column="username" plain-column="username_plain" encrypt-algorithm-ref="name_encryptor" />
<encrypt:column logic-column="pwd" cipher-column="pwd" assisted-query-column="assisted_query_pwd" encrypt-algorithm-ref="pwd_encryptor" />
</encrypt:table>
</encrypt:rule>
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/shadow-example/shadow-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/shadow/raw/jdbc/config/ShadowEncryptConfiguration.java b/examples/shardingsphere-jdbc-example/single-feature-example/shadow-example/shadow-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/shadow/raw/jdbc/config/ShadowEncryptConfiguration.java
index e1eaa6c..fcbbe1e 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/shadow-example/shadow-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/shadow/raw/jdbc/config/ShadowEncryptConfiguration.java
+++ b/examples/shardingsphere-jdbc-example/single-feature-example/shadow-example/shadow-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/shadow/raw/jdbc/config/ShadowEncryptConfiguration.java
@@ -81,7 +81,7 @@ public final class ShadowEncryptConfiguration extends BaseShadowConfiguration {
private Collection<EncryptTableRuleConfiguration> getEncryptTableRuleConfigurations() {
Collection<EncryptTableRuleConfiguration> result = new LinkedList<>();
Collection<EncryptColumnRuleConfiguration> columns = new LinkedList<>();
- columns.add(new EncryptColumnRuleConfiguration("user_name", "user_name", "", "user_name_plain", "name_encryptor"));
+ columns.add(new EncryptColumnRuleConfiguration("username", "username", "", "username_plain", "name_encryptor"));
columns.add(new EncryptColumnRuleConfiguration("pwd", "pwd", "assisted_query_pwd", "", "pwd_encryptor"));
result.add(new EncryptTableRuleConfiguration("t_user", columns, null));
return result;
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/shadow-example/shadow-raw-jdbc-example/src/main/resources/META-INF/shadow-encrypt.yaml b/examples/shardingsphere-jdbc-example/single-feature-example/shadow-example/shadow-raw-jdbc-example/src/main/resources/META-INF/shadow-encrypt.yaml
index f31683b..5759b4a 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/shadow-example/shadow-raw-jdbc-example/src/main/resources/META-INF/shadow-encrypt.yaml
+++ b/examples/shardingsphere-jdbc-example/single-feature-example/shadow-example/shadow-raw-jdbc-example/src/main/resources/META-INF/shadow-encrypt.yaml
@@ -34,9 +34,9 @@ rules:
tables:
t_user:
columns:
- user_name:
- plainColumn: user_name_plain
- cipherColumn: user_name
+ username:
+ plainColumn: username_plain
+ cipherColumn: username
encryptorName: name_encryptor
pwd:
cipherColumn: pwd
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/shadow-example/shadow-spring-boot-mybatis-example/src/main/resources/application-shadow-encrypt.properties b/examples/shardingsphere-jdbc-example/single-feature-example/shadow-example/shadow-spring-boot-mybatis-example/src/main/resources/application-shadow-encrypt.properties
index c6918e4..30097be 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/shadow-example/shadow-spring-boot-mybatis-example/src/main/resources/application-shadow-encrypt.properties
+++ b/examples/shardingsphere-jdbc-example/single-feature-example/shadow-example/shadow-spring-boot-mybatis-example/src/main/resources/application-shadow-encrypt.properties
@@ -34,9 +34,9 @@ spring.shardingsphere.datasource.shadow-ds.password=
spring.shardingsphere.rules.encrypt.encryptors.name-encryptor.type=AES
spring.shardingsphere.rules.encrypt.encryptors.name-encryptor.props.aes-key-value=123456
spring.shardingsphere.rules.encrypt.encryptors.pwd-encryptor.type=assistedTest
-spring.shardingsphere.rules.encrypt.tables.t_shadow_user.columns.user_name.cipher-column=user_name
-spring.shardingsphere.rules.encrypt.tables.t_shadow_user.columns.user_name.plain-column=user_name_plain
-spring.shardingsphere.rules.encrypt.tables.t_shadow_user.columns.user_name.encryptor-name=name-encryptor
+spring.shardingsphere.rules.encrypt.tables.t_shadow_user.columns.username.cipher-column=username
+spring.shardingsphere.rules.encrypt.tables.t_shadow_user.columns.username.plain-column=username_plain
+spring.shardingsphere.rules.encrypt.tables.t_shadow_user.columns.username.encryptor-name=name-encryptor
spring.shardingsphere.rules.encrypt.tables.t_shadow_user.columns.pwd.cipher-column=pwd
spring.shardingsphere.rules.encrypt.tables.t_shadow_user.columns.pwd.assisted-query-column=assisted_query_pwd
spring.shardingsphere.rules.encrypt.tables.t_shadow_user.columns.pwd.encryptor-name=pwd-encryptor
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/shadow-example/shadow-spring-namespace-mybatis-example/src/main/resources/META-INF/application-shadow-encrypt.xml b/examples/shardingsphere-jdbc-example/single-feature-example/shadow-example/shadow-spring-namespace-mybatis-example/src/main/resources/META-INF/application-shadow-encrypt.xml
index 784a75e..c53c1e5 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/shadow-example/shadow-spring-namespace-mybatis-example/src/main/resources/META-INF/application-shadow-encrypt.xml
+++ b/examples/shardingsphere-jdbc-example/single-feature-example/shadow-example/shadow-spring-namespace-mybatis-example/src/main/resources/META-INF/application-shadow-encrypt.xml
@@ -61,7 +61,7 @@
<encrypt:rule id="encryptRule">
<encrypt:table name="t_user">
- <encrypt:column logic-column="user_name" cipher-column="user_name" plain-column="user_name_plain" encrypt-algorithm-ref="name_encryptor" />
+ <encrypt:column logic-column="username" cipher-column="username" plain-column="username_plain" encrypt-algorithm-ref="name_encryptor" />
<encrypt:column logic-column="pwd" cipher-column="pwd" assisted-query-column="assisted_query_pwd" encrypt-algorithm-ref="pwd_encryptor" />
</encrypt:table>
</encrypt:rule>
diff --git a/examples/shardingsphere-sample/shardingsphere-example-engine/src/main/resources/template/entity/User.ftl b/examples/shardingsphere-sample/shardingsphere-example-engine/src/main/resources/template/entity/User.ftl
index fd41b36..3e09627 100644
--- a/examples/shardingsphere-sample/shardingsphere-example-engine/src/main/resources/template/entity/User.ftl
+++ b/examples/shardingsphere-sample/shardingsphere-example-engine/src/main/resources/template/entity/User.ftl
@@ -48,9 +48,9 @@ public class User implements Serializable {
private int userType;
<#if framework?contains("jpa")>
- @Column(name = "user_name")
+ @Column(name = "username")
</#if>
- private String userName;
+ private String username;
<#if framework?contains("jpa")>
@Column(name = "pwd")
@@ -73,12 +73,12 @@ public class User implements Serializable {
this.userType = userType;
}
- public String getUserName() {
- return userName;
+ public String getUsername() {
+ return username;
}
- public void setUserName(final String userName) {
- this.userName = userName;
+ public void setUsername(final String username) {
+ this.username = username;
}
public String getPwd() {
@@ -91,6 +91,6 @@ public class User implements Serializable {
@Override
public String toString() {
- return String.format("user_id: %d, user_name: %s, pwd: %s", userId, userName, pwd);
+ return String.format("user_id: %d, username: %s, pwd: %s", userId, username, pwd);
}
}
diff --git a/examples/shardingsphere-sample/shardingsphere-example-engine/src/main/resources/template/jdbc/shadowExampleService.ftl b/examples/shardingsphere-sample/shardingsphere-example-engine/src/main/resources/template/jdbc/shadowExampleService.ftl
index d4f9e6a..a0ad7cb 100644
--- a/examples/shardingsphere-sample/shardingsphere-example-engine/src/main/resources/template/jdbc/shadowExampleService.ftl
+++ b/examples/shardingsphere-sample/shardingsphere-example-engine/src/main/resources/template/jdbc/shadowExampleService.ftl
@@ -20,7 +20,7 @@
* @throws SQLException
*/
private void initEnvironment() throws SQLException {
- String createSql = "CREATE TABLE IF NOT EXISTS t_user (user_id INT NOT NULL AUTO_INCREMENT, user_type INT(11), user_name VARCHAR(200), pwd VARCHAR(200), PRIMARY KEY (user_id))";
+ String createSql = "CREATE TABLE IF NOT EXISTS t_user (user_id INT NOT NULL AUTO_INCREMENT, user_type INT(11), username VARCHAR(200), pwd VARCHAR(200), PRIMARY KEY (user_id))";
createTableIfNotExistsShadow(createSql);
createTableIfNotExistsNative(createSql);
String truncateSql = "TRUNCATE TABLE t_user";
@@ -81,7 +81,7 @@
}
public void insert(final User entity) throws SQLException {
- String sql = "INSERT INTO t_user (user_id, user_type, user_name, pwd) VALUES (?, ?, ?, ?)";
+ String sql = "INSERT INTO t_user (user_id, user_type, username, pwd) VALUES (?, ?, ?, ?)";
try (Connection connection = dataSource.getConnection();
PreparedStatement preparedStatement = connection.prepareStatement(sql)) {
preparedStatement.setInt(1, entity.getUserId());
@@ -157,7 +157,7 @@
User user = new User();
user.setUserId(resultSet.getInt("user_id"));
user.setUserType(resultSet.getInt("user_type"));
- user.setUserName(resultSet.getString("user_name"));
+ user.setUserName(resultSet.getString("username"));
user.setPwd(resultSet.getString("pwd"));
result.add(user);
}
diff --git a/examples/shardingsphere-sample/shardingsphere-example-engine/src/main/resources/template/jdbc/userExampleService.ftl b/examples/shardingsphere-sample/shardingsphere-example-engine/src/main/resources/template/jdbc/userExampleService.ftl
index b3fdb69..ebaa83b 100644
--- a/examples/shardingsphere-sample/shardingsphere-example-engine/src/main/resources/template/jdbc/userExampleService.ftl
+++ b/examples/shardingsphere-sample/shardingsphere-example-engine/src/main/resources/template/jdbc/userExampleService.ftl
@@ -21,7 +21,7 @@
*/
private void initEnvironment() throws SQLException {
String createUserTableSql = "CREATE TABLE IF NOT EXISTS t_user"
- + "(user_id INT NOT NULL AUTO_INCREMENT, user_name VARCHAR(200), pwd VARCHAR(200), PRIMARY KEY (user_id))";
+ + "(user_id INT NOT NULL AUTO_INCREMENT, username VARCHAR(200), pwd VARCHAR(200), PRIMARY KEY (user_id))";
String truncateUserTable = "TRUNCATE TABLE t_user";
try (Connection connection = dataSource.getConnection();
@@ -55,7 +55,7 @@
}
private long insert(final User user) throws SQLException {
- String sql = "INSERT INTO t_user (user_id, user_name, pwd) VALUES (?, ?, ?)";
+ String sql = "INSERT INTO t_user (user_id, username, pwd) VALUES (?, ?, ?)";
try (Connection connection = dataSource.getConnection();
PreparedStatement preparedStatement = connection.prepareStatement(sql)) {
preparedStatement.setInt(1, user.getUserId());
@@ -94,7 +94,7 @@
while (resultSet.next()) {
User user = new User();
user.setUserId(resultSet.getInt("user_id"));
- user.setUserName(resultSet.getString("user_name"));
+ user.setUserName(resultSet.getString("username"));
user.setPwd(resultSet.getString("pwd"));
result.add(user);
}
diff --git a/examples/shardingsphere-sample/shardingsphere-example-engine/src/main/resources/template/jpa/userExampleService.ftl b/examples/shardingsphere-sample/shardingsphere-example-engine/src/main/resources/template/jpa/userExampleService.ftl
index 0023b18..538e988 100644
--- a/examples/shardingsphere-sample/shardingsphere-example-engine/src/main/resources/template/jpa/userExampleService.ftl
+++ b/examples/shardingsphere-sample/shardingsphere-example-engine/src/main/resources/template/jpa/userExampleService.ftl
@@ -32,7 +32,7 @@
List<Integer> result = new ArrayList<>(10);
for (int i = 1; i <= 10; i++) {
User user = new User();
- user.setUserName("test_" + i);
+ user.setUsername("test_" + i);
user.setPwd("pwd" + i);
repository.insertUser(user);
result.add(user.getUserId());
diff --git a/examples/shardingsphere-sample/shardingsphere-example-engine/src/main/resources/template/mybatis/mappers/UserMapper.ftl b/examples/shardingsphere-sample/shardingsphere-example-engine/src/main/resources/template/mybatis/mappers/UserMapper.ftl
index 0e03615..9af2d93 100644
--- a/examples/shardingsphere-sample/shardingsphere-example-engine/src/main/resources/template/mybatis/mappers/UserMapper.ftl
+++ b/examples/shardingsphere-sample/shardingsphere-example-engine/src/main/resources/template/mybatis/mappers/UserMapper.ftl
@@ -20,13 +20,13 @@
<mapper namespace="org.apache.shardingsphere.example.${feature?replace('-', '.')}.${framework?replace('-', '.')}.repository.UserRepository">
<resultMap id="baseResultMap" type="org.apache.shardingsphere.example.${feature?replace('-', '.')}.${framework?replace('-', '.')}.entity.User">
<result column="user_id" property="userId" jdbcType="INTEGER"/>
- <result column="user_name" property="userName" jdbcType="VARCHAR"/>
+ <result column="username" property="username" jdbcType="VARCHAR"/>
<result column="pwd" property="pwd" jdbcType="VARCHAR"/>
<result column="assisted_query_pwd" property="assistedQueryPwd" jdbcType="VARCHAR"/>
</resultMap>
<update id="createTableIfNotExists">
- CREATE TABLE IF NOT EXISTS t_user (user_id INT NOT NULL AUTO_INCREMENT, user_name VARCHAR(200), pwd VARCHAR(200), PRIMARY KEY (user_id));
+ CREATE TABLE IF NOT EXISTS t_user (user_id INT NOT NULL AUTO_INCREMENT, username VARCHAR(200), pwd VARCHAR(200), PRIMARY KEY (user_id));
</update>
<update id="truncateTable">
@@ -38,7 +38,7 @@
</update>
<insert id="insert">
- INSERT INTO t_user (user_id, user_name, pwd) VALUES (${r"#{userId,jdbcType=INTEGER}, #{userName,jdbcType=VARCHAR}, #{pwd,jdbcType=VARCHAR}"})
+ INSERT INTO t_user (user_id, username, pwd) VALUES (${r"#{userId,jdbcType=INTEGER}, #{username,jdbcType=VARCHAR}, #{pwd,jdbcType=VARCHAR}"})
</insert>
<delete id="delete">
diff --git a/examples/shardingsphere-sample/shardingsphere-example-engine/src/main/resources/template/mybatis/mappers/shadowUserMapper.ftl b/examples/shardingsphere-sample/shardingsphere-example-engine/src/main/resources/template/mybatis/mappers/shadowUserMapper.ftl
index 2f10783..3532b19 100644
--- a/examples/shardingsphere-sample/shardingsphere-example-engine/src/main/resources/template/mybatis/mappers/shadowUserMapper.ftl
+++ b/examples/shardingsphere-sample/shardingsphere-example-engine/src/main/resources/template/mybatis/mappers/shadowUserMapper.ftl
@@ -21,16 +21,16 @@
<resultMap id="baseResultMap" type="org.apache.shardingsphere.example.${feature?replace('-', '.')}.${framework?replace('-', '.')}.entity.User">
<result column="user_id" property="userId" jdbcType="INTEGER"/>
<result column="user_type" property="userType" jdbcType="INTEGER"/>
- <result column="user_name" property="userName" jdbcType="VARCHAR"/>
+ <result column="username" property="username" jdbcType="VARCHAR"/>
<result column="pwd" property="pwd" jdbcType="VARCHAR"/>
</resultMap>
<update id="createTableIfNotExistsNative">
- CREATE TABLE IF NOT EXISTS t_user (user_id INT NOT NULL AUTO_INCREMENT, user_type INT(11), user_name VARCHAR(200), pwd VARCHAR(200), PRIMARY KEY (user_id));
+ CREATE TABLE IF NOT EXISTS t_user (user_id INT NOT NULL AUTO_INCREMENT, user_type INT(11), username VARCHAR(200), pwd VARCHAR(200), PRIMARY KEY (user_id));
</update>
<update id="createTableIfNotExistsShadow">
- CREATE TABLE IF NOT EXISTS t_user (user_id INT NOT NULL AUTO_INCREMENT, user_type INT(11), user_name VARCHAR(200), pwd VARCHAR(200), PRIMARY KEY (user_id)) /*shadow:true,foo:bar*/;
+ CREATE TABLE IF NOT EXISTS t_user (user_id INT NOT NULL AUTO_INCREMENT, user_type INT(11), username VARCHAR(200), pwd VARCHAR(200), PRIMARY KEY (user_id)) /*shadow:true,foo:bar*/;
</update>
<update id="truncateTableNative">
@@ -50,7 +50,7 @@
</update>
<insert id="insert">
- INSERT INTO t_user (user_id, user_type, user_name, pwd) VALUES (${r"#{userId,jdbcType=INTEGER}, #{userType,jdbcType=INTEGER}, #{userName,jdbcType=VARCHAR}, #{pwd,jdbcType=VARCHAR}"})
+ INSERT INTO t_user (user_id, user_type, username, pwd) VALUES (${r"#{userId,jdbcType=INTEGER}, #{userType,jdbcType=INTEGER}, #{username,jdbcType=VARCHAR}, #{pwd,jdbcType=VARCHAR}"})
</insert>
<delete id="deleteByUserIdAndUserType">
diff --git a/examples/shardingsphere-sample/shardingsphere-example-engine/src/main/resources/template/properties/encrypt.ftl b/examples/shardingsphere-sample/shardingsphere-example-engine/src/main/resources/template/properties/encrypt.ftl
index e9bb4f2..9d2b079 100644
--- a/examples/shardingsphere-sample/shardingsphere-example-engine/src/main/resources/template/properties/encrypt.ftl
+++ b/examples/shardingsphere-sample/shardingsphere-example-engine/src/main/resources/template/properties/encrypt.ftl
@@ -21,8 +21,8 @@ spring.shardingsphere.rules.encrypt.encryptors.name-encryptor.type=AES
spring.shardingsphere.rules.encrypt.encryptors.name-encryptor.props.aes-key-value=123456abc
spring.shardingsphere.rules.encrypt.encryptors.pwd-encryptor.type=assistedTest
-spring.shardingsphere.rules.encrypt.tables.t_user.columns.user_name.cipher-column=user_name
-spring.shardingsphere.rules.encrypt.tables.t_user.columns.user_name.encryptor-name=name-encryptor
+spring.shardingsphere.rules.encrypt.tables.t_user.columns.username.cipher-column=username
+spring.shardingsphere.rules.encrypt.tables.t_user.columns.username.encryptor-name=name-encryptor
spring.shardingsphere.rules.encrypt.tables.t_user.columns.pwd.cipher-column=pwd
spring.shardingsphere.rules.encrypt.tables.t_user.columns.pwd.encryptor-name=pwd-encryptor
spring.shardingsphere.rules.encrypt.tables.t_user.columns.pwd.assisted-query-column=assisted_query_pwd
diff --git a/examples/shardingsphere-sample/shardingsphere-example-engine/src/main/resources/template/xml/encrypt.ftl b/examples/shardingsphere-sample/shardingsphere-example-engine/src/main/resources/template/xml/encrypt.ftl
index cb19d7e..5158d57 100644
--- a/examples/shardingsphere-sample/shardingsphere-example-engine/src/main/resources/template/xml/encrypt.ftl
+++ b/examples/shardingsphere-sample/shardingsphere-example-engine/src/main/resources/template/xml/encrypt.ftl
@@ -24,7 +24,7 @@
<encrypt:rule id="encryptRule">
<encrypt:table name="t_user">
- <encrypt:column logic-column="user_name" cipher-column="user_name" plain-column="user_name_plain" encrypt-algorithm-ref="name_encryptor" />
+ <encrypt:column logic-column="username" cipher-column="username" plain-column="username_plain" encrypt-algorithm-ref="name_encryptor" />
<encrypt:column logic-column="pwd" cipher-column="pwd" assisted-query-column="assisted_query_pwd" encrypt-algorithm-ref="pwd_encryptor" />
</encrypt:table>
</encrypt:rule>
diff --git a/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-encrypt-example/shardingsphere-jdbc-memory-local-encrypt-jdbc-example/src/main/java/org/apache/shardingsphere/example/encrypt/jdbc/MemoryLocalEncryptJdbcExampleService.java b/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shar [...]
index 73dbc05..c4c8d49 100644
--- a/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-encrypt-example/shardingsphere-jdbc-memory-local-encrypt-jdbc-example/src/main/java/org/apache/shardingsphere/example/encrypt/jdbc/MemoryLocalEncryptJdbcExampleService.java
+++ b/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-encrypt-example/shardingsphere-jdbc-memory-local-encrypt-jdbc-example/src/main/java/org/apache/shardingsphere/example/encrypt/jdbc/MemoryLocalEncryptJdbcExampleService.java
@@ -38,7 +38,7 @@ public final class MemoryLocalEncryptJdbcExampleService {
/**
* Execute test.
*
- * @throws SQLException
+ * @throws SQLException SQL exception
*/
public void run() throws SQLException {
try {
@@ -52,11 +52,12 @@ public final class MemoryLocalEncryptJdbcExampleService {
/**
* Initialize the database test environment.
- * @throws SQLException
+ *
+ * @throws SQLException SQL exception
*/
private void initEnvironment() throws SQLException {
String createUserTableSql = "CREATE TABLE IF NOT EXISTS t_user"
- + "(user_id INT NOT NULL AUTO_INCREMENT, user_name VARCHAR(200), pwd VARCHAR(200), PRIMARY KEY (user_id))";
+ + "(user_id INT NOT NULL AUTO_INCREMENT, username VARCHAR(200), pwd VARCHAR(200), PRIMARY KEY (user_id))";
String truncateUserTable = "TRUNCATE TABLE t_user";
try (Connection connection = dataSource.getConnection();
@@ -81,7 +82,7 @@ public final class MemoryLocalEncryptJdbcExampleService {
for (int i = 1; i <= 10; i++) {
User user = new User();
user.setUserId(i);
- user.setUserName("test_" + i);
+ user.setUsername("test_" + i);
user.setPwd("pwd" + i);
insert(user);
result.add((long) user.getUserId());
@@ -90,11 +91,11 @@ public final class MemoryLocalEncryptJdbcExampleService {
}
private long insert(final User user) throws SQLException {
- String sql = "INSERT INTO t_user (user_id, user_name, pwd) VALUES (?, ?, ?)";
+ String sql = "INSERT INTO t_user (user_id, username, pwd) VALUES (?, ?, ?)";
try (Connection connection = dataSource.getConnection();
PreparedStatement preparedStatement = connection.prepareStatement(sql)) {
preparedStatement.setInt(1, user.getUserId());
- preparedStatement.setString(2, user.getUserName());
+ preparedStatement.setString(2, user.getUsername());
preparedStatement.setString(3, user.getPwd());
preparedStatement.executeUpdate();
}
@@ -129,7 +130,7 @@ public final class MemoryLocalEncryptJdbcExampleService {
while (resultSet.next()) {
User user = new User();
user.setUserId(resultSet.getInt("user_id"));
- user.setUserName(resultSet.getString("user_name"));
+ user.setUsername(resultSet.getString("username"));
user.setPwd(resultSet.getString("pwd"));
result.add(user);
}
@@ -139,13 +140,14 @@ public final class MemoryLocalEncryptJdbcExampleService {
/**
* Restore the environment.
- * @throws SQLException
+ *
+ * @throws SQLException SQL exception
*/
private void cleanEnvironment() throws SQLException {
- String dropUserSql = "DROP TABLE t_user";
+ String sql = "DROP TABLE t_user";
try (Connection connection = dataSource.getConnection();
Statement statement = connection.createStatement()) {
- statement.executeUpdate(dropUserSql);
+ statement.executeUpdate(sql);
}
}
}
diff --git a/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-encrypt-example/shardingsphere-jdbc-memory-local-encrypt-jdbc-example/src/main/java/org/apache/shardingsphere/example/encrypt/jdbc/entity/User.java b/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-lo [...]
index 34066d9..fbaffa3 100644
--- a/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-encrypt-example/shardingsphere-jdbc-memory-local-encrypt-jdbc-example/src/main/java/org/apache/shardingsphere/example/encrypt/jdbc/entity/User.java
+++ b/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-encrypt-example/shardingsphere-jdbc-memory-local-encrypt-jdbc-example/src/main/java/org/apache/shardingsphere/example/encrypt/jdbc/entity/User.java
@@ -25,7 +25,7 @@ public class User implements Serializable {
private int userId;
- private String userName;
+ private String username;
private String pwd;
@@ -37,12 +37,12 @@ public class User implements Serializable {
this.userId = userId;
}
- public String getUserName() {
- return userName;
+ public String getUsername() {
+ return username;
}
- public void setUserName(final String userName) {
- this.userName = userName;
+ public void setUsername(final String username) {
+ this.username = username;
}
public String getPwd() {
@@ -55,6 +55,6 @@ public class User implements Serializable {
@Override
public String toString() {
- return String.format("user_id: %d, user_name: %s, pwd: %s", userId, userName, pwd);
+ return String.format("user_id: %d, username: %s, pwd: %s", userId, username, pwd);
}
}
diff --git a/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-encrypt-example/shardingsphere-jdbc-memory-local-encrypt-spring-boot-starter-jdbc-example/src/main/java/org/apache/shardingsphere/example/encrypt/spring/boot/starter/jdbc/MemoryLocalEncryptSpringBootStarterJdbcExampleService.java b/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-mem [...]
index 64a444f..2a952b8 100644
--- a/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-encrypt-example/shardingsphere-jdbc-memory-local-encrypt-spring-boot-starter-jdbc-example/src/main/java/org/apache/shardingsphere/example/encrypt/spring/boot/starter/jdbc/MemoryLocalEncryptSpringBootStarterJdbcExampleService.java
+++ b/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-encrypt-example/shardingsphere-jdbc-memory-local-encrypt-spring-boot-starter-jdbc-example/src/main/java/org/apache/shardingsphere/example/encrypt/spring/boot/starter/jdbc/MemoryLocalEncryptSpringBootStarterJdbcExampleService.java
@@ -36,11 +36,11 @@ import java.util.List;
public final class MemoryLocalEncryptSpringBootStarterJdbcExampleService {
private final DataSource dataSource;
-
+
/**
* Execute test.
*
- * @throws SQLException
+ * @throws SQLException SQL exception
*/
public void run() throws SQLException {
try {
@@ -51,14 +51,14 @@ public final class MemoryLocalEncryptSpringBootStarterJdbcExampleService {
}
}
-
/**
* Initialize the database test environment.
- * @throws SQLException
+ *
+ * @throws SQLException SQL exception
*/
private void initEnvironment() throws SQLException {
String createUserTableSql = "CREATE TABLE IF NOT EXISTS t_user"
- + "(user_id INT NOT NULL AUTO_INCREMENT, user_name VARCHAR(200), pwd VARCHAR(200), PRIMARY KEY (user_id))";
+ + "(user_id INT NOT NULL AUTO_INCREMENT, username VARCHAR(200), pwd VARCHAR(200), PRIMARY KEY (user_id))";
String truncateUserTable = "TRUNCATE TABLE t_user";
try (Connection connection = dataSource.getConnection();
@@ -83,7 +83,7 @@ public final class MemoryLocalEncryptSpringBootStarterJdbcExampleService {
for (int i = 1; i <= 10; i++) {
User user = new User();
user.setUserId(i);
- user.setUserName("test_" + i);
+ user.setUsername("test_" + i);
user.setPwd("pwd" + i);
insert(user);
result.add((long) user.getUserId());
@@ -92,17 +92,17 @@ public final class MemoryLocalEncryptSpringBootStarterJdbcExampleService {
}
private long insert(final User user) throws SQLException {
- String sql = "INSERT INTO t_user (user_id, user_name, pwd) VALUES (?, ?, ?)";
+ String sql = "INSERT INTO t_user (user_id, username, pwd) VALUES (?, ?, ?)";
try (Connection connection = dataSource.getConnection();
PreparedStatement preparedStatement = connection.prepareStatement(sql)) {
preparedStatement.setInt(1, user.getUserId());
- preparedStatement.setString(2, user.getUserName());
+ preparedStatement.setString(2, user.getUsername());
preparedStatement.setString(3, user.getPwd());
preparedStatement.executeUpdate();
}
return user.getUserId();
}
-
+
private void deleteData(final List<Long> orderIds) throws SQLException {
System.out.println("---------------------------- Delete Data ----------------------------");
String sql = "DELETE FROM t_user WHERE user_id=?";
@@ -121,7 +121,7 @@ public final class MemoryLocalEncryptSpringBootStarterJdbcExampleService {
System.out.println(each);
}
}
-
+
protected List<User> getUsers() throws SQLException {
List<User> result = new LinkedList<>();
String sql = "SELECT * FROM t_user";
@@ -131,7 +131,7 @@ public final class MemoryLocalEncryptSpringBootStarterJdbcExampleService {
while (resultSet.next()) {
User user = new User();
user.setUserId(resultSet.getInt("user_id"));
- user.setUserName(resultSet.getString("user_name"));
+ user.setUsername(resultSet.getString("username"));
user.setPwd(resultSet.getString("pwd"));
result.add(user);
}
@@ -141,13 +141,14 @@ public final class MemoryLocalEncryptSpringBootStarterJdbcExampleService {
/**
* Restore the environment.
- * @throws SQLException
+ *
+ * @throws SQLException SQL exception
*/
private void cleanEnvironment() throws SQLException {
- String dropUserSql = "DROP TABLE t_user";
+ String sql = "DROP TABLE t_user";
try (Connection connection = dataSource.getConnection();
Statement statement = connection.createStatement()) {
- statement.executeUpdate(dropUserSql);
+ statement.executeUpdate(sql);
}
}
}
diff --git a/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-encrypt-example/shardingsphere-jdbc-memory-local-encrypt-spring-boot-starter-jdbc-example/src/main/java/org/apache/shardingsphere/example/encrypt/spring/boot/starter/jdbc/entity/User.java b/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-loc [...]
index 1476bad..856278e 100644
--- a/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-encrypt-example/shardingsphere-jdbc-memory-local-encrypt-spring-boot-starter-jdbc-example/src/main/java/org/apache/shardingsphere/example/encrypt/spring/boot/starter/jdbc/entity/User.java
+++ b/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-encrypt-example/shardingsphere-jdbc-memory-local-encrypt-spring-boot-starter-jdbc-example/src/main/java/org/apache/shardingsphere/example/encrypt/spring/boot/starter/jdbc/entity/User.java
@@ -25,7 +25,7 @@ public class User implements Serializable {
private int userId;
- private String userName;
+ private String username;
private String pwd;
@@ -37,12 +37,12 @@ public class User implements Serializable {
this.userId = userId;
}
- public String getUserName() {
- return userName;
+ public String getUsername() {
+ return username;
}
- public void setUserName(final String userName) {
- this.userName = userName;
+ public void setUsername(final String username) {
+ this.username = username;
}
public String getPwd() {
@@ -55,6 +55,6 @@ public class User implements Serializable {
@Override
public String toString() {
- return String.format("user_id: %d, user_name: %s, pwd: %s", userId, userName, pwd);
+ return String.format("user_id: %d, username: %s, pwd: %s", userId, username, pwd);
}
}
diff --git a/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-encrypt-example/shardingsphere-jdbc-memory-local-encrypt-spring-boot-starter-jdbc-example/src/main/resources/application.properties b/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-encrypt-exam [...]
index 8597dae..27232fa 100644
--- a/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-encrypt-example/shardingsphere-jdbc-memory-local-encrypt-spring-boot-starter-jdbc-example/src/main/resources/application.properties
+++ b/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-encrypt-example/shardingsphere-jdbc-memory-local-encrypt-spring-boot-starter-jdbc-example/src/main/resources/application.properties
@@ -35,8 +35,8 @@ spring.shardingsphere.rules.encrypt.encryptors.name-encryptor.type=AES
spring.shardingsphere.rules.encrypt.encryptors.name-encryptor.props.aes-key-value=123456abc
spring.shardingsphere.rules.encrypt.encryptors.pwd-encryptor.type=assistedTest
-spring.shardingsphere.rules.encrypt.tables.t_user.columns.user_name.cipher-column=user_name
-spring.shardingsphere.rules.encrypt.tables.t_user.columns.user_name.encryptor-name=name-encryptor
+spring.shardingsphere.rules.encrypt.tables.t_user.columns.username.cipher-column=username
+spring.shardingsphere.rules.encrypt.tables.t_user.columns.username.encryptor-name=name-encryptor
spring.shardingsphere.rules.encrypt.tables.t_user.columns.pwd.cipher-column=pwd
spring.shardingsphere.rules.encrypt.tables.t_user.columns.pwd.encryptor-name=pwd-encryptor
spring.shardingsphere.rules.encrypt.tables.t_user.columns.pwd.assisted-query-column=assisted_query_pwd
diff --git a/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-encrypt-example/shardingsphere-jdbc-memory-local-encrypt-spring-boot-starter-jpa-example/src/main/java/org/apache/shardingsphere/example/encrypt/spring/boot/starter/jpa/MemoryLocalEncryptSpringBootStarterJpaExampleService.java b/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory [...]
index e520b6c..c146bd9 100644
--- a/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-encrypt-example/shardingsphere-jdbc-memory-local-encrypt-spring-boot-starter-jpa-example/src/main/java/org/apache/shardingsphere/example/encrypt/spring/boot/starter/jpa/MemoryLocalEncryptSpringBootStarterJpaExampleService.java
+++ b/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-encrypt-example/shardingsphere-jdbc-memory-local-encrypt-spring-boot-starter-jpa-example/src/main/java/org/apache/shardingsphere/example/encrypt/spring/boot/starter/jpa/MemoryLocalEncryptSpringBootStarterJpaExampleService.java
@@ -47,7 +47,7 @@ public final class MemoryLocalEncryptSpringBootStarterJpaExampleService {
List<Integer> result = new ArrayList<>(10);
for (int i = 1; i <= 10; i++) {
User user = new User();
- user.setUserName("test_" + i);
+ user.setUsername("test_" + i);
user.setPwd("pwd" + i);
repository.insertUser(user);
result.add(user.getUserId());
diff --git a/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-encrypt-example/shardingsphere-jdbc-memory-local-encrypt-spring-boot-starter-jpa-example/src/main/java/org/apache/shardingsphere/example/encrypt/spring/boot/starter/jpa/entity/User.java b/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local [...]
index f3b6657..4d951ca 100644
--- a/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-encrypt-example/shardingsphere-jdbc-memory-local-encrypt-spring-boot-starter-jpa-example/src/main/java/org/apache/shardingsphere/example/encrypt/spring/boot/starter/jpa/entity/User.java
+++ b/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-encrypt-example/shardingsphere-jdbc-memory-local-encrypt-spring-boot-starter-jpa-example/src/main/java/org/apache/shardingsphere/example/encrypt/spring/boot/starter/jpa/entity/User.java
@@ -36,8 +36,8 @@ public class User implements Serializable {
@GeneratedValue(strategy = GenerationType.IDENTITY)
private int userId;
- @Column(name = "user_name")
- private String userName;
+ @Column(name = "username")
+ private String username;
@Column(name = "pwd")
private String pwd;
@@ -50,12 +50,12 @@ public class User implements Serializable {
this.userId = userId;
}
- public String getUserName() {
- return userName;
+ public String getUsername() {
+ return username;
}
- public void setUserName(final String userName) {
- this.userName = userName;
+ public void setUsername(final String username) {
+ this.username = username;
}
public String getPwd() {
@@ -68,6 +68,6 @@ public class User implements Serializable {
@Override
public String toString() {
- return String.format("user_id: %d, user_name: %s, pwd: %s", userId, userName, pwd);
+ return String.format("user_id: %d, username: %s, pwd: %s", userId, username, pwd);
}
}
diff --git a/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-encrypt-example/shardingsphere-jdbc-memory-local-encrypt-spring-boot-starter-jpa-example/src/main/resources/application.properties b/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-encrypt-examp [...]
index d19a73c..95bae84 100644
--- a/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-encrypt-example/shardingsphere-jdbc-memory-local-encrypt-spring-boot-starter-jpa-example/src/main/resources/application.properties
+++ b/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-encrypt-example/shardingsphere-jdbc-memory-local-encrypt-spring-boot-starter-jpa-example/src/main/resources/application.properties
@@ -39,8 +39,8 @@ spring.shardingsphere.rules.encrypt.encryptors.name-encryptor.type=AES
spring.shardingsphere.rules.encrypt.encryptors.name-encryptor.props.aes-key-value=123456abc
spring.shardingsphere.rules.encrypt.encryptors.pwd-encryptor.type=assistedTest
-spring.shardingsphere.rules.encrypt.tables.t_user.columns.user_name.cipher-column=user_name
-spring.shardingsphere.rules.encrypt.tables.t_user.columns.user_name.encryptor-name=name-encryptor
+spring.shardingsphere.rules.encrypt.tables.t_user.columns.username.cipher-column=username
+spring.shardingsphere.rules.encrypt.tables.t_user.columns.username.encryptor-name=name-encryptor
spring.shardingsphere.rules.encrypt.tables.t_user.columns.pwd.cipher-column=pwd
spring.shardingsphere.rules.encrypt.tables.t_user.columns.pwd.encryptor-name=pwd-encryptor
spring.shardingsphere.rules.encrypt.tables.t_user.columns.pwd.assisted-query-column=assisted_query_pwd
diff --git a/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-encrypt-example/shardingsphere-jdbc-memory-local-encrypt-spring-boot-starter-mybatis-example/src/main/java/org/apache/shardingsphere/example/encrypt/spring/boot/starter/mybatis/MemoryLocalEncryptSpringBootStarterMybatisExampleService.java b/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere [...]
index 8711c16..4f40c69 100644
--- a/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-encrypt-example/shardingsphere-jdbc-memory-local-encrypt-spring-boot-starter-mybatis-example/src/main/java/org/apache/shardingsphere/example/encrypt/spring/boot/starter/mybatis/MemoryLocalEncryptSpringBootStarterMybatisExampleService.java
+++ b/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-encrypt-example/shardingsphere-jdbc-memory-local-encrypt-spring-boot-starter-mybatis-example/src/main/java/org/apache/shardingsphere/example/encrypt/spring/boot/starter/mybatis/MemoryLocalEncryptSpringBootStarterMybatisExampleService.java
@@ -22,20 +22,17 @@ import org.apache.shardingsphere.example.encrypt.spring.boot.starter.mybatis.rep
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
-import java.sql.SQLException;
import java.util.ArrayList;
import java.util.List;
@Service
public final class MemoryLocalEncryptSpringBootStarterMybatisExampleService {
-
+
@Resource
private UserRepository userRepository;
-
+
/**
* Execute test.
- *
- * @throws SQLException
*/
public void run() {
try {
@@ -48,7 +45,6 @@ public final class MemoryLocalEncryptSpringBootStarterMybatisExampleService {
/**
* Initialize the database test environment.
- * @throws SQLException
*/
private void initEnvironment() {
userRepository.createTableIfNotExists();
@@ -63,21 +59,21 @@ public final class MemoryLocalEncryptSpringBootStarterMybatisExampleService {
printData();
System.out.println("-------------- Process Success Finish --------------");
}
-
+
private List<Long> insertData() {
System.out.println("---------------------------- Insert Data ----------------------------");
List<Long> result = new ArrayList<>(10);
for (int i = 1; i <= 10; i++) {
User user = new User();
user.setUserId(i);
- user.setUserName("test_mybatis_" + i);
+ user.setUsername("test_mybatis_" + i);
user.setPwd("pwd_mybatis_" + i);
userRepository.insert(user);
result.add((long) user.getUserId());
}
return result;
}
-
+
private void deleteData(final List<Long> orderIds) {
System.out.println("---------------------------- Delete Data ----------------------------");
for (Long each : orderIds) {
@@ -94,10 +90,8 @@ public final class MemoryLocalEncryptSpringBootStarterMybatisExampleService {
/**
* Restore the environment.
- * @throws SQLException
*/
private void cleanEnvironment() {
userRepository.dropTable();
}
-
}
diff --git a/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-encrypt-example/shardingsphere-jdbc-memory-local-encrypt-spring-boot-starter-mybatis-example/src/main/java/org/apache/shardingsphere/example/encrypt/spring/boot/starter/mybatis/entity/User.java b/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memo [...]
index 12868ed..b4fbabc 100644
--- a/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-encrypt-example/shardingsphere-jdbc-memory-local-encrypt-spring-boot-starter-mybatis-example/src/main/java/org/apache/shardingsphere/example/encrypt/spring/boot/starter/mybatis/entity/User.java
+++ b/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-encrypt-example/shardingsphere-jdbc-memory-local-encrypt-spring-boot-starter-mybatis-example/src/main/java/org/apache/shardingsphere/example/encrypt/spring/boot/starter/mybatis/entity/User.java
@@ -25,7 +25,7 @@ public class User implements Serializable {
private int userId;
- private String userName;
+ private String username;
private String pwd;
@@ -37,12 +37,12 @@ public class User implements Serializable {
this.userId = userId;
}
- public String getUserName() {
- return userName;
+ public String getUsername() {
+ return username;
}
- public void setUserName(final String userName) {
- this.userName = userName;
+ public void setUsername(final String username) {
+ this.username = username;
}
public String getPwd() {
@@ -55,6 +55,6 @@ public class User implements Serializable {
@Override
public String toString() {
- return String.format("user_id: %d, user_name: %s, pwd: %s", userId, userName, pwd);
+ return String.format("user_id: %d, username: %s, pwd: %s", userId, username, pwd);
}
}
diff --git a/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-encrypt-example/shardingsphere-jdbc-memory-local-encrypt-spring-boot-starter-mybatis-example/src/main/resources/application.properties b/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-encrypt-e [...]
index 8b0925d..2d9a064 100644
--- a/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-encrypt-example/shardingsphere-jdbc-memory-local-encrypt-spring-boot-starter-mybatis-example/src/main/resources/application.properties
+++ b/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-encrypt-example/shardingsphere-jdbc-memory-local-encrypt-spring-boot-starter-mybatis-example/src/main/resources/application.properties
@@ -37,8 +37,8 @@ spring.shardingsphere.rules.encrypt.encryptors.name-encryptor.type=AES
spring.shardingsphere.rules.encrypt.encryptors.name-encryptor.props.aes-key-value=123456abc
spring.shardingsphere.rules.encrypt.encryptors.pwd-encryptor.type=assistedTest
-spring.shardingsphere.rules.encrypt.tables.t_user.columns.user_name.cipher-column=user_name
-spring.shardingsphere.rules.encrypt.tables.t_user.columns.user_name.encryptor-name=name-encryptor
+spring.shardingsphere.rules.encrypt.tables.t_user.columns.username.cipher-column=username
+spring.shardingsphere.rules.encrypt.tables.t_user.columns.username.encryptor-name=name-encryptor
spring.shardingsphere.rules.encrypt.tables.t_user.columns.pwd.cipher-column=pwd
spring.shardingsphere.rules.encrypt.tables.t_user.columns.pwd.encryptor-name=pwd-encryptor
spring.shardingsphere.rules.encrypt.tables.t_user.columns.pwd.assisted-query-column=assisted_query_pwd
diff --git a/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-encrypt-example/shardingsphere-jdbc-memory-local-encrypt-spring-boot-starter-mybatis-example/src/main/resources/mappers/UserMapper.xml b/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-encrypt-e [...]
index 4ab5cef..01a7286 100644
--- a/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-encrypt-example/shardingsphere-jdbc-memory-local-encrypt-spring-boot-starter-mybatis-example/src/main/resources/mappers/UserMapper.xml
+++ b/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-encrypt-example/shardingsphere-jdbc-memory-local-encrypt-spring-boot-starter-mybatis-example/src/main/resources/mappers/UserMapper.xml
@@ -20,13 +20,13 @@
<mapper namespace="org.apache.shardingsphere.example.encrypt.spring.boot.starter.mybatis.repository.UserRepository">
<resultMap id="baseResultMap" type="org.apache.shardingsphere.example.encrypt.spring.boot.starter.mybatis.entity.User">
<result column="user_id" property="userId" jdbcType="INTEGER"/>
- <result column="user_name" property="userName" jdbcType="VARCHAR"/>
+ <result column="username" property="username" jdbcType="VARCHAR"/>
<result column="pwd" property="pwd" jdbcType="VARCHAR"/>
<result column="assisted_query_pwd" property="assistedQueryPwd" jdbcType="VARCHAR"/>
</resultMap>
<update id="createTableIfNotExists">
- CREATE TABLE IF NOT EXISTS t_user (user_id INT NOT NULL AUTO_INCREMENT, user_name VARCHAR(200), pwd VARCHAR(200), PRIMARY KEY (user_id));
+ CREATE TABLE IF NOT EXISTS t_user (user_id INT NOT NULL AUTO_INCREMENT, username VARCHAR(200), pwd VARCHAR(200), PRIMARY KEY (user_id));
</update>
<update id="truncateTable">
@@ -38,7 +38,7 @@
</update>
<insert id="insert">
- INSERT INTO t_user (user_id, user_name, pwd) VALUES (#{userId,jdbcType=INTEGER}, #{userName,jdbcType=VARCHAR}, #{pwd,jdbcType=VARCHAR})
+ INSERT INTO t_user (user_id, username, pwd) VALUES (#{userId,jdbcType=INTEGER}, #{username,jdbcType=VARCHAR}, #{pwd,jdbcType=VARCHAR})
</insert>
<delete id="delete">
diff --git a/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-encrypt-example/shardingsphere-jdbc-memory-local-encrypt-spring-namespace-jdbc-example/src/main/java/org/apache/shardingsphere/example/encrypt/spring/namespace/jdbc/MemoryLocalEncryptSpringNamespaceJdbcExampleService.java b/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-exam [...]
index 161cdcd..d421998 100644
--- a/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-encrypt-example/shardingsphere-jdbc-memory-local-encrypt-spring-namespace-jdbc-example/src/main/java/org/apache/shardingsphere/example/encrypt/spring/namespace/jdbc/MemoryLocalEncryptSpringNamespaceJdbcExampleService.java
+++ b/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-encrypt-example/shardingsphere-jdbc-memory-local-encrypt-spring-namespace-jdbc-example/src/main/java/org/apache/shardingsphere/example/encrypt/spring/namespace/jdbc/MemoryLocalEncryptSpringNamespaceJdbcExampleService.java
@@ -36,11 +36,11 @@ import java.util.List;
public final class MemoryLocalEncryptSpringNamespaceJdbcExampleService {
private final DataSource dataSource;
-
+
/**
* Execute test.
*
- * @throws SQLException
+ * @throws SQLException SQL exception
*/
public void run() throws SQLException {
try {
@@ -50,17 +50,15 @@ public final class MemoryLocalEncryptSpringNamespaceJdbcExampleService {
this.cleanEnvironment();
}
}
-
-
+
/**
* Initialize the database test environment.
- * @throws SQLException
+ *
+ * @throws SQLException SQL exception
*/
private void initEnvironment() throws SQLException {
- String createUserTableSql = "CREATE TABLE IF NOT EXISTS t_user"
- + "(user_id INT NOT NULL AUTO_INCREMENT, user_name VARCHAR(200), pwd VARCHAR(200), PRIMARY KEY (user_id))";
+ String createUserTableSql = "CREATE TABLE IF NOT EXISTS t_user (user_id INT NOT NULL AUTO_INCREMENT, username VARCHAR(200), pwd VARCHAR(200), PRIMARY KEY (user_id))";
String truncateUserTable = "TRUNCATE TABLE t_user";
-
try (Connection connection = dataSource.getConnection();
Statement statement = connection.createStatement()) {
statement.executeUpdate(createUserTableSql);
@@ -76,14 +74,14 @@ public final class MemoryLocalEncryptSpringNamespaceJdbcExampleService {
printData();
System.out.println("-------------- Process Success Finish --------------");
}
-
+
private List<Long> insertData() throws SQLException {
System.out.println("---------------------------- Insert Data ----------------------------");
List<Long> result = new ArrayList<>(10);
for (int i = 1; i <= 10; i++) {
User user = new User();
user.setUserId(i);
- user.setUserName("test_" + i);
+ user.setUsername("test_" + i);
user.setPwd("pwd" + i);
insert(user);
result.add((long) user.getUserId());
@@ -92,17 +90,17 @@ public final class MemoryLocalEncryptSpringNamespaceJdbcExampleService {
}
private long insert(final User user) throws SQLException {
- String sql = "INSERT INTO t_user (user_id, user_name, pwd) VALUES (?, ?, ?)";
+ String sql = "INSERT INTO t_user (user_id, username, pwd) VALUES (?, ?, ?)";
try (Connection connection = dataSource.getConnection();
PreparedStatement preparedStatement = connection.prepareStatement(sql)) {
preparedStatement.setInt(1, user.getUserId());
- preparedStatement.setString(2, user.getUserName());
+ preparedStatement.setString(2, user.getUsername());
preparedStatement.setString(3, user.getPwd());
preparedStatement.executeUpdate();
}
return user.getUserId();
}
-
+
private void deleteData(final List<Long> orderIds) throws SQLException {
System.out.println("---------------------------- Delete Data ----------------------------");
String sql = "DELETE FROM t_user WHERE user_id=?";
@@ -121,7 +119,7 @@ public final class MemoryLocalEncryptSpringNamespaceJdbcExampleService {
System.out.println(each);
}
}
-
+
protected List<User> getUsers() throws SQLException {
List<User> result = new LinkedList<>();
String sql = "SELECT * FROM t_user";
@@ -131,7 +129,7 @@ public final class MemoryLocalEncryptSpringNamespaceJdbcExampleService {
while (resultSet.next()) {
User user = new User();
user.setUserId(resultSet.getInt("user_id"));
- user.setUserName(resultSet.getString("user_name"));
+ user.setUsername(resultSet.getString("username"));
user.setPwd(resultSet.getString("pwd"));
result.add(user);
}
@@ -141,13 +139,14 @@ public final class MemoryLocalEncryptSpringNamespaceJdbcExampleService {
/**
* Restore the environment.
- * @throws SQLException
+ *
+ * @throws SQLException SQL exception
*/
private void cleanEnvironment() throws SQLException {
- String dropUserSql = "DROP TABLE t_user";
+ String sql = "DROP TABLE t_user";
try (Connection connection = dataSource.getConnection();
Statement statement = connection.createStatement()) {
- statement.executeUpdate(dropUserSql);
+ statement.executeUpdate(sql);
}
}
}
diff --git a/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-encrypt-example/shardingsphere-jdbc-memory-local-encrypt-spring-namespace-jdbc-example/src/main/java/org/apache/shardingsphere/example/encrypt/spring/namespace/jdbc/entity/User.java b/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-exa [...]
index ea65fff..a2b08c8 100644
--- a/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-encrypt-example/shardingsphere-jdbc-memory-local-encrypt-spring-namespace-jdbc-example/src/main/java/org/apache/shardingsphere/example/encrypt/spring/namespace/jdbc/entity/User.java
+++ b/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-encrypt-example/shardingsphere-jdbc-memory-local-encrypt-spring-namespace-jdbc-example/src/main/java/org/apache/shardingsphere/example/encrypt/spring/namespace/jdbc/entity/User.java
@@ -25,7 +25,7 @@ public class User implements Serializable {
private int userId;
- private String userName;
+ private String username;
private String pwd;
@@ -37,12 +37,12 @@ public class User implements Serializable {
this.userId = userId;
}
- public String getUserName() {
- return userName;
+ public String getUsername() {
+ return username;
}
- public void setUserName(final String userName) {
- this.userName = userName;
+ public void setUsername(final String username) {
+ this.username = username;
}
public String getPwd() {
@@ -55,6 +55,6 @@ public class User implements Serializable {
@Override
public String toString() {
- return String.format("user_id: %d, user_name: %s, pwd: %s", userId, userName, pwd);
+ return String.format("user_id: %d, username: %s, pwd: %s", userId, username, pwd);
}
}
diff --git a/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-encrypt-example/shardingsphere-jdbc-memory-local-encrypt-spring-namespace-jdbc-example/src/main/resources/application.xml b/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-encrypt-example/shardi [...]
index e7ceb69..104c7f7 100644
--- a/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-encrypt-example/shardingsphere-jdbc-memory-local-encrypt-spring-namespace-jdbc-example/src/main/resources/application.xml
+++ b/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-encrypt-example/shardingsphere-jdbc-memory-local-encrypt-spring-namespace-jdbc-example/src/main/resources/application.xml
@@ -66,12 +66,10 @@
<encrypt:rule id="encryptRule">
<encrypt:table name="t_user">
- <encrypt:column logic-column="user_name" cipher-column="user_name" plain-column="user_name_plain" encrypt-algorithm-ref="name_encryptor" />
+ <encrypt:column logic-column="username" cipher-column="username" plain-column="username_plain" encrypt-algorithm-ref="name_encryptor" />
<encrypt:column logic-column="pwd" cipher-column="pwd" assisted-query-column="assisted_query_pwd" encrypt-algorithm-ref="pwd_encryptor" />
</encrypt:table>
</encrypt:rule>
<shardingsphere:data-source id="dataSource" data-source-names="demo_ds_0" rule-refs="encryptRule" />
-
-
</beans>
diff --git a/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-encrypt-example/shardingsphere-jdbc-memory-local-encrypt-spring-namespace-jpa-example/src/main/java/org/apache/shardingsphere/example/encrypt/spring/namespace/jpa/MemoryLocalEncryptSpringNamespaceJpaExampleService.java b/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example [...]
index 6e7b514..3847c5d 100644
--- a/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-encrypt-example/shardingsphere-jdbc-memory-local-encrypt-spring-namespace-jpa-example/src/main/java/org/apache/shardingsphere/example/encrypt/spring/namespace/jpa/MemoryLocalEncryptSpringNamespaceJpaExampleService.java
+++ b/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-encrypt-example/shardingsphere-jdbc-memory-local-encrypt-spring-namespace-jpa-example/src/main/java/org/apache/shardingsphere/example/encrypt/spring/namespace/jpa/MemoryLocalEncryptSpringNamespaceJpaExampleService.java
@@ -47,7 +47,7 @@ public final class MemoryLocalEncryptSpringNamespaceJpaExampleService {
List<Integer> result = new ArrayList<>(10);
for (int i = 1; i <= 10; i++) {
User user = new User();
- user.setUserName("test_" + i);
+ user.setUsername("test_" + i);
user.setPwd("pwd" + i);
repository.insertUser(user);
result.add(user.getUserId());
diff --git a/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-encrypt-example/shardingsphere-jdbc-memory-local-encrypt-spring-namespace-jpa-example/src/main/java/org/apache/shardingsphere/example/encrypt/spring/namespace/jpa/entity/User.java b/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-examp [...]
index 273a00e..c8220f7 100644
--- a/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-encrypt-example/shardingsphere-jdbc-memory-local-encrypt-spring-namespace-jpa-example/src/main/java/org/apache/shardingsphere/example/encrypt/spring/namespace/jpa/entity/User.java
+++ b/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-encrypt-example/shardingsphere-jdbc-memory-local-encrypt-spring-namespace-jpa-example/src/main/java/org/apache/shardingsphere/example/encrypt/spring/namespace/jpa/entity/User.java
@@ -36,8 +36,8 @@ public class User implements Serializable {
@GeneratedValue(strategy = GenerationType.IDENTITY)
private int userId;
- @Column(name = "user_name")
- private String userName;
+ @Column(name = "username")
+ private String username;
@Column(name = "pwd")
private String pwd;
@@ -50,12 +50,12 @@ public class User implements Serializable {
this.userId = userId;
}
- public String getUserName() {
- return userName;
+ public String getUsername() {
+ return username;
}
- public void setUserName(final String userName) {
- this.userName = userName;
+ public void setUsername(final String username) {
+ this.username = username;
}
public String getPwd() {
@@ -68,6 +68,6 @@ public class User implements Serializable {
@Override
public String toString() {
- return String.format("user_id: %d, user_name: %s, pwd: %s", userId, userName, pwd);
+ return String.format("user_id: %d, username: %s, pwd: %s", userId, username, pwd);
}
}
diff --git a/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-encrypt-example/shardingsphere-jdbc-memory-local-encrypt-spring-namespace-jpa-example/src/main/resources/application.xml b/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-encrypt-example/shardin [...]
index 856876a..06dcd6f 100644
--- a/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-encrypt-example/shardingsphere-jdbc-memory-local-encrypt-spring-namespace-jpa-example/src/main/resources/application.xml
+++ b/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-encrypt-example/shardingsphere-jdbc-memory-local-encrypt-spring-namespace-jpa-example/src/main/resources/application.xml
@@ -82,7 +82,7 @@
<encrypt:rule id="encryptRule">
<encrypt:table name="t_user">
- <encrypt:column logic-column="user_name" cipher-column="user_name" plain-column="user_name_plain" encrypt-algorithm-ref="name_encryptor" />
+ <encrypt:column logic-column="username" cipher-column="username" plain-column="username_plain" encrypt-algorithm-ref="name_encryptor" />
<encrypt:column logic-column="pwd" cipher-column="pwd" assisted-query-column="assisted_query_pwd" encrypt-algorithm-ref="pwd_encryptor" />
</encrypt:table>
</encrypt:rule>
diff --git a/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-encrypt-example/shardingsphere-jdbc-memory-local-encrypt-spring-namespace-mybatis-example/src/main/java/org/apache/shardingsphere/example/encrypt/spring/namespace/mybatis/MemoryLocalEncryptSpringNamespaceMybatisExampleService.java b/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-me [...]
index 5312024..c5db089 100644
--- a/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-encrypt-example/shardingsphere-jdbc-memory-local-encrypt-spring-namespace-mybatis-example/src/main/java/org/apache/shardingsphere/example/encrypt/spring/namespace/mybatis/MemoryLocalEncryptSpringNamespaceMybatisExampleService.java
+++ b/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-encrypt-example/shardingsphere-jdbc-memory-local-encrypt-spring-namespace-mybatis-example/src/main/java/org/apache/shardingsphere/example/encrypt/spring/namespace/mybatis/MemoryLocalEncryptSpringNamespaceMybatisExampleService.java
@@ -22,20 +22,17 @@ import org.apache.shardingsphere.example.encrypt.spring.namespace.mybatis.reposi
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
-import java.sql.SQLException;
import java.util.ArrayList;
import java.util.List;
@Service
public final class MemoryLocalEncryptSpringNamespaceMybatisExampleService {
-
+
@Resource
private UserRepository userRepository;
-
+
/**
* Execute test.
- *
- * @throws SQLException
*/
public void run() {
try {
@@ -48,7 +45,6 @@ public final class MemoryLocalEncryptSpringNamespaceMybatisExampleService {
/**
* Initialize the database test environment.
- * @throws SQLException
*/
private void initEnvironment() {
userRepository.createTableIfNotExists();
@@ -63,21 +59,21 @@ public final class MemoryLocalEncryptSpringNamespaceMybatisExampleService {
printData();
System.out.println("-------------- Process Success Finish --------------");
}
-
+
private List<Long> insertData() {
System.out.println("---------------------------- Insert Data ----------------------------");
List<Long> result = new ArrayList<>(10);
for (int i = 1; i <= 10; i++) {
User user = new User();
user.setUserId(i);
- user.setUserName("test_mybatis_" + i);
+ user.setUsername("test_mybatis_" + i);
user.setPwd("pwd_mybatis_" + i);
userRepository.insert(user);
result.add((long) user.getUserId());
}
return result;
}
-
+
private void deleteData(final List<Long> orderIds) {
System.out.println("---------------------------- Delete Data ----------------------------");
for (Long each : orderIds) {
@@ -94,10 +90,8 @@ public final class MemoryLocalEncryptSpringNamespaceMybatisExampleService {
/**
* Restore the environment.
- * @throws SQLException
*/
private void cleanEnvironment() {
userRepository.dropTable();
}
-
}
diff --git a/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-encrypt-example/shardingsphere-jdbc-memory-local-encrypt-spring-namespace-mybatis-example/src/main/java/org/apache/shardingsphere/example/encrypt/spring/namespace/mybatis/entity/User.java b/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-loc [...]
index 03fdafd..538c8f9 100644
--- a/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-encrypt-example/shardingsphere-jdbc-memory-local-encrypt-spring-namespace-mybatis-example/src/main/java/org/apache/shardingsphere/example/encrypt/spring/namespace/mybatis/entity/User.java
+++ b/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-encrypt-example/shardingsphere-jdbc-memory-local-encrypt-spring-namespace-mybatis-example/src/main/java/org/apache/shardingsphere/example/encrypt/spring/namespace/mybatis/entity/User.java
@@ -25,7 +25,7 @@ public class User implements Serializable {
private int userId;
- private String userName;
+ private String username;
private String pwd;
@@ -37,12 +37,12 @@ public class User implements Serializable {
this.userId = userId;
}
- public String getUserName() {
- return userName;
+ public String getUsername() {
+ return username;
}
- public void setUserName(final String userName) {
- this.userName = userName;
+ public void setUsername(final String username) {
+ this.username = username;
}
public String getPwd() {
@@ -55,6 +55,6 @@ public class User implements Serializable {
@Override
public String toString() {
- return String.format("user_id: %d, user_name: %s, pwd: %s", userId, userName, pwd);
+ return String.format("user_id: %d, username: %s, pwd: %s", userId, username, pwd);
}
}
diff --git a/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-encrypt-example/shardingsphere-jdbc-memory-local-encrypt-spring-namespace-mybatis-example/src/main/resources/application.xml b/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-encrypt-example/sha [...]
index dda69bb..1d3d4cc 100644
--- a/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-encrypt-example/shardingsphere-jdbc-memory-local-encrypt-spring-namespace-mybatis-example/src/main/resources/application.xml
+++ b/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-encrypt-example/shardingsphere-jdbc-memory-local-encrypt-spring-namespace-mybatis-example/src/main/resources/application.xml
@@ -66,24 +66,23 @@
<encrypt:rule id="encryptRule">
<encrypt:table name="t_user">
- <encrypt:column logic-column="user_name" cipher-column="user_name" plain-column="user_name_plain" encrypt-algorithm-ref="name_encryptor" />
+ <encrypt:column logic-column="username" cipher-column="username" plain-column="username_plain" encrypt-algorithm-ref="name_encryptor" />
<encrypt:column logic-column="pwd" cipher-column="pwd" assisted-query-column="assisted_query_pwd" encrypt-algorithm-ref="pwd_encryptor" />
</encrypt:table>
</encrypt:rule>
<shardingsphere:data-source id="dataSource" data-source-names="demo_ds_0" rule-refs="encryptRule" />
-
<bean id="transactionManager" class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
<property name="dataSource" ref="dataSource" />
</bean>
<tx:annotation-driven />
-
+
<bean id="sqlSessionFactory" class="org.mybatis.spring.SqlSessionFactoryBean">
<property name="dataSource" ref="dataSource"/>
<property name="mapperLocations" value="classpath*:mappers/*.xml"/>
</bean>
-
+
<bean class="org.mybatis.spring.mapper.MapperScannerConfigurer">
<property name="basePackage" value="org.apache.shardingsphere.example.encrypt.spring.namespace.mybatis.repository"/>
<property name="sqlSessionFactoryBeanName" value="sqlSessionFactory"/>
diff --git a/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-encrypt-example/shardingsphere-jdbc-memory-local-encrypt-spring-namespace-mybatis-example/src/main/resources/mappers/UserMapper.xml b/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-encrypt-exam [...]
index 642c335..85ad2cc 100644
--- a/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-encrypt-example/shardingsphere-jdbc-memory-local-encrypt-spring-namespace-mybatis-example/src/main/resources/mappers/UserMapper.xml
+++ b/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-encrypt-example/shardingsphere-jdbc-memory-local-encrypt-spring-namespace-mybatis-example/src/main/resources/mappers/UserMapper.xml
@@ -20,31 +20,31 @@
<mapper namespace="org.apache.shardingsphere.example.encrypt.spring.namespace.mybatis.repository.UserRepository">
<resultMap id="baseResultMap" type="org.apache.shardingsphere.example.encrypt.spring.namespace.mybatis.entity.User">
<result column="user_id" property="userId" jdbcType="INTEGER"/>
- <result column="user_name" property="userName" jdbcType="VARCHAR"/>
+ <result column="username" property="username" jdbcType="VARCHAR"/>
<result column="pwd" property="pwd" jdbcType="VARCHAR"/>
<result column="assisted_query_pwd" property="assistedQueryPwd" jdbcType="VARCHAR"/>
</resultMap>
-
+
<update id="createTableIfNotExists">
- CREATE TABLE IF NOT EXISTS t_user (user_id INT NOT NULL AUTO_INCREMENT, user_name VARCHAR(200), pwd VARCHAR(200), PRIMARY KEY (user_id));
+ CREATE TABLE IF NOT EXISTS t_user (user_id INT NOT NULL AUTO_INCREMENT, username VARCHAR(200), pwd VARCHAR(200), PRIMARY KEY (user_id));
</update>
-
+
<update id="truncateTable">
TRUNCATE TABLE t_user;
</update>
-
+
<update id="dropTable">
DROP TABLE IF EXISTS t_user;
</update>
-
+
<insert id="insert">
- INSERT INTO t_user (user_id, user_name, pwd) VALUES (#{userId,jdbcType=INTEGER}, #{userName,jdbcType=VARCHAR}, #{pwd,jdbcType=VARCHAR})
+ INSERT INTO t_user (user_id, username, pwd) VALUES (#{userId,jdbcType=INTEGER}, #{username,jdbcType=VARCHAR}, #{pwd,jdbcType=VARCHAR})
</insert>
-
+
<delete id="delete">
DELETE FROM t_user WHERE user_id = #{userId,jdbcType=INTEGER};
</delete>
-
+
<select id="selectAll" resultMap="baseResultMap">
SELECT * FROM t_user;
</select>
diff --git a/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-shadow-example/shardingsphere-jdbc-memory-local-shadow-jdbc-example/src/main/java/org/apache/shardingsphere/example/shadow/jdbc/MemoryLocalShadowJdbcExampleService.java b/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/sharding [...]
index fa6a3e0..efb199f 100644
--- a/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-shadow-example/shardingsphere-jdbc-memory-local-shadow-jdbc-example/src/main/java/org/apache/shardingsphere/example/shadow/jdbc/MemoryLocalShadowJdbcExampleService.java
+++ b/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-shadow-example/shardingsphere-jdbc-memory-local-shadow-jdbc-example/src/main/java/org/apache/shardingsphere/example/shadow/jdbc/MemoryLocalShadowJdbcExampleService.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.example.shadow.jdbc;
-import lombok.AllArgsConstructor;
+import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.example.shadow.jdbc.entity.User;
import javax.sql.DataSource;
@@ -30,7 +30,7 @@ import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;
-@AllArgsConstructor
+@RequiredArgsConstructor
public final class MemoryLocalShadowJdbcExampleService {
private final DataSource dataSource;
@@ -38,7 +38,7 @@ public final class MemoryLocalShadowJdbcExampleService {
/**
* Execute test.
*
- * @throws SQLException
+ * @throws SQLException SQL exception
*/
public void run() throws SQLException {
try {
@@ -51,10 +51,11 @@ public final class MemoryLocalShadowJdbcExampleService {
/**
* Initialize the database test environment.
- * @throws SQLException
+ *
+ * @throws SQLException SQL exception
*/
private void initEnvironment() throws SQLException {
- String createSql = "CREATE TABLE IF NOT EXISTS t_user (user_id INT NOT NULL AUTO_INCREMENT, user_type INT(11), user_name VARCHAR(200), pwd VARCHAR(200), PRIMARY KEY (user_id))";
+ String createSql = "CREATE TABLE IF NOT EXISTS t_user (user_id INT NOT NULL AUTO_INCREMENT, user_type INT(11), username VARCHAR(200), pwd VARCHAR(200), PRIMARY KEY (user_id))";
createTableIfNotExistsShadow(createSql);
createTableIfNotExistsNative(createSql);
String truncateSql = "TRUNCATE TABLE t_user";
@@ -106,7 +107,7 @@ public final class MemoryLocalShadowJdbcExampleService {
User user = new User();
user.setUserId(i);
user.setUserType(i % 2);
- user.setUserName("test_" + i);
+ user.setUsername("test_" + i);
user.setPwd("pwd" + i);
insert(user);
result.add((long) user.getUserId());
@@ -115,12 +116,12 @@ public final class MemoryLocalShadowJdbcExampleService {
}
public void insert(final User entity) throws SQLException {
- String sql = "INSERT INTO t_user (user_id, user_type, user_name, pwd) VALUES (?, ?, ?, ?)";
+ String sql = "INSERT INTO t_user (user_id, user_type, username, pwd) VALUES (?, ?, ?, ?)";
try (Connection connection = dataSource.getConnection();
PreparedStatement preparedStatement = connection.prepareStatement(sql)) {
preparedStatement.setInt(1, entity.getUserId());
preparedStatement.setInt(2, entity.getUserType());
- preparedStatement.setString(3, entity.getUserName());
+ preparedStatement.setString(3, entity.getUsername());
preparedStatement.setString(4, entity.getPwd());
preparedStatement.executeUpdate();
}
@@ -143,7 +144,8 @@ public final class MemoryLocalShadowJdbcExampleService {
/**
* Restore the environment.
- * @throws SQLException
+ *
+ * @throws SQLException SQL exception
*/
private void cleanEnvironment() throws SQLException {
String sql = "DROP TABLE IF EXISTS t_user;";
@@ -191,7 +193,7 @@ public final class MemoryLocalShadowJdbcExampleService {
User user = new User();
user.setUserId(resultSet.getInt("user_id"));
user.setUserType(resultSet.getInt("user_type"));
- user.setUserName(resultSet.getString("user_name"));
+ user.setUsername(resultSet.getString("username"));
user.setPwd(resultSet.getString("pwd"));
result.add(user);
}
diff --git a/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-shadow-example/shardingsphere-jdbc-memory-local-shadow-jdbc-example/src/main/java/org/apache/shardingsphere/example/shadow/jdbc/entity/User.java b/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local [...]
index bbb1619..e5ced92 100644
--- a/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-shadow-example/shardingsphere-jdbc-memory-local-shadow-jdbc-example/src/main/java/org/apache/shardingsphere/example/shadow/jdbc/entity/User.java
+++ b/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-shadow-example/shardingsphere-jdbc-memory-local-shadow-jdbc-example/src/main/java/org/apache/shardingsphere/example/shadow/jdbc/entity/User.java
@@ -27,7 +27,7 @@ public class User implements Serializable {
private int userType;
- private String userName;
+ private String username;
private String pwd;
@@ -47,12 +47,12 @@ public class User implements Serializable {
this.userType = userType;
}
- public String getUserName() {
- return userName;
+ public String getUsername() {
+ return username;
}
- public void setUserName(final String userName) {
- this.userName = userName;
+ public void setUsername(final String username) {
+ this.username = username;
}
public String getPwd() {
@@ -65,6 +65,6 @@ public class User implements Serializable {
@Override
public String toString() {
- return String.format("user_id: %d, user_name: %s, pwd: %s", userId, userName, pwd);
+ return String.format("user_id: %d, username: %s, pwd: %s", userId, username, pwd);
}
}
diff --git a/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-shadow-example/shardingsphere-jdbc-memory-local-shadow-spring-boot-starter-jdbc-example/src/main/java/org/apache/shardingsphere/example/shadow/spring/boot/starter/jdbc/MemoryLocalShadowSpringBootStarterJdbcExampleService.java b/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory- [...]
index c58c4a6..991aeda 100644
--- a/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-shadow-example/shardingsphere-jdbc-memory-local-shadow-spring-boot-starter-jdbc-example/src/main/java/org/apache/shardingsphere/example/shadow/spring/boot/starter/jdbc/MemoryLocalShadowSpringBootStarterJdbcExampleService.java
+++ b/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-shadow-example/shardingsphere-jdbc-memory-local-shadow-spring-boot-starter-jdbc-example/src/main/java/org/apache/shardingsphere/example/shadow/spring/boot/starter/jdbc/MemoryLocalShadowSpringBootStarterJdbcExampleService.java
@@ -40,7 +40,7 @@ public final class MemoryLocalShadowSpringBootStarterJdbcExampleService {
/**
* Execute test.
*
- * @throws SQLException
+ * @throws SQLException SQL exception
*/
public void run() throws SQLException {
try {
@@ -53,10 +53,11 @@ public final class MemoryLocalShadowSpringBootStarterJdbcExampleService {
/**
* Initialize the database test environment.
- * @throws SQLException
+ *
+ * @throws SQLException SQL exception
*/
private void initEnvironment() throws SQLException {
- String createSql = "CREATE TABLE IF NOT EXISTS t_user (user_id INT NOT NULL AUTO_INCREMENT, user_type INT(11), user_name VARCHAR(200), pwd VARCHAR(200), PRIMARY KEY (user_id))";
+ String createSql = "CREATE TABLE IF NOT EXISTS t_user (user_id INT NOT NULL AUTO_INCREMENT, user_type INT(11), username VARCHAR(200), pwd VARCHAR(200), PRIMARY KEY (user_id))";
createTableIfNotExistsShadow(createSql);
createTableIfNotExistsNative(createSql);
String truncateSql = "TRUNCATE TABLE t_user";
@@ -108,7 +109,7 @@ public final class MemoryLocalShadowSpringBootStarterJdbcExampleService {
User user = new User();
user.setUserId(i);
user.setUserType(i % 2);
- user.setUserName("test_" + i);
+ user.setUsername("test_" + i);
user.setPwd("pwd" + i);
insert(user);
result.add((long) user.getUserId());
@@ -117,12 +118,12 @@ public final class MemoryLocalShadowSpringBootStarterJdbcExampleService {
}
public void insert(final User entity) throws SQLException {
- String sql = "INSERT INTO t_user (user_id, user_type, user_name, pwd) VALUES (?, ?, ?, ?)";
+ String sql = "INSERT INTO t_user (user_id, user_type, username, pwd) VALUES (?, ?, ?, ?)";
try (Connection connection = dataSource.getConnection();
PreparedStatement preparedStatement = connection.prepareStatement(sql)) {
preparedStatement.setInt(1, entity.getUserId());
preparedStatement.setInt(2, entity.getUserType());
- preparedStatement.setString(3, entity.getUserName());
+ preparedStatement.setString(3, entity.getUsername());
preparedStatement.setString(4, entity.getPwd());
preparedStatement.executeUpdate();
}
@@ -145,7 +146,8 @@ public final class MemoryLocalShadowSpringBootStarterJdbcExampleService {
/**
* Restore the environment.
- * @throws SQLException
+ *
+ * @throws SQLException SQL exception
*/
private void cleanEnvironment() throws SQLException {
String sql = "DROP TABLE IF EXISTS t_user;";
@@ -193,7 +195,7 @@ public final class MemoryLocalShadowSpringBootStarterJdbcExampleService {
User user = new User();
user.setUserId(resultSet.getInt("user_id"));
user.setUserType(resultSet.getInt("user_type"));
- user.setUserName(resultSet.getString("user_name"));
+ user.setUsername(resultSet.getString("username"));
user.setPwd(resultSet.getString("pwd"));
result.add(user);
}
diff --git a/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-shadow-example/shardingsphere-jdbc-memory-local-shadow-spring-boot-starter-jdbc-example/src/main/java/org/apache/shardingsphere/example/shadow/spring/boot/starter/jdbc/entity/User.java b/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local- [...]
index 7bbc9b6..dbc9365 100644
--- a/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-shadow-example/shardingsphere-jdbc-memory-local-shadow-spring-boot-starter-jdbc-example/src/main/java/org/apache/shardingsphere/example/shadow/spring/boot/starter/jdbc/entity/User.java
+++ b/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-shadow-example/shardingsphere-jdbc-memory-local-shadow-spring-boot-starter-jdbc-example/src/main/java/org/apache/shardingsphere/example/shadow/spring/boot/starter/jdbc/entity/User.java
@@ -24,10 +24,10 @@ public class User implements Serializable {
private static final long serialVersionUID = 263434701950670170L;
private int userId;
-
+
private int userType;
- private String userName;
+ private String username;
private String pwd;
@@ -38,21 +38,21 @@ public class User implements Serializable {
public void setUserId(final int userId) {
this.userId = userId;
}
-
+
public int getUserType() {
return userType;
}
-
+
public void setUserType(final int userType) {
this.userType = userType;
}
- public String getUserName() {
- return userName;
+ public String getUsername() {
+ return username;
}
- public void setUserName(final String userName) {
- this.userName = userName;
+ public void setUsername(final String username) {
+ this.username = username;
}
public String getPwd() {
@@ -65,6 +65,6 @@ public class User implements Serializable {
@Override
public String toString() {
- return String.format("user_id: %d, user_name: %s, pwd: %s", userId, userName, pwd);
+ return String.format("user_id: %d, username: %s, pwd: %s", userId, username, pwd);
}
}
diff --git a/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-shadow-example/shardingsphere-jdbc-memory-local-shadow-spring-boot-starter-mybatis-example/src/main/java/org/apache/shardingsphere/example/shadow/spring/boot/starter/mybatis/MemoryLocalShadowSpringBootStarterMybatisExampleService.java b/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdb [...]
index abfccf0..246bf72 100644
--- a/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-shadow-example/shardingsphere-jdbc-memory-local-shadow-spring-boot-starter-mybatis-example/src/main/java/org/apache/shardingsphere/example/shadow/spring/boot/starter/mybatis/MemoryLocalShadowSpringBootStarterMybatisExampleService.java
+++ b/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-shadow-example/shardingsphere-jdbc-memory-local-shadow-spring-boot-starter-mybatis-example/src/main/java/org/apache/shardingsphere/example/shadow/spring/boot/starter/mybatis/MemoryLocalShadowSpringBootStarterMybatisExampleService.java
@@ -22,20 +22,17 @@ import org.apache.shardingsphere.example.shadow.spring.boot.starter.mybatis.repo
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
-import java.sql.SQLException;
import java.util.ArrayList;
import java.util.List;
@Service
public final class MemoryLocalShadowSpringBootStarterMybatisExampleService {
-
+
@Resource
private UserRepository userRepository;
-
+
/**
* Execute test.
- *
- * @throws SQLException
*/
public void run() {
try {
@@ -48,7 +45,6 @@ public final class MemoryLocalShadowSpringBootStarterMybatisExampleService {
/**
* Initialize the database test environment.
- * @throws SQLException
*/
private void initEnvironment() {
userRepository.createTableIfNotExists();
@@ -63,7 +59,7 @@ public final class MemoryLocalShadowSpringBootStarterMybatisExampleService {
printData();
System.out.println("-------------- Process Success Finish --------------");
}
-
+
private List<Long> insertData() {
System.out.println("---------------------------- Insert Data ----------------------------");
List<Long> result = new ArrayList<>(10);
@@ -71,14 +67,14 @@ public final class MemoryLocalShadowSpringBootStarterMybatisExampleService {
User user = new User();
user.setUserId(i);
user.setUserType(i % 2);
- user.setUserName("test_" + i);
+ user.setUsername("test_" + i);
user.setPwd("pwd" + i);
userRepository.insert(user);
result.add((long) user.getUserId());
}
return result;
}
-
+
private void deleteData(final List<Long> orderIds) {
System.out.println("---------------------------- Delete Data ----------------------------");
for (Long each : orderIds) {
@@ -95,7 +91,6 @@ public final class MemoryLocalShadowSpringBootStarterMybatisExampleService {
/**
* Restore the environment.
- * @throws SQLException
*/
private void cleanEnvironment() {
userRepository.dropTable();
diff --git a/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-shadow-example/shardingsphere-jdbc-memory-local-shadow-spring-boot-starter-mybatis-example/src/main/java/org/apache/shardingsphere/example/shadow/spring/boot/starter/mybatis/entity/User.java b/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory- [...]
index 8e6822f..41bdf05 100644
--- a/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-shadow-example/shardingsphere-jdbc-memory-local-shadow-spring-boot-starter-mybatis-example/src/main/java/org/apache/shardingsphere/example/shadow/spring/boot/starter/mybatis/entity/User.java
+++ b/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-shadow-example/shardingsphere-jdbc-memory-local-shadow-spring-boot-starter-mybatis-example/src/main/java/org/apache/shardingsphere/example/shadow/spring/boot/starter/mybatis/entity/User.java
@@ -24,10 +24,10 @@ public class User implements Serializable {
private static final long serialVersionUID = 263434701950670170L;
private int userId;
-
+
private int userType;
- private String userName;
+ private String username;
private String pwd;
@@ -38,21 +38,21 @@ public class User implements Serializable {
public void setUserId(final int userId) {
this.userId = userId;
}
-
+
public int getUserType() {
return userType;
}
-
+
public void setUserType(final int userType) {
this.userType = userType;
}
- public String getUserName() {
- return userName;
+ public String getUsername() {
+ return username;
}
- public void setUserName(final String userName) {
- this.userName = userName;
+ public void setUsername(final String username) {
+ this.username = username;
}
public String getPwd() {
@@ -65,6 +65,6 @@ public class User implements Serializable {
@Override
public String toString() {
- return String.format("user_id: %d, user_name: %s, pwd: %s", userId, userName, pwd);
+ return String.format("user_id: %d, username: %s, pwd: %s", userId, username, pwd);
}
}
diff --git a/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-shadow-example/shardingsphere-jdbc-memory-local-shadow-spring-boot-starter-mybatis-example/src/main/resources/mappers/UserMapper.xml b/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-shadow-exam [...]
index 3f6e683..95dc2b1 100644
--- a/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-shadow-example/shardingsphere-jdbc-memory-local-shadow-spring-boot-starter-mybatis-example/src/main/resources/mappers/UserMapper.xml
+++ b/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-shadow-example/shardingsphere-jdbc-memory-local-shadow-spring-boot-starter-mybatis-example/src/main/resources/mappers/UserMapper.xml
@@ -21,16 +21,16 @@
<resultMap id="baseResultMap" type="org.apache.shardingsphere.example.shadow.spring.boot.starter.mybatis.entity.User">
<result column="user_id" property="userId" jdbcType="INTEGER"/>
<result column="user_type" property="userType" jdbcType="INTEGER"/>
- <result column="user_name" property="userName" jdbcType="VARCHAR"/>
+ <result column="username" property="username" jdbcType="VARCHAR"/>
<result column="pwd" property="pwd" jdbcType="VARCHAR"/>
</resultMap>
<update id="createTableIfNotExistsNative">
- CREATE TABLE IF NOT EXISTS t_user (user_id INT NOT NULL AUTO_INCREMENT, user_type INT(11), user_name VARCHAR(200), pwd VARCHAR(200), PRIMARY KEY (user_id));
+ CREATE TABLE IF NOT EXISTS t_user (user_id INT NOT NULL AUTO_INCREMENT, user_type INT(11), username VARCHAR(200), pwd VARCHAR(200), PRIMARY KEY (user_id));
</update>
<update id="createTableIfNotExistsShadow">
- CREATE TABLE IF NOT EXISTS t_user (user_id INT NOT NULL AUTO_INCREMENT, user_type INT(11), user_name VARCHAR(200), pwd VARCHAR(200), PRIMARY KEY (user_id)) /*shadow:true,foo:bar*/;
+ CREATE TABLE IF NOT EXISTS t_user (user_id INT NOT NULL AUTO_INCREMENT, user_type INT(11), username VARCHAR(200), pwd VARCHAR(200), PRIMARY KEY (user_id)) /*shadow:true,foo:bar*/;
</update>
<update id="truncateTableNative">
@@ -50,7 +50,7 @@
</update>
<insert id="insert">
- INSERT INTO t_user (user_id, user_type, user_name, pwd) VALUES (#{userId,jdbcType=INTEGER}, #{userType,jdbcType=INTEGER}, #{userName,jdbcType=VARCHAR}, #{pwd,jdbcType=VARCHAR})
+ INSERT INTO t_user (user_id, user_type, username, pwd) VALUES (#{userId,jdbcType=INTEGER}, #{userType,jdbcType=INTEGER}, #{username,jdbcType=VARCHAR}, #{pwd,jdbcType=VARCHAR})
</insert>
<delete id="deleteByUserIdAndUserType">
diff --git a/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-shadow-example/shardingsphere-jdbc-memory-local-shadow-spring-namespace-jdbc-example/src/main/java/org/apache/shardingsphere/example/shadow/spring/namespace/jdbc/MemoryLocalShadowSpringNamespaceJdbcExampleService.java b/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/ [...]
index e9148cd..7ea8991 100644
--- a/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-shadow-example/shardingsphere-jdbc-memory-local-shadow-spring-namespace-jdbc-example/src/main/java/org/apache/shardingsphere/example/shadow/spring/namespace/jdbc/MemoryLocalShadowSpringNamespaceJdbcExampleService.java
+++ b/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-shadow-example/shardingsphere-jdbc-memory-local-shadow-spring-namespace-jdbc-example/src/main/java/org/apache/shardingsphere/example/shadow/spring/namespace/jdbc/MemoryLocalShadowSpringNamespaceJdbcExampleService.java
@@ -36,11 +36,11 @@ import java.util.List;
public final class MemoryLocalShadowSpringNamespaceJdbcExampleService {
private final DataSource dataSource;
-
+
/**
* Execute test.
*
- * @throws SQLException
+ * @throws SQLException SQL exception
*/
public void run() throws SQLException {
try {
@@ -53,10 +53,11 @@ public final class MemoryLocalShadowSpringNamespaceJdbcExampleService {
/**
* Initialize the database test environment.
- * @throws SQLException
+ *
+ * @throws SQLException SQL exception
*/
private void initEnvironment() throws SQLException {
- String createSql = "CREATE TABLE IF NOT EXISTS t_user (user_id INT NOT NULL AUTO_INCREMENT, user_type INT(11), user_name VARCHAR(200), pwd VARCHAR(200), PRIMARY KEY (user_id))";
+ String createSql = "CREATE TABLE IF NOT EXISTS t_user (user_id INT NOT NULL AUTO_INCREMENT, user_type INT(11), username VARCHAR(200), pwd VARCHAR(200), PRIMARY KEY (user_id))";
createTableIfNotExistsShadow(createSql);
createTableIfNotExistsNative(createSql);
String truncateSql = "TRUNCATE TABLE t_user";
@@ -108,7 +109,7 @@ public final class MemoryLocalShadowSpringNamespaceJdbcExampleService {
User user = new User();
user.setUserId(i);
user.setUserType(i % 2);
- user.setUserName("test_" + i);
+ user.setUsername("test_" + i);
user.setPwd("pwd" + i);
insert(user);
result.add((long) user.getUserId());
@@ -117,12 +118,12 @@ public final class MemoryLocalShadowSpringNamespaceJdbcExampleService {
}
public void insert(final User entity) throws SQLException {
- String sql = "INSERT INTO t_user (user_id, user_type, user_name, pwd) VALUES (?, ?, ?, ?)";
+ String sql = "INSERT INTO t_user (user_id, user_type, username, pwd) VALUES (?, ?, ?, ?)";
try (Connection connection = dataSource.getConnection();
PreparedStatement preparedStatement = connection.prepareStatement(sql)) {
preparedStatement.setInt(1, entity.getUserId());
preparedStatement.setInt(2, entity.getUserType());
- preparedStatement.setString(3, entity.getUserName());
+ preparedStatement.setString(3, entity.getUsername());
preparedStatement.setString(4, entity.getPwd());
preparedStatement.executeUpdate();
}
@@ -145,7 +146,8 @@ public final class MemoryLocalShadowSpringNamespaceJdbcExampleService {
/**
* Restore the environment.
- * @throws SQLException
+ *
+ * @throws SQLException SQL exception
*/
private void cleanEnvironment() throws SQLException {
String sql = "DROP TABLE IF EXISTS t_user;";
@@ -159,7 +161,7 @@ public final class MemoryLocalShadowSpringNamespaceJdbcExampleService {
statement.executeUpdate(sql);
}
}
-
+
private void dropTableShadow(final String sql) throws SQLException {
try (Connection connection = dataSource.getConnection();
Statement statement = connection.createStatement()) {
@@ -182,7 +184,7 @@ public final class MemoryLocalShadowSpringNamespaceJdbcExampleService {
users.addAll(getUsers(sql, 0));
return users;
}
-
+
private List<User> getUsers(final String sql, final int userType) throws SQLException {
List<User> result = new LinkedList<>();
try (Connection connection = dataSource.getConnection();
@@ -193,7 +195,7 @@ public final class MemoryLocalShadowSpringNamespaceJdbcExampleService {
User user = new User();
user.setUserId(resultSet.getInt("user_id"));
user.setUserType(resultSet.getInt("user_type"));
- user.setUserName(resultSet.getString("user_name"));
+ user.setUsername(resultSet.getString("username"));
user.setPwd(resultSet.getString("pwd"));
result.add(user);
}
diff --git a/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-shadow-example/shardingsphere-jdbc-memory-local-shadow-spring-namespace-jdbc-example/src/main/java/org/apache/shardingsphere/example/shadow/spring/namespace/jdbc/entity/User.java b/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-exampl [...]
index 1a60d20..1ad4bbb 100644
--- a/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-shadow-example/shardingsphere-jdbc-memory-local-shadow-spring-namespace-jdbc-example/src/main/java/org/apache/shardingsphere/example/shadow/spring/namespace/jdbc/entity/User.java
+++ b/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-shadow-example/shardingsphere-jdbc-memory-local-shadow-spring-namespace-jdbc-example/src/main/java/org/apache/shardingsphere/example/shadow/spring/namespace/jdbc/entity/User.java
@@ -27,7 +27,7 @@ public class User implements Serializable {
private int userType;
- private String userName;
+ private String username;
private String pwd;
@@ -47,12 +47,12 @@ public class User implements Serializable {
this.userType = userType;
}
- public String getUserName() {
- return userName;
+ public String getUsername() {
+ return username;
}
- public void setUserName(final String userName) {
- this.userName = userName;
+ public void setUsername(final String username) {
+ this.username = username;
}
public String getPwd() {
@@ -65,6 +65,6 @@ public class User implements Serializable {
@Override
public String toString() {
- return String.format("user_id: %d, user_name: %s, pwd: %s", userId, userName, pwd);
+ return String.format("user_id: %d, username: %s, pwd: %s", userId, username, pwd);
}
}
diff --git a/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-shadow-example/shardingsphere-jdbc-memory-local-shadow-spring-namespace-mybatis-example/src/main/java/org/apache/shardingsphere/example/shadow/spring/namespace/mybatis/MemoryLocalShadowSpringNamespaceMybatisExampleService.java b/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory [...]
index 06a1268e..bb3ea66 100644
--- a/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-shadow-example/shardingsphere-jdbc-memory-local-shadow-spring-namespace-mybatis-example/src/main/java/org/apache/shardingsphere/example/shadow/spring/namespace/mybatis/MemoryLocalShadowSpringNamespaceMybatisExampleService.java
+++ b/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-shadow-example/shardingsphere-jdbc-memory-local-shadow-spring-namespace-mybatis-example/src/main/java/org/apache/shardingsphere/example/shadow/spring/namespace/mybatis/MemoryLocalShadowSpringNamespaceMybatisExampleService.java
@@ -22,7 +22,6 @@ import org.apache.shardingsphere.example.shadow.spring.namespace.mybatis.reposit
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
-import java.sql.SQLException;
import java.util.ArrayList;
import java.util.List;
@@ -34,8 +33,6 @@ public final class MemoryLocalShadowSpringNamespaceMybatisExampleService {
/**
* Execute test.
- *
- * @throws SQLException
*/
public void run() {
try {
@@ -48,7 +45,6 @@ public final class MemoryLocalShadowSpringNamespaceMybatisExampleService {
/**
* Initialize the database test environment.
- * @throws SQLException
*/
private void initEnvironment() {
userRepository.createTableIfNotExists();
@@ -71,7 +67,7 @@ public final class MemoryLocalShadowSpringNamespaceMybatisExampleService {
User user = new User();
user.setUserId(i);
user.setUserType(i % 2);
- user.setUserName("test_" + i);
+ user.setUsername("test_" + i);
user.setPwd("pwd" + i);
userRepository.insert(user);
result.add((long) user.getUserId());
@@ -95,7 +91,6 @@ public final class MemoryLocalShadowSpringNamespaceMybatisExampleService {
/**
* Restore the environment.
- * @throws SQLException
*/
private void cleanEnvironment() {
userRepository.dropTable();
diff --git a/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-shadow-example/shardingsphere-jdbc-memory-local-shadow-spring-namespace-mybatis-example/src/main/java/org/apache/shardingsphere/example/shadow/spring/namespace/mybatis/entity/User.java b/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local- [...]
index a40b649..8c184e2 100644
--- a/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-shadow-example/shardingsphere-jdbc-memory-local-shadow-spring-namespace-mybatis-example/src/main/java/org/apache/shardingsphere/example/shadow/spring/namespace/mybatis/entity/User.java
+++ b/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-shadow-example/shardingsphere-jdbc-memory-local-shadow-spring-namespace-mybatis-example/src/main/java/org/apache/shardingsphere/example/shadow/spring/namespace/mybatis/entity/User.java
@@ -27,7 +27,7 @@ public class User implements Serializable {
private int userType;
- private String userName;
+ private String username;
private String pwd;
@@ -47,12 +47,12 @@ public class User implements Serializable {
this.userType = userType;
}
- public String getUserName() {
- return userName;
+ public String getUsername() {
+ return username;
}
- public void setUserName(final String userName) {
- this.userName = userName;
+ public void setUsername(final String username) {
+ this.username = username;
}
public String getPwd() {
@@ -65,6 +65,6 @@ public class User implements Serializable {
@Override
public String toString() {
- return String.format("user_id: %d, user_name: %s, pwd: %s", userId, userName, pwd);
+ return String.format("user_id: %d, username: %s, pwd: %s", userId, username, pwd);
}
}
diff --git a/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-shadow-example/shardingsphere-jdbc-memory-local-shadow-spring-namespace-mybatis-example/src/main/resources/mappers/UserMapper.xml b/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-shadow-example [...]
index c686da9..4cbf4b3 100644
--- a/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-shadow-example/shardingsphere-jdbc-memory-local-shadow-spring-namespace-mybatis-example/src/main/resources/mappers/UserMapper.xml
+++ b/examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-shadow-example/shardingsphere-jdbc-memory-local-shadow-spring-namespace-mybatis-example/src/main/resources/mappers/UserMapper.xml
@@ -21,16 +21,16 @@
<resultMap id="baseResultMap" type="org.apache.shardingsphere.example.shadow.spring.namespace.mybatis.entity.User">
<result column="user_id" property="userId" jdbcType="INTEGER"/>
<result column="user_type" property="userType" jdbcType="INTEGER"/>
- <result column="user_name" property="userName" jdbcType="VARCHAR"/>
+ <result column="username" property="username" jdbcType="VARCHAR"/>
<result column="pwd" property="pwd" jdbcType="VARCHAR"/>
</resultMap>
<update id="createTableIfNotExistsNative">
- CREATE TABLE IF NOT EXISTS t_user (user_id INT NOT NULL AUTO_INCREMENT, user_type INT(11), user_name VARCHAR(200), pwd VARCHAR(200), PRIMARY KEY (user_id));
+ CREATE TABLE IF NOT EXISTS t_user (user_id INT NOT NULL AUTO_INCREMENT, user_type INT(11), username VARCHAR(200), pwd VARCHAR(200), PRIMARY KEY (user_id));
</update>
<update id="createTableIfNotExistsShadow">
- CREATE TABLE IF NOT EXISTS t_user (user_id INT NOT NULL AUTO_INCREMENT, user_type INT(11), user_name VARCHAR(200), pwd VARCHAR(200), PRIMARY KEY (user_id)) /*shadow:true,foo:bar*/;
+ CREATE TABLE IF NOT EXISTS t_user (user_id INT NOT NULL AUTO_INCREMENT, user_type INT(11), username VARCHAR(200), pwd VARCHAR(200), PRIMARY KEY (user_id)) /*shadow:true,foo:bar*/;
</update>
<update id="truncateTableNative">
@@ -50,7 +50,7 @@
</update>
<insert id="insert">
- INSERT INTO t_user (user_id, user_type, user_name, pwd) VALUES (#{userId,jdbcType=INTEGER}, #{userType,jdbcType=INTEGER}, #{userName,jdbcType=VARCHAR}, #{pwd,jdbcType=VARCHAR})
+ INSERT INTO t_user (user_id, user_type, username, pwd) VALUES (#{userId,jdbcType=INTEGER}, #{userType,jdbcType=INTEGER}, #{username,jdbcType=VARCHAR}, #{pwd,jdbcType=VARCHAR})
</insert>
<delete id="deleteByUserIdAndUserType">
diff --git a/examples/src/resources/manual_schema.sql b/examples/src/resources/manual_schema.sql
index 868846d..41ecaf7 100644
--- a/examples/src/resources/manual_schema.sql
+++ b/examples/src/resources/manual_schema.sql
@@ -84,5 +84,5 @@ CREATE SCHEMA IF NOT EXISTS demo_read_ds;
-- CREATE TABLE IF NOT EXISTS demo_write_ds_1_read_1.t_order_item_0 (order_item_id BIGINT NOT NULL AUTO_INCREMENT, order_id BIGINT NOT NULL, user_id INT NOT NULL, status VARCHAR(50), PRIMARY KEY (order_item_id));
-- CREATE TABLE IF NOT EXISTS demo_write_ds_1_read_1.t_order_item_1 (order_item_id BIGINT NOT NULL AUTO_INCREMENT, order_id BIGINT NOT NULL, user_id INT NOT NULL, status VARCHAR(50), PRIMARY KEY (order_item_id));
--- CREATE TABLE IF NOT EXISTS demo_shadow_read_ds.t_user (user_id INT NOT NULL AUTO_INCREMENT, user_name VARCHAR(200), user_name_plain VARCHAR(200), pwd VARCHAR(200), assisted_query_pwd VARCHAR(200), PRIMARY KEY (user_id));
--- CREATE TABLE IF NOT EXISTS demo_read_ds.t_user (user_id INT NOT NULL AUTO_INCREMENT, user_name VARCHAR(200), user_name_plain VARCHAR(200), pwd VARCHAR(200), assisted_query_pwd VARCHAR(200), PRIMARY KEY (user_id));
+-- CREATE TABLE IF NOT EXISTS demo_shadow_read_ds.t_user (user_id INT NOT NULL AUTO_INCREMENT, username VARCHAR(200), username_plain VARCHAR(200), pwd VARCHAR(200), assisted_query_pwd VARCHAR(200), PRIMARY KEY (user_id));
+-- CREATE TABLE IF NOT EXISTS demo_read_ds.t_user (user_id INT NOT NULL AUTO_INCREMENT, username VARCHAR(200), username_plain VARCHAR(200), pwd VARCHAR(200), assisted_query_pwd VARCHAR(200), PRIMARY KEY (user_id));
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/antlr4/imports/mysql/BaseRule.g4 b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/antlr4/imports/mysql/BaseRule.g4
index d07e1bd..5a6764d 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/antlr4/imports/mysql/BaseRule.g4
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/antlr4/imports/mysql/BaseRule.g4
@@ -650,7 +650,7 @@ userIdentifierOrText
: textOrIdentifier (AT_ textOrIdentifier)?
;
-userName
+username
: userIdentifierOrText | CURRENT_USER (LP_ RP_)?
;
@@ -729,7 +729,7 @@ port
;
cloneInstance
- : userName AT_ hostname COLON_ port
+ : username AT_ hostname COLON_ port
;
cloneDir
@@ -769,7 +769,7 @@ tableOrTables
;
userOrRole
- : userName | roleName
+ : username | roleName
;
partitionName
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/antlr4/imports/mysql/DALStatement.g4 b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/antlr4/imports/mysql/DALStatement.g4
index b0a62e3..f4d7bd8 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/antlr4/imports/mysql/DALStatement.g4
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/antlr4/imports/mysql/DALStatement.g4
@@ -139,7 +139,7 @@ showCreateTrigger
;
showCreateUser
- : SHOW CREATE USER userName
+ : SHOW CREATE USER username
;
showCreateView
@@ -175,7 +175,7 @@ showFunctionStatus
;
showGrant
- : SHOW GRANTS (FOR userName (USING userName (COMMA_ userName)+)?)?
+ : SHOW GRANTS (FOR username (USING username (COMMA_ username)+)?)?
;
showMasterStatus
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/antlr4/imports/mysql/DCLStatement.g4 b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/antlr4/imports/mysql/DCLStatement.g4
index eca5a20..bdf8a4a 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/antlr4/imports/mysql/DCLStatement.g4
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/antlr4/imports/mysql/DCLStatement.g4
@@ -23,7 +23,7 @@ grant
: GRANT roleOrPrivileges TO userList withGrantOption? # grantRoleOrPrivilegeTo
| GRANT roleOrPrivileges ON aclType? grantIdentifier TO userList withGrantOption? grantAs? # grantRoleOrPrivilegeOnTo
| GRANT ALL PRIVILEGES? ON aclType? grantIdentifier TO userList withGrantOption? grantAs? # grantRoleOrPrivilegeOnTo
- | GRANT PROXY ON userName TO userList withGrantOption? # grantProxy
+ | GRANT PROXY ON username TO userList withGrantOption? # grantProxy
;
revoke
@@ -31,11 +31,11 @@ revoke
| REVOKE roleOrPrivileges ON aclType? grantIdentifier FROM userList # revokeOnFrom
| REVOKE ALL PRIVILEGES? ON aclType? grantIdentifier FROM userList # revokeOnFrom
| REVOKE ALL PRIVILEGES? COMMA_ GRANT OPTION FROM userList # revokeFrom
- | REVOKE PROXY ON userName FROM userList # revokeOnFrom
+ | REVOKE PROXY ON username FROM userList # revokeOnFrom
;
userList
- : userName (COMMA_ userName)*
+ : username (COMMA_ username)*
;
roleOrPrivileges
@@ -95,13 +95,13 @@ createUser
;
createUserEntry
- : userName # createUserEntryNoOption
- | userName IDENTIFIED BY string_ # createUserEntryIdentifiedBy
- | userName IDENTIFIED BY RANDOM PASSWORD # createUserEntryIdentifiedBy
- | userName IDENTIFIED WITH textOrIdentifier # createUserEntryIdentifiedWith
- | userName IDENTIFIED WITH textOrIdentifier AS string_ # createUserEntryIdentifiedWith
- | userName IDENTIFIED WITH textOrIdentifier BY string_ # createUserEntryIdentifiedWith
- | userName IDENTIFIED WITH textOrIdentifier BY RANDOM PASSWORD # createUserEntryIdentifiedWith
+ : username # createUserEntryNoOption
+ | username IDENTIFIED BY string_ # createUserEntryIdentifiedBy
+ | username IDENTIFIED BY RANDOM PASSWORD # createUserEntryIdentifiedBy
+ | username IDENTIFIED WITH textOrIdentifier # createUserEntryIdentifiedWith
+ | username IDENTIFIED WITH textOrIdentifier AS string_ # createUserEntryIdentifiedWith
+ | username IDENTIFIED WITH textOrIdentifier BY string_ # createUserEntryIdentifiedWith
+ | username IDENTIFIED WITH textOrIdentifier BY RANDOM PASSWORD # createUserEntryIdentifiedWith
;
createUserList
@@ -137,11 +137,11 @@ accountLockPasswordExpireOption
alterUser
: ALTER USER (IF EXISTS)? alterUserList requireClause? connectOptions? accountLockPasswordExpireOptions?
| ALTER USER (IF EXISTS)? USER LP_ RP_ userFuncAuthOption
- | ALTER USER (IF EXISTS)? userName DEFAULT ROLE (NONE | ALL | roleName (COMMA_ roleName)*)
+ | ALTER USER (IF EXISTS)? username DEFAULT ROLE (NONE | ALL | roleName (COMMA_ roleName)*)
;
alterUserEntry
- : userName userAuthOption?
+ : username userAuthOption?
;
alterUserList
@@ -149,7 +149,7 @@ alterUserList
;
dropUser
- : DROP USER (IF EXISTS)? userName (COMMA_ userName)*
+ : DROP USER (IF EXISTS)? username (COMMA_ username)*
;
createRole
@@ -161,11 +161,11 @@ dropRole
;
renameUser
- : RENAME USER userName TO userName (COMMA_ userName TO userName)*
+ : RENAME USER username TO username (COMMA_ username TO username)*
;
setDefaultRole
- : SET DEFAULT ROLE (NONE | ALL | roleName (COMMA_ roleName)*) TO userName (COMMA_ userName)*
+ : SET DEFAULT ROLE (NONE | ALL | roleName (COMMA_ roleName)*) TO username (COMMA_ username)*
;
setRole
@@ -173,7 +173,7 @@ setRole
;
setPassword
- : SET PASSWORD (FOR userName)? authOption (REPLACE string_)? (RETAIN CURRENT PASSWORD)?
+ : SET PASSWORD (FOR username)? authOption (REPLACE string_)? (RETAIN CURRENT PASSWORD)?
;
authOption
@@ -193,7 +193,7 @@ roles
;
grantAs
- : AS userName withRoles?
+ : AS username withRoles?
;
withRoles
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/antlr4/imports/mysql/DDLStatement.g4 b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/antlr4/imports/mysql/DDLStatement.g4
index e7f76c8..304f58b 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/antlr4/imports/mysql/DDLStatement.g4
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/antlr4/imports/mysql/DDLStatement.g4
@@ -617,7 +617,7 @@ subpartitionDefinition
;
ownerStatement
- : DEFINER EQ_ (userName | CURRENT_USER ( LP_ RP_)?)
+ : DEFINER EQ_ (username | CURRENT_USER ( LP_ RP_)?)
;
scheduleExpression
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/impl/MySQLDALStatementSQLVisitor.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/impl/MySQLDALStatementSQLVisitor.java
index 7b972c3..67b746e 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/impl/MySQLDALStatementSQLVisitor.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/impl/MySQLDALStatementSQLVisitor.java
@@ -490,7 +490,7 @@ public final class MySQLDALStatementSQLVisitor extends MySQLStatementSQLVisitor
if (null != ctx.cloneInstance()) {
CloneInstanceContext cloneInstance = ctx.cloneInstance();
CloneInstanceSegment cloneInstanceSegment = new CloneInstanceSegment(cloneInstance.start.getStartIndex(), cloneInstance.stop.getStopIndex());
- cloneInstanceSegment.setUserName(((StringLiteralValue) visitUserName(cloneInstance.userName())).getValue());
+ cloneInstanceSegment.setUsername(((StringLiteralValue) visitUsername(cloneInstance.username())).getValue());
cloneInstanceSegment.setHostname(((StringLiteralValue) visit(cloneInstance.hostname())).getValue());
cloneInstanceSegment.setPort(new NumberLiteralValue(cloneInstance.port().NUMBER_().getText()).getValue().intValue());
cloneInstanceSegment.setPassword(((StringLiteralValue) visit(ctx.string_())).getValue());
@@ -809,7 +809,7 @@ public final class MySQLDALStatementSQLVisitor extends MySQLStatementSQLVisitor
@Override
public ASTNode visitShowCreateUser(final ShowCreateUserContext ctx) {
MySQLShowCreateUserStatement result = new MySQLShowCreateUserStatement();
- result.setName(((IdentifierValue) visit(ctx.userName())).getValue());
+ result.setName(((IdentifierValue) visit(ctx.username())).getValue());
return result;
}
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/impl/MySQLDCLStatementSQLVisitor.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/impl/MySQLDCLStatementSQLVisitor.java
index dc33cb5..780730c 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/impl/MySQLDCLStatementSQLVisitor.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/impl/MySQLDCLStatementSQLVisitor.java
@@ -87,7 +87,7 @@ import org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.StaticP
import org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.StaticPrivilegeUpdateContext;
import org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.StaticPrivilegeUsageContext;
import org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.TlsOptionContext;
-import org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.UserNameContext;
+import org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.UsernameContext;
import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.ACLTypeEnum;
import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.GrantLevelSegment;
import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.PrivilegeTypeEnum;
@@ -132,7 +132,7 @@ public final class MySQLDCLStatementSQLVisitor extends MySQLStatementSQLVisitor
public ASTNode visitGrantRoleOrPrivilegeTo(final GrantRoleOrPrivilegeToContext ctx) {
MySQLGrantStatement result = new MySQLGrantStatement();
fillRoleOrPrivileges(result, ctx.roleOrPrivileges());
- for (UserNameContext each : ctx.userList().userName()) {
+ for (UsernameContext each : ctx.userList().username()) {
result.getUsers().add((UserSegment) visit(each));
}
return result;
@@ -147,7 +147,7 @@ public final class MySQLDCLStatementSQLVisitor extends MySQLStatementSQLVisitor
result.setAllPrivileges(true);
}
result.setLevel(generateGrantLevel(ctx.grantIdentifier()));
- for (UserNameContext each : ctx.userList().userName()) {
+ for (UsernameContext each : ctx.userList().username()) {
result.getUsers().add((UserSegment) visit(each));
}
if (null != ctx.aclType()) {
@@ -171,7 +171,7 @@ public final class MySQLDCLStatementSQLVisitor extends MySQLStatementSQLVisitor
MySQLGrantStatement result = new MySQLGrantStatement();
MySQLPrivilegeSegment privilege = new MySQLPrivilegeSegment(ctx.PROXY().getSymbol().getStartIndex(), ctx.PROXY().getSymbol().getStopIndex(), PrivilegeTypeEnum.GRANT);
result.getRoleOrPrivileges().add(new MySQLRoleOrPrivilegeSegment(ctx.start.getStartIndex(), ctx.stop.getStopIndex(), null, null, privilege));
- for (UserNameContext each : ctx.userList().userName()) {
+ for (UsernameContext each : ctx.userList().username()) {
result.getUsers().add((UserSegment) visit(each));
}
return result;
@@ -440,7 +440,7 @@ public final class MySQLDCLStatementSQLVisitor extends MySQLStatementSQLVisitor
} else if (null != ctx.ALL()) {
result.setAllPrivileges(true);
}
- for (UserNameContext each : ctx.userList().userName()) {
+ for (UsernameContext each : ctx.userList().username()) {
result.getFromUsers().add((UserSegment) visit(each));
}
return result;
@@ -456,12 +456,12 @@ public final class MySQLDCLStatementSQLVisitor extends MySQLStatementSQLVisitor
} else if (null != ctx.PROXY()) {
MySQLPrivilegeSegment privilege = new MySQLPrivilegeSegment(ctx.start.getStartIndex(), ctx.stop.getStopIndex(), PrivilegeTypeEnum.DROP_ROLE);
result.getRoleOrPrivileges().add(new MySQLRoleOrPrivilegeSegment(ctx.start.getStartIndex(), ctx.stop.getStopIndex(), null, null, privilege));
- result.setOnUser((UserSegment) visit(ctx.userName()));
+ result.setOnUser((UserSegment) visit(ctx.username()));
}
if (null != ctx.grantIdentifier()) {
result.setLevel(generateGrantLevel(ctx.grantIdentifier()));
}
- for (UserNameContext each : ctx.userList().userName()) {
+ for (UsernameContext each : ctx.userList().username()) {
result.getFromUsers().add((UserSegment) visit(each));
}
return result;
@@ -542,7 +542,7 @@ public final class MySQLDCLStatementSQLVisitor extends MySQLStatementSQLVisitor
@Override
public ASTNode visitCreateUserEntryNoOption(final CreateUserEntryNoOptionContext ctx) {
- UserSegment result = (UserSegment) visit(ctx.userName());
+ UserSegment result = (UserSegment) visit(ctx.username());
result.setStartIndex(ctx.start.getStartIndex());
result.setStopIndex(ctx.stop.getStopIndex());
return result;
@@ -550,7 +550,7 @@ public final class MySQLDCLStatementSQLVisitor extends MySQLStatementSQLVisitor
@Override
public ASTNode visitCreateUserEntryIdentifiedBy(final CreateUserEntryIdentifiedByContext ctx) {
- UserSegment result = (UserSegment) visit(ctx.userName());
+ UserSegment result = (UserSegment) visit(ctx.username());
result.setStartIndex(ctx.start.getStartIndex());
result.setStopIndex(ctx.stop.getStopIndex());
if (null != ctx.string_()) {
@@ -570,7 +570,7 @@ public final class MySQLDCLStatementSQLVisitor extends MySQLStatementSQLVisitor
@Override
public ASTNode visitCreateUserEntryIdentifiedWith(final CreateUserEntryIdentifiedWithContext ctx) {
- UserSegment result = (UserSegment) visit(ctx.userName());
+ UserSegment result = (UserSegment) visit(ctx.username());
result.setStartIndex(ctx.start.getStartIndex());
result.setStopIndex(ctx.stop.getStopIndex());
if (null != ctx.textOrIdentifier()) {
@@ -709,7 +709,7 @@ public final class MySQLDCLStatementSQLVisitor extends MySQLStatementSQLVisitor
}
@Override
- public ASTNode visitUserName(final UserNameContext ctx) {
+ public ASTNode visitUsername(final UsernameContext ctx) {
UserSegment result = new UserSegment();
if (null != ctx.userIdentifierOrText()) {
result.setUser(new IdentifierValue(ctx.userIdentifierOrText().textOrIdentifier(0).getText()).getValue());
@@ -723,7 +723,7 @@ public final class MySQLDCLStatementSQLVisitor extends MySQLStatementSQLVisitor
@Override
public ASTNode visitDropUser(final DropUserContext ctx) {
MySQLDropUserStatement result = new MySQLDropUserStatement();
- result.getUsers().addAll(ctx.userName().stream().map(UserNameContext::getText).collect(Collectors.toList()));
+ result.getUsers().addAll(ctx.username().stream().map(UsernameContext::getText).collect(Collectors.toList()));
return result;
}
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-oracle/src/main/antlr4/imports/oracle/BaseRule.g4 b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-oracle/src/main/antlr4/imports/oracle/BaseRule.g4
index ab251f0..dd5a073 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-oracle/src/main/antlr4/imports/oracle/BaseRule.g4
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-oracle/src/main/antlr4/imports/oracle/BaseRule.g4
@@ -303,7 +303,7 @@ roleName
: identifier
;
-userName
+username
: identifier
;
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-oracle/src/main/antlr4/imports/oracle/DDLStatement.g4 b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-oracle/src/main/antlr4/imports/oracle/DDLStatement.g4
index 0a07503..6c940d4 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-oracle/src/main/antlr4/imports/oracle/DDLStatement.g4
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-oracle/src/main/antlr4/imports/oracle/DDLStatement.g4
@@ -1862,11 +1862,11 @@ noAudit
;
auditPolicyClause
- : POLICY policyName (byUsersWithRoles | (BY | EXCEPT) userName (COMMA_ userName)*)? (WHENEVER NOT? SUCCESSFUL)?
+ : POLICY policyName (byUsersWithRoles | (BY | EXCEPT) username (COMMA_ username)*)? (WHENEVER NOT? SUCCESSFUL)?
;
noAuditPolicyClause
- : POLICY policyName (byUsersWithRoles | BY userName (COMMA_ userName)*)? (WHENEVER NOT? SUCCESSFUL)?
+ : POLICY policyName (byUsersWithRoles | BY username (COMMA_ username)*)? (WHENEVER NOT? SUCCESSFUL)?
;
byUsersWithRoles
@@ -1874,7 +1874,7 @@ byUsersWithRoles
;
contextClause
- : contextNamespaceAttributesClause (COMMA_ contextNamespaceAttributesClause)* (BY userName (COMMA_ userName)*)?
+ : contextNamespaceAttributesClause (COMMA_ contextNamespaceAttributesClause)* (BY username (COMMA_ username)*)?
;
contextNamespaceAttributesClause
@@ -1921,8 +1921,8 @@ renameToTable
purge
: PURGE (TABLE tableName
| INDEX indexName
- | TABLESPACE tablespaceName (USER userName)?
- | TABLESPACE SET tablespaceSetName (USER userName)?
+ | TABLESPACE tablespaceName (USER username)?
+ | TABLESPACE SET tablespaceSetName (USER username)?
| RECYCLEBIN
| DBA_RECYCLEBIN)
;
@@ -2016,9 +2016,9 @@ createDatabaseLink
;
connectToClause
- : CONNECT TO (CURRENT_USER | userName IDENTIFIED BY password dbLinkAuthentication?)
+ : CONNECT TO (CURRENT_USER | username IDENTIFIED BY password dbLinkAuthentication?)
;
dbLinkAuthentication
- : AUTHENTICATED BY userName IDENTIFIED BY password
+ : AUTHENTICATED BY username IDENTIFIED BY password
;
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/mysql/segment/CloneInstanceSegment.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/mysql/segment/CloneInstanceSegment.java
index 3bb21f7..d036c8f 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/mysql/segment/CloneInstanceSegment.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/mysql/segment/CloneInstanceSegment.java
@@ -27,22 +27,22 @@ import org.apache.shardingsphere.sql.parser.sql.common.segment.SQLSegment;
* Clone instance segment.
*/
@RequiredArgsConstructor
-@ToString
@Getter
@Setter
+@ToString
public final class CloneInstanceSegment implements SQLSegment {
-
+
private final int startIndex;
-
+
private final int stopIndex;
-
- private String userName;
-
+
+ private String username;
+
private String hostname;
-
+
private String password;
-
+
private int port;
-
+
private boolean sslRequired;
}
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/dbtbl_with_readwrite_splitting_and_encrypt/dataset.xml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/dbtbl_with_readwrite_splitting_and_encrypt/dataset.xml
index abd4572..a123e3e 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/dbtbl_with_readwrite_splitting_and_encrypt/dataset.xml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/dbtbl_with_readwrite_splitting_and_encrypt/dataset.xml
@@ -61,13 +61,13 @@
<column name="user_id" type="numeric" />
<column name="plain_pwd" type="varchar" />
<column name="cipher_pwd" type="varchar" />
- <column name="user_name" type="varchar" />
+ <column name="username" type="varchar" />
</metadata>
<metadata data-nodes="encrypt_write_ds_1.t_user_encrypt_federate,encrypt_read_ds_1.t_user_encrypt_federate">
<column name="user_id" type="numeric" />
<column name="plain_pwd" type="varchar" />
<column name="cipher_pwd" type="varchar" />
- <column name="user_name" type="varchar" />
+ <column name="username" type="varchar" />
</metadata>
<metadata data-nodes="encrypt_write_ds_1.t_user_info,encrypt_read_ds_1.t_user_info">
<column name="user_id" type="numeric" />
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/dbtbl_with_readwrite_splitting_and_encrypt/init-sql/h2/init-encrypt_read_ds_1.sql b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/dbtbl_with_readwrite_splitting_and_encrypt/init-sql/h2/init-encrypt_read_ds_1.sql
index f8c6ed5..947799f 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/dbtbl_with_readwrite_splitting_and_encrypt/init-sql/h2/init-encrypt_read_ds_1.sql
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/dbtbl_with_readwrite_splitting_and_encrypt/init-sql/h2/init-encrypt_read_ds_1.sql
@@ -30,7 +30,7 @@ CREATE TABLE t_order_item_federate_sharding_0 (item_id INT NOT NULL, order_id IN
CREATE TABLE t_order_item_federate_sharding_1 (item_id INT NOT NULL, order_id INT NOT NULL, user_id INT NOT NULL, status VARCHAR(45) NULL, remarks VARCHAR(45) NULL, PRIMARY KEY (item_id));
CREATE TABLE t_order_federate_sharding_0 (order_id_sharding INT NOT NULL, user_id INT NOT NULL, status VARCHAR(45) NULL, PRIMARY KEY (order_id_sharding));
CREATE TABLE t_order_federate_sharding_1 (order_id_sharding INT NOT NULL, user_id INT NOT NULL, status VARCHAR(45) NULL, PRIMARY KEY (order_id_sharding));
-CREATE TABLE t_user_encrypt_federate_sharding_0 (user_id INT NOT NULL, plain_pwd VARCHAR(45) NULL, cipher_pwd VARCHAR(45) NULL, user_name VARCHAR(45) NULL, PRIMARY KEY (user_id));
-CREATE TABLE t_user_encrypt_federate_sharding_1 (user_id INT NOT NULL, plain_pwd VARCHAR(45) NULL, cipher_pwd VARCHAR(45) NULL, user_name VARCHAR(45) NULL, PRIMARY KEY (user_id));
-CREATE TABLE t_user_encrypt_federate (user_id INT NOT NULL, plain_pwd VARCHAR(45) NULL, cipher_pwd VARCHAR(45) NULL, user_name VARCHAR(45) NULL, PRIMARY KEY (user_id));
+CREATE TABLE t_user_encrypt_federate_sharding_0 (user_id INT NOT NULL, plain_pwd VARCHAR(45) NULL, cipher_pwd VARCHAR(45) NULL, username VARCHAR(45) NULL, PRIMARY KEY (user_id));
+CREATE TABLE t_user_encrypt_federate_sharding_1 (user_id INT NOT NULL, plain_pwd VARCHAR(45) NULL, cipher_pwd VARCHAR(45) NULL, username VARCHAR(45) NULL, PRIMARY KEY (user_id));
+CREATE TABLE t_user_encrypt_federate (user_id INT NOT NULL, plain_pwd VARCHAR(45) NULL, cipher_pwd VARCHAR(45) NULL, username VARCHAR(45) NULL, PRIMARY KEY (user_id));
CREATE TABLE t_user_info (user_id INT NOT NULL, information VARCHAR(45) NULL, PRIMARY KEY (user_id));
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/dbtbl_with_readwrite_splitting_and_encrypt/init-sql/h2/init-encrypt_write_ds_1.sql b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/dbtbl_with_readwrite_splitting_and_encrypt/init-sql/h2/init-encrypt_write_ds_1.sql
index f8c6ed5..947799f 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/dbtbl_with_readwrite_splitting_and_encrypt/init-sql/h2/init-encrypt_write_ds_1.sql
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/dbtbl_with_readwrite_splitting_and_encrypt/init-sql/h2/init-encrypt_write_ds_1.sql
@@ -30,7 +30,7 @@ CREATE TABLE t_order_item_federate_sharding_0 (item_id INT NOT NULL, order_id IN
CREATE TABLE t_order_item_federate_sharding_1 (item_id INT NOT NULL, order_id INT NOT NULL, user_id INT NOT NULL, status VARCHAR(45) NULL, remarks VARCHAR(45) NULL, PRIMARY KEY (item_id));
CREATE TABLE t_order_federate_sharding_0 (order_id_sharding INT NOT NULL, user_id INT NOT NULL, status VARCHAR(45) NULL, PRIMARY KEY (order_id_sharding));
CREATE TABLE t_order_federate_sharding_1 (order_id_sharding INT NOT NULL, user_id INT NOT NULL, status VARCHAR(45) NULL, PRIMARY KEY (order_id_sharding));
-CREATE TABLE t_user_encrypt_federate_sharding_0 (user_id INT NOT NULL, plain_pwd VARCHAR(45) NULL, cipher_pwd VARCHAR(45) NULL, user_name VARCHAR(45) NULL, PRIMARY KEY (user_id));
-CREATE TABLE t_user_encrypt_federate_sharding_1 (user_id INT NOT NULL, plain_pwd VARCHAR(45) NULL, cipher_pwd VARCHAR(45) NULL, user_name VARCHAR(45) NULL, PRIMARY KEY (user_id));
-CREATE TABLE t_user_encrypt_federate (user_id INT NOT NULL, plain_pwd VARCHAR(45) NULL, cipher_pwd VARCHAR(45) NULL, user_name VARCHAR(45) NULL, PRIMARY KEY (user_id));
+CREATE TABLE t_user_encrypt_federate_sharding_0 (user_id INT NOT NULL, plain_pwd VARCHAR(45) NULL, cipher_pwd VARCHAR(45) NULL, username VARCHAR(45) NULL, PRIMARY KEY (user_id));
+CREATE TABLE t_user_encrypt_federate_sharding_1 (user_id INT NOT NULL, plain_pwd VARCHAR(45) NULL, cipher_pwd VARCHAR(45) NULL, username VARCHAR(45) NULL, PRIMARY KEY (user_id));
+CREATE TABLE t_user_encrypt_federate (user_id INT NOT NULL, plain_pwd VARCHAR(45) NULL, cipher_pwd VARCHAR(45) NULL, username VARCHAR(45) NULL, PRIMARY KEY (user_id));
CREATE TABLE t_user_info (user_id INT NOT NULL, information VARCHAR(45) NULL, PRIMARY KEY (user_id));
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/dbtbl_with_readwrite_splitting_and_encrypt/init-sql/mysql/init.sql b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/dbtbl_with_readwrite_splitting_and_encrypt/init-sql/mysql/init.sql
index 8dc4ca9..03aad6f 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/dbtbl_with_readwrite_splitting_and_encrypt/init-sql/mysql/init.sql
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/dbtbl_with_readwrite_splitting_and_encrypt/init-sql/mysql/init.sql
@@ -121,9 +121,9 @@ CREATE TABLE encrypt_write_ds_1.t_order_item_federate_sharding_0 (item_id INT NO
CREATE TABLE encrypt_write_ds_1.t_order_item_federate_sharding_1 (item_id INT NOT NULL, order_id INT NOT NULL, user_id INT NOT NULL, status VARCHAR(45) NULL, remarks VARCHAR(45) NULL, PRIMARY KEY (item_id));
CREATE TABLE encrypt_write_ds_1.t_order_federate_sharding_0 (order_id_sharding INT NOT NULL, user_id INT NOT NULL, status VARCHAR(45) NULL, PRIMARY KEY (order_id_sharding));
CREATE TABLE encrypt_write_ds_1.t_order_federate_sharding_1 (order_id_sharding INT NOT NULL, user_id INT NOT NULL, status VARCHAR(45) NULL, PRIMARY KEY (order_id_sharding));
-CREATE TABLE encrypt_write_ds_1.t_user_encrypt_federate_sharding_0 (user_id INT NOT NULL, plain_pwd VARCHAR(45) NULL, cipher_pwd VARCHAR(45) NULL, user_name VARCHAR(45) NULL, PRIMARY KEY (user_id));
-CREATE TABLE encrypt_write_ds_1.t_user_encrypt_federate_sharding_1 (user_id INT NOT NULL, plain_pwd VARCHAR(45) NULL, cipher_pwd VARCHAR(45) NULL, user_name VARCHAR(45) NULL, PRIMARY KEY (user_id));
-CREATE TABLE encrypt_write_ds_1.t_user_encrypt_federate (user_id INT NOT NULL, plain_pwd VARCHAR(45) NULL, cipher_pwd VARCHAR(45) NULL, user_name VARCHAR(45) NULL, PRIMARY KEY (user_id));
+CREATE TABLE encrypt_write_ds_1.t_user_encrypt_federate_sharding_0 (user_id INT NOT NULL, plain_pwd VARCHAR(45) NULL, cipher_pwd VARCHAR(45) NULL, username VARCHAR(45) NULL, PRIMARY KEY (user_id));
+CREATE TABLE encrypt_write_ds_1.t_user_encrypt_federate_sharding_1 (user_id INT NOT NULL, plain_pwd VARCHAR(45) NULL, cipher_pwd VARCHAR(45) NULL, username VARCHAR(45) NULL, PRIMARY KEY (user_id));
+CREATE TABLE encrypt_write_ds_1.t_user_encrypt_federate (user_id INT NOT NULL, plain_pwd VARCHAR(45) NULL, cipher_pwd VARCHAR(45) NULL, username VARCHAR(45) NULL, PRIMARY KEY (user_id));
CREATE TABLE encrypt_write_ds_1.t_user_info (user_id INT NOT NULL, information VARCHAR(45) NULL, PRIMARY KEY (user_id));
CREATE INDEX user_index_t_user_0 ON encrypt_write_ds_1.t_user_0 (user_id);
CREATE INDEX user_index_t_user_1 ON encrypt_write_ds_1.t_user_1 (user_id);
@@ -442,9 +442,9 @@ CREATE TABLE encrypt_read_ds_1.t_order_item_federate_sharding_0 (item_id INT NOT
CREATE TABLE encrypt_read_ds_1.t_order_item_federate_sharding_1 (item_id INT NOT NULL, order_id INT NOT NULL, user_id INT NOT NULL, status VARCHAR(45) NULL, remarks VARCHAR(45) NULL, PRIMARY KEY (item_id));
CREATE TABLE encrypt_read_ds_1.t_order_federate_sharding_0 (order_id_sharding INT NOT NULL, user_id INT NOT NULL, status VARCHAR(45) NULL, PRIMARY KEY (order_id_sharding));
CREATE TABLE encrypt_read_ds_1.t_order_federate_sharding_1 (order_id_sharding INT NOT NULL, user_id INT NOT NULL, status VARCHAR(45) NULL, PRIMARY KEY (order_id_sharding));
-CREATE TABLE encrypt_read_ds_1.t_user_encrypt_federate_sharding_0 (user_id INT NOT NULL, plain_pwd VARCHAR(45) NULL, cipher_pwd VARCHAR(45) NULL, user_name VARCHAR(45) NULL, PRIMARY KEY (user_id));
-CREATE TABLE encrypt_read_ds_1.t_user_encrypt_federate_sharding_1 (user_id INT NOT NULL, plain_pwd VARCHAR(45) NULL, cipher_pwd VARCHAR(45) NULL, user_name VARCHAR(45) NULL, PRIMARY KEY (user_id));
-CREATE TABLE encrypt_read_ds_1.t_user_encrypt_federate (user_id INT NOT NULL, plain_pwd VARCHAR(45) NULL, cipher_pwd VARCHAR(45) NULL, user_name VARCHAR(45) NULL, PRIMARY KEY (user_id));
+CREATE TABLE encrypt_read_ds_1.t_user_encrypt_federate_sharding_0 (user_id INT NOT NULL, plain_pwd VARCHAR(45) NULL, cipher_pwd VARCHAR(45) NULL, username VARCHAR(45) NULL, PRIMARY KEY (user_id));
+CREATE TABLE encrypt_read_ds_1.t_user_encrypt_federate_sharding_1 (user_id INT NOT NULL, plain_pwd VARCHAR(45) NULL, cipher_pwd VARCHAR(45) NULL, username VARCHAR(45) NULL, PRIMARY KEY (user_id));
+CREATE TABLE encrypt_read_ds_1.t_user_encrypt_federate (user_id INT NOT NULL, plain_pwd VARCHAR(45) NULL, cipher_pwd VARCHAR(45) NULL, username VARCHAR(45) NULL, PRIMARY KEY (user_id));
CREATE TABLE encrypt_read_ds_1.t_user_info (user_id INT NOT NULL, information VARCHAR(45) NULL, PRIMARY KEY (user_id));
CREATE INDEX user_index_t_user_0 ON encrypt_read_ds_1.t_user_0 (user_id);
CREATE INDEX user_index_t_user_1 ON encrypt_read_ds_1.t_user_1 (user_id);
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/dbtbl_with_readwrite_splitting_and_encrypt/init-sql/oracle/init.sql b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/dbtbl_with_readwrite_splitting_and_encrypt/init-sql/oracle/init.sql
index e8cc648..c04c101 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/dbtbl_with_readwrite_splitting_and_encrypt/init-sql/oracle/init.sql
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/dbtbl_with_readwrite_splitting_and_encrypt/init-sql/oracle/init.sql
@@ -118,9 +118,9 @@ CREATE TABLE encrypt_write_ds_1.t_order_item_federate_sharding_0 (item_id INT NO
CREATE TABLE encrypt_write_ds_1.t_order_item_federate_sharding_1 (item_id INT NOT NULL, order_id INT NOT NULL, user_id INT NOT NULL, status VARCHAR(45) NULL, remarks VARCHAR(45) NULL, PRIMARY KEY (item_id));
CREATE TABLE encrypt_write_ds_1.t_order_federate_sharding_0 (order_id_sharding INT NOT NULL, user_id INT NOT NULL, status VARCHAR(45) NULL, PRIMARY KEY (order_id_sharding));
CREATE TABLE encrypt_write_ds_1.t_order_federate_sharding_1 (order_id_sharding INT NOT NULL, user_id INT NOT NULL, status VARCHAR(45) NULL, PRIMARY KEY (order_id_sharding));
-CREATE TABLE encrypt_write_ds_1.t_user_encrypt_federate_sharding_0 (user_id INT NOT NULL, plain_pwd VARCHAR(45) NULL, cipher_pwd VARCHAR(45) NULL, user_name VARCHAR(45) NULL, PRIMARY KEY (user_id));
-CREATE TABLE encrypt_write_ds_1.t_user_encrypt_federate_sharding_1 (user_id INT NOT NULL, plain_pwd VARCHAR(45) NULL, cipher_pwd VARCHAR(45) NULL, user_name VARCHAR(45) NULL, PRIMARY KEY (user_id));
-CREATE TABLE encrypt_write_ds_1.t_user_encrypt_federate (user_id INT NOT NULL, plain_pwd VARCHAR(45) NULL, cipher_pwd VARCHAR(45) NULL, user_name VARCHAR(45) NULL, PRIMARY KEY (user_id));
+CREATE TABLE encrypt_write_ds_1.t_user_encrypt_federate_sharding_0 (user_id INT NOT NULL, plain_pwd VARCHAR(45) NULL, cipher_pwd VARCHAR(45) NULL, username VARCHAR(45) NULL, PRIMARY KEY (user_id));
+CREATE TABLE encrypt_write_ds_1.t_user_encrypt_federate_sharding_1 (user_id INT NOT NULL, plain_pwd VARCHAR(45) NULL, cipher_pwd VARCHAR(45) NULL, username VARCHAR(45) NULL, PRIMARY KEY (user_id));
+CREATE TABLE encrypt_write_ds_1.t_user_encrypt_federate (user_id INT NOT NULL, plain_pwd VARCHAR(45) NULL, cipher_pwd VARCHAR(45) NULL, username VARCHAR(45) NULL, PRIMARY KEY (user_id));
CREATE TABLE encrypt_write_ds_1.t_user_info (user_id INT NOT NULL, information VARCHAR(45) NULL, PRIMARY KEY (user_id));
CREATE INDEX user_index_t_user_0 ON encrypt_write_ds_1.t_user_0 (user_id);
CREATE INDEX user_index_t_user_1 ON encrypt_write_ds_1.t_user_1 (user_id);
@@ -439,9 +439,9 @@ CREATE TABLE encrypt_read_ds_1.t_order_item_federate_sharding_0 (item_id INT NOT
CREATE TABLE encrypt_read_ds_1.t_order_item_federate_sharding_1 (item_id INT NOT NULL, order_id INT NOT NULL, user_id INT NOT NULL, status VARCHAR(45) NULL, remarks VARCHAR(45) NULL, PRIMARY KEY (item_id));
CREATE TABLE encrypt_read_ds_1.t_order_federate_sharding_0 (order_id_sharding INT NOT NULL, user_id INT NOT NULL, status VARCHAR(45) NULL, PRIMARY KEY (order_id_sharding));
CREATE TABLE encrypt_read_ds_1.t_order_federate_sharding_1 (order_id_sharding INT NOT NULL, user_id INT NOT NULL, status VARCHAR(45) NULL, PRIMARY KEY (order_id_sharding));
-CREATE TABLE encrypt_read_ds_1.t_user_encrypt_federate_sharding_0 (user_id INT NOT NULL, plain_pwd VARCHAR(45) NULL, cipher_pwd VARCHAR(45) NULL, user_name VARCHAR(45) NULL, PRIMARY KEY (user_id));
-CREATE TABLE encrypt_read_ds_1.t_user_encrypt_federate_sharding_1 (user_id INT NOT NULL, plain_pwd VARCHAR(45) NULL, cipher_pwd VARCHAR(45) NULL, user_name VARCHAR(45) NULL, PRIMARY KEY (user_id));
-CREATE TABLE encrypt_read_ds_1.t_user_encrypt_federate (user_id INT NOT NULL, plain_pwd VARCHAR(45) NULL, cipher_pwd VARCHAR(45) NULL, user_name VARCHAR(45) NULL, PRIMARY KEY (user_id));
+CREATE TABLE encrypt_read_ds_1.t_user_encrypt_federate_sharding_0 (user_id INT NOT NULL, plain_pwd VARCHAR(45) NULL, cipher_pwd VARCHAR(45) NULL, username VARCHAR(45) NULL, PRIMARY KEY (user_id));
+CREATE TABLE encrypt_read_ds_1.t_user_encrypt_federate_sharding_1 (user_id INT NOT NULL, plain_pwd VARCHAR(45) NULL, cipher_pwd VARCHAR(45) NULL, username VARCHAR(45) NULL, PRIMARY KEY (user_id));
+CREATE TABLE encrypt_read_ds_1.t_user_encrypt_federate (user_id INT NOT NULL, plain_pwd VARCHAR(45) NULL, cipher_pwd VARCHAR(45) NULL, username VARCHAR(45) NULL, PRIMARY KEY (user_id));
CREATE TABLE encrypt_read_ds_1.t_user_info (user_id INT NOT NULL, information VARCHAR(45) NULL, PRIMARY KEY (user_id));
CREATE INDEX user_index_t_user_0 ON encrypt_read_ds_1.t_user_0 (user_id);
CREATE INDEX user_index_t_user_1 ON encrypt_read_ds_1.t_user_1 (user_id);
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/dbtbl_with_readwrite_splitting_and_encrypt/init-sql/postgresql/init.sql b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/dbtbl_with_readwrite_splitting_and_encrypt/init-sql/postgresql/init.sql
index c9e1e2d..60ce846 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/dbtbl_with_readwrite_splitting_and_encrypt/init-sql/postgresql/init.sql
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/dbtbl_with_readwrite_splitting_and_encrypt/init-sql/postgresql/init.sql
@@ -172,9 +172,9 @@ CREATE TABLE t_order_item_federate_sharding_0 (item_id INT NOT NULL, order_id IN
CREATE TABLE t_order_item_federate_sharding_1 (item_id INT NOT NULL, order_id INT NOT NULL, user_id INT NOT NULL, status VARCHAR(45) NULL, remarks VARCHAR(45) NULL, PRIMARY KEY (item_id));
CREATE TABLE t_order_federate_sharding_0 (order_id_sharding INT NOT NULL, user_id INT NOT NULL, status VARCHAR(45) NULL, PRIMARY KEY (order_id_sharding));
CREATE TABLE t_order_federate_sharding_1 (order_id_sharding INT NOT NULL, user_id INT NOT NULL, status VARCHAR(45) NULL, PRIMARY KEY (order_id_sharding));
-CREATE TABLE t_user_encrypt_federate_sharding_0 (user_id INT NOT NULL, plain_pwd VARCHAR(45) NULL, cipher_pwd VARCHAR(45) NULL, user_name VARCHAR(45) NULL, PRIMARY KEY (user_id));
-CREATE TABLE t_user_encrypt_federate_sharding_1 (user_id INT NOT NULL, plain_pwd VARCHAR(45) NULL, cipher_pwd VARCHAR(45) NULL, user_name VARCHAR(45) NULL, PRIMARY KEY (user_id));
-CREATE TABLE t_user_encrypt_federate (user_id INT NOT NULL, plain_pwd VARCHAR(45) NULL, cipher_pwd VARCHAR(45) NULL, user_name VARCHAR(45) NULL, PRIMARY KEY (user_id));
+CREATE TABLE t_user_encrypt_federate_sharding_0 (user_id INT NOT NULL, plain_pwd VARCHAR(45) NULL, cipher_pwd VARCHAR(45) NULL, username VARCHAR(45) NULL, PRIMARY KEY (user_id));
+CREATE TABLE t_user_encrypt_federate_sharding_1 (user_id INT NOT NULL, plain_pwd VARCHAR(45) NULL, cipher_pwd VARCHAR(45) NULL, username VARCHAR(45) NULL, PRIMARY KEY (user_id));
+CREATE TABLE t_user_encrypt_federate (user_id INT NOT NULL, plain_pwd VARCHAR(45) NULL, cipher_pwd VARCHAR(45) NULL, username VARCHAR(45) NULL, PRIMARY KEY (user_id));
CREATE TABLE t_user_info (user_id INT NOT NULL, information VARCHAR(45) NULL, PRIMARY KEY (user_id));
CREATE INDEX user_index_t_user_0 ON t_user_0 (user_id);
CREATE INDEX user_index_t_user_1 ON t_user_1 (user_id);
@@ -735,9 +735,9 @@ CREATE TABLE t_order_item_federate_sharding_0 (item_id INT NOT NULL, order_id IN
CREATE TABLE t_order_item_federate_sharding_1 (item_id INT NOT NULL, order_id INT NOT NULL, user_id INT NOT NULL, status VARCHAR(45) NULL, remarks VARCHAR(45) NULL, PRIMARY KEY (item_id));
CREATE TABLE t_order_federate_sharding_0 (order_id_sharding INT NOT NULL, user_id INT NOT NULL, status VARCHAR(45) NULL, PRIMARY KEY (order_id_sharding));
CREATE TABLE t_order_federate_sharding_1 (order_id_sharding INT NOT NULL, user_id INT NOT NULL, status VARCHAR(45) NULL, PRIMARY KEY (order_id_sharding));
-CREATE TABLE t_user_encrypt_federate_sharding_0 (user_id INT NOT NULL, plain_pwd VARCHAR(45) NULL, cipher_pwd VARCHAR(45) NULL, user_name VARCHAR(45) NULL, PRIMARY KEY (user_id));
-CREATE TABLE t_user_encrypt_federate_sharding_1 (user_id INT NOT NULL, plain_pwd VARCHAR(45) NULL, cipher_pwd VARCHAR(45) NULL, user_name VARCHAR(45) NULL, PRIMARY KEY (user_id));
-CREATE TABLE t_user_encrypt_federate (user_id INT NOT NULL, plain_pwd VARCHAR(45) NULL, cipher_pwd VARCHAR(45) NULL, user_name VARCHAR(45) NULL, PRIMARY KEY (user_id));
+CREATE TABLE t_user_encrypt_federate_sharding_0 (user_id INT NOT NULL, plain_pwd VARCHAR(45) NULL, cipher_pwd VARCHAR(45) NULL, username VARCHAR(45) NULL, PRIMARY KEY (user_id));
+CREATE TABLE t_user_encrypt_federate_sharding_1 (user_id INT NOT NULL, plain_pwd VARCHAR(45) NULL, cipher_pwd VARCHAR(45) NULL, username VARCHAR(45) NULL, PRIMARY KEY (user_id));
+CREATE TABLE t_user_encrypt_federate (user_id INT NOT NULL, plain_pwd VARCHAR(45) NULL, cipher_pwd VARCHAR(45) NULL, username VARCHAR(45) NULL, PRIMARY KEY (user_id));
CREATE TABLE t_user_info (user_id INT NOT NULL, information VARCHAR(45) NULL, PRIMARY KEY (user_id));
CREATE INDEX user_index_t_user_0 ON t_user_0 (user_id);
CREATE INDEX user_index_t_user_1 ON t_user_1 (user_id);
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/dbtbl_with_readwrite_splitting_and_encrypt/init-sql/sqlserver/init.sql b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/dbtbl_with_readwrite_splitting_and_encrypt/init-sql/sqlserver/init.sql
index b3a67f7..52ec27b 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/dbtbl_with_readwrite_splitting_and_encrypt/init-sql/sqlserver/init.sql
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/dbtbl_with_readwrite_splitting_and_encrypt/init-sql/sqlserver/init.sql
@@ -118,9 +118,9 @@ CREATE TABLE encrypt_write_ds_1.t_order_item_federate_sharding_0 (item_id INT NO
CREATE TABLE encrypt_write_ds_1.t_order_item_federate_sharding_1 (item_id INT NOT NULL, order_id INT NOT NULL, user_id INT NOT NULL, status VARCHAR(45) NULL, remarks VARCHAR(45) NULL, PRIMARY KEY (item_id));
CREATE TABLE encrypt_write_ds_1.t_order_federate_sharding_0 (order_id_sharding INT NOT NULL, user_id INT NOT NULL, status VARCHAR(45) NULL, PRIMARY KEY (order_id_sharding));
CREATE TABLE encrypt_write_ds_1.t_order_federate_sharding_1 (order_id_sharding INT NOT NULL, user_id INT NOT NULL, status VARCHAR(45) NULL, PRIMARY KEY (order_id_sharding));
-CREATE TABLE encrypt_write_ds_1.t_user_encrypt_federate_sharding_0 (user_id INT NOT NULL, plain_pwd VARCHAR(45) NULL, cipher_pwd VARCHAR(45) NULL, user_name VARCHAR(45) NULL, PRIMARY KEY (user_id));
-CREATE TABLE encrypt_write_ds_1.t_user_encrypt_federate_sharding_1 (user_id INT NOT NULL, plain_pwd VARCHAR(45) NULL, cipher_pwd VARCHAR(45) NULL, user_name VARCHAR(45) NULL, PRIMARY KEY (user_id));
-CREATE TABLE encrypt_write_ds_1.t_user_encrypt_federate (user_id INT NOT NULL, plain_pwd VARCHAR(45) NULL, cipher_pwd VARCHAR(45) NULL, user_name VARCHAR(45) NULL, PRIMARY KEY (user_id));
+CREATE TABLE encrypt_write_ds_1.t_user_encrypt_federate_sharding_0 (user_id INT NOT NULL, plain_pwd VARCHAR(45) NULL, cipher_pwd VARCHAR(45) NULL, username VARCHAR(45) NULL, PRIMARY KEY (user_id));
+CREATE TABLE encrypt_write_ds_1.t_user_encrypt_federate_sharding_1 (user_id INT NOT NULL, plain_pwd VARCHAR(45) NULL, cipher_pwd VARCHAR(45) NULL, username VARCHAR(45) NULL, PRIMARY KEY (user_id));
+CREATE TABLE encrypt_write_ds_1.t_user_encrypt_federate (user_id INT NOT NULL, plain_pwd VARCHAR(45) NULL, cipher_pwd VARCHAR(45) NULL, username VARCHAR(45) NULL, PRIMARY KEY (user_id));
CREATE TABLE encrypt_write_ds_1.t_user_info (user_id INT NOT NULL, information VARCHAR(45) NULL, PRIMARY KEY (user_id));
CREATE INDEX user_index_t_user_0 ON encrypt_write_ds_1.t_user_0 (user_id);
CREATE INDEX user_index_t_user_1 ON encrypt_write_ds_1.t_user_1 (user_id);
@@ -439,9 +439,9 @@ CREATE TABLE encrypt_read_ds_1.t_order_item_federate_sharding_0 (item_id INT NOT
CREATE TABLE encrypt_read_ds_1.t_order_item_federate_sharding_1 (item_id INT NOT NULL, order_id INT NOT NULL, user_id INT NOT NULL, status VARCHAR(45) NULL, remarks VARCHAR(45) NULL, PRIMARY KEY (item_id));
CREATE TABLE encrypt_read_ds_1.t_order_federate_sharding_0 (order_id_sharding INT NOT NULL, user_id INT NOT NULL, status VARCHAR(45) NULL, PRIMARY KEY (order_id_sharding));
CREATE TABLE encrypt_read_ds_1.t_order_federate_sharding_1 (order_id_sharding INT NOT NULL, user_id INT NOT NULL, status VARCHAR(45) NULL, PRIMARY KEY (order_id_sharding));
-CREATE TABLE encrypt_read_ds_1.t_user_encrypt_federate_sharding_0 (user_id INT NOT NULL, plain_pwd VARCHAR(45) NULL, cipher_pwd VARCHAR(45) NULL, user_name VARCHAR(45) NULL, PRIMARY KEY (user_id));
-CREATE TABLE encrypt_read_ds_1.t_user_encrypt_federate_sharding_1 (user_id INT NOT NULL, plain_pwd VARCHAR(45) NULL, cipher_pwd VARCHAR(45) NULL, user_name VARCHAR(45) NULL, PRIMARY KEY (user_id));
-CREATE TABLE encrypt_read_ds_1.t_user_encrypt_federate (user_id INT NOT NULL, plain_pwd VARCHAR(45) NULL, cipher_pwd VARCHAR(45) NULL, user_name VARCHAR(45) NULL, PRIMARY KEY (user_id));
+CREATE TABLE encrypt_read_ds_1.t_user_encrypt_federate_sharding_0 (user_id INT NOT NULL, plain_pwd VARCHAR(45) NULL, cipher_pwd VARCHAR(45) NULL, username VARCHAR(45) NULL, PRIMARY KEY (user_id));
+CREATE TABLE encrypt_read_ds_1.t_user_encrypt_federate_sharding_1 (user_id INT NOT NULL, plain_pwd VARCHAR(45) NULL, cipher_pwd VARCHAR(45) NULL, username VARCHAR(45) NULL, PRIMARY KEY (user_id));
+CREATE TABLE encrypt_read_ds_1.t_user_encrypt_federate (user_id INT NOT NULL, plain_pwd VARCHAR(45) NULL, cipher_pwd VARCHAR(45) NULL, username VARCHAR(45) NULL, PRIMARY KEY (user_id));
CREATE TABLE encrypt_read_ds_1.t_user_info (user_id INT NOT NULL, information VARCHAR(45) NULL, PRIMARY KEY (user_id));
CREATE INDEX user_index_t_user_0 ON encrypt_read_ds_1.t_user_0 (user_id);
CREATE INDEX user_index_t_user_1 ON encrypt_read_ds_1.t_user_1 (user_id);
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/dal/impl/CloneStatementAssert.java b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/dal/impl/CloneStatementAssert.java
index c642782..de7efe5 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/dal/impl/CloneStatementAssert.java
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/dal/impl/CloneStatementAssert.java
@@ -47,7 +47,7 @@ public final class CloneStatementAssert {
if (null != expected.getInstance()) {
CloneInstanceSegment instance = actual.getCloneActionSegment().getCloneInstance();
assertThat(assertContext.getText("Actual instance hostname does not match: "), instance.getHostname(), is(expected.getInstance().getHostname()));
- assertThat(assertContext.getText("Actual instance username does not match: "), instance.getUserName(), is(expected.getInstance().getUsername()));
+ assertThat(assertContext.getText("Actual instance username does not match: "), instance.getUsername(), is(expected.getInstance().getUsername()));
assertThat(assertContext.getText("Actual instance port does not match: "), instance.getPort(), is(expected.getInstance().getPort()));
assertThat(assertContext.getText("Actual instance password does not match: "), instance.getPassword(), is(expected.getInstance().getPassword()));
assertThat(assertContext.getText("Actual instance SSL requirement does not match: "), instance.isSslRequired(), is(expected.getInstance().isSslRequired()));
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/dcl/alter-user.xml b/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/dcl/alter-user.xml
index fe10c32..365ac15 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/dcl/alter-user.xml
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/dcl/alter-user.xml
@@ -20,8 +20,8 @@
<alter-user sql-case-id="alter_user_identified_without_hostname" />
<alter-user sql-case-id="alter_user_identified_with_hostname" />
<alter-user sql-case-id="alter_user_account" />
- <alter-user sql-case-id="alter_user_name_with_name" />
- <alter-user sql-case-id="alter_user_name_rename" />
+ <alter-user sql-case-id="alter_username_with_name" />
+ <alter-user sql-case-id="alter_username_rename" />
<alter-user sql-case-id="alter_user_passwd_with_equality" />
<alter-user sql-case-id="alter_user_passwd_without_equality" />
<alter-user sql-case-id="alter_user" />
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/resources/sql/supported/dcl/alter-user.xml b/shardingsphere-test/shardingsphere-parser-test/src/main/resources/sql/supported/dcl/alter-user.xml
index 756624b..32a6cbf 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/resources/sql/supported/dcl/alter-user.xml
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/resources/sql/supported/dcl/alter-user.xml
@@ -22,8 +22,8 @@
<sql-case id="alter_user_account" value="ALTER USER user_dev account lock" db-types="Oracle" />
<sql-case id="alter_login_name" value="ALTER LOGIN login_dev WITH NAME = login_dev_new" db-types="SQLServer" />
<sql-case id="alter_login_passwd" value="ALTER LOGIN login_dev WITH PASSWORD = 'passwd_dev'" db-types="SQLServer" />
- <sql-case id="alter_user_name_with_name" value="ALTER USER user_dev WITH NAME = user_dev_new" db-types="SQLServer" />
- <sql-case id="alter_user_name_rename" value="ALTER USER user_dev RENAME TO user_dev_new" db-types="PostgreSQL,openGauss" />
+ <sql-case id="alter_username_with_name" value="ALTER USER user_dev WITH NAME = user_dev_new" db-types="SQLServer" />
+ <sql-case id="alter_username_rename" value="ALTER USER user_dev RENAME TO user_dev_new" db-types="PostgreSQL,openGauss" />
<sql-case id="alter_user_passwd_with_equality" value="ALTER USER user_dev WITH PASSWORD = 'passwd_dev'" db-types="SQLServer" />
<sql-case id="alter_user_passwd_without_equality" value="ALTER USER user_dev WITH PASSWORD 'passwd_dev'" db-types="PostgreSQL,openGauss" />
<sql-case id="alter_user" value="ALTER USER user1" db-types="MySQL" />