diff --git a/core/src/main/java/tk/mybatis/mapper/entity/EntityTable.java b/core/src/main/java/tk/mybatis/mapper/entity/EntityTable.java index 7b7d16615..a0696ddaf 100644 --- a/core/src/main/java/tk/mybatis/mapper/entity/EntityTable.java +++ b/core/src/main/java/tk/mybatis/mapper/entity/EntityTable.java @@ -90,7 +90,7 @@ public ResultMap getResultMap(Configuration configuration) { if(matcher.find()){ column = matcher.group(1); } - ResultMapping.Builder builder = new ResultMapping.Builder(configuration, entityColumn.getProperty(), column, entityColumn.getJavaType()); + ResultMapping.Builder builder = new ResultMapping.Builder(configuration, entityColumn.getProperty(), entityColumn.getProperty(), entityColumn.getJavaType()); if (entityColumn.getJdbcType() != null) { builder.jdbcType(entityColumn.getJdbcType()); } diff --git a/core/src/main/java/tk/mybatis/mapper/entity/Example.java b/core/src/main/java/tk/mybatis/mapper/entity/Example.java index 2981fe7c6..ffbfbbc13 100644 --- a/core/src/main/java/tk/mybatis/mapper/entity/Example.java +++ b/core/src/main/java/tk/mybatis/mapper/entity/Example.java @@ -168,7 +168,7 @@ public Example selectProperties(String... properties) { } for (String property : properties) { if (propertyMap.containsKey(property)) { - this.selectColumns.add(propertyMap.get(property).getColumn()); + this.selectColumns.add(propertyMap.get(property).getColumn() + " AS " + propertyMap.get(property).getProperty()); } else { throw new MapperException("类 " + entityClass.getSimpleName() + " 不包含属性 \'" + property + "\',或该属性被@Transient注释!"); } @@ -1098,7 +1098,7 @@ public Set getSelectColumns() { selectColumns = new LinkedHashSet(entityColumns.size() - excludeColumns.size()); for (EntityColumn column : entityColumns) { if (!excludeColumns.contains(column.getColumn())) { - selectColumns.add(column.getColumn()); + selectColumns.add(column.getColumn() + " AS " +column.getProperty()); } } } diff --git a/core/src/main/java/tk/mybatis/mapper/mapperhelper/SqlHelper.java b/core/src/main/java/tk/mybatis/mapper/mapperhelper/SqlHelper.java index 8bc94d175..4a8544c8e 100644 --- a/core/src/main/java/tk/mybatis/mapper/mapperhelper/SqlHelper.java +++ b/core/src/main/java/tk/mybatis/mapper/mapperhelper/SqlHelper.java @@ -244,7 +244,7 @@ public static String getAllColumns(Class entityClass) { Set columnSet = EntityHelper.getColumns(entityClass); StringBuilder sql = new StringBuilder(); for (EntityColumn entityColumn : columnSet) { - sql.append(entityColumn.getColumn()).append(","); + sql.append(entityColumn.getColumn()).append(" AS ").append(entityColumn.getProperty()).append(","); } return sql.substring(0, sql.length() - 1); } diff --git a/core/src/test/java/tk/mybatis/mapper/annotation/ColumnTest.java b/core/src/test/java/tk/mybatis/mapper/annotation/ColumnTest.java index 4c138cb81..08f384315 100644 --- a/core/src/test/java/tk/mybatis/mapper/annotation/ColumnTest.java +++ b/core/src/test/java/tk/mybatis/mapper/annotation/ColumnTest.java @@ -61,12 +61,12 @@ public void testColumn(){ } ResultMap resultMap = entityTable.getResultMap(configuration); - Assert.assertEquals("[USER_NAME]", resultMap.getMappedColumns().toString()); + Assert.assertEquals("[NAME]", resultMap.getMappedColumns().toString()); Assert.assertEquals(1, resultMap.getResultMappings().size()); ResultMapping resultMapping = resultMap.getResultMappings().get(0); - Assert.assertEquals("user_name", resultMapping.getColumn()); + Assert.assertEquals("name", resultMapping.getColumn()); Assert.assertEquals("name", resultMapping.getProperty()); Assert.assertNull(resultMapping.getJdbcType()); Assert.assertEquals(StringTypeHandler.class, resultMapping.getTypeHandler().getClass()); diff --git a/core/src/test/java/tk/mybatis/mapper/annotation/ColumnTypeTest.java b/core/src/test/java/tk/mybatis/mapper/annotation/ColumnTypeTest.java index 51a915186..985779b4e 100644 --- a/core/src/test/java/tk/mybatis/mapper/annotation/ColumnTypeTest.java +++ b/core/src/test/java/tk/mybatis/mapper/annotation/ColumnTypeTest.java @@ -62,12 +62,12 @@ public void testColumn(){ } ResultMap resultMap = entityTable.getResultMap(configuration); - Assert.assertEquals("[USER_NAME]", resultMap.getMappedColumns().toString()); + Assert.assertEquals("[NAME]", resultMap.getMappedColumns().toString()); Assert.assertEquals(1, resultMap.getResultMappings().size()); ResultMapping resultMapping = resultMap.getResultMappings().get(0); - Assert.assertEquals("user_name", resultMapping.getColumn()); + Assert.assertEquals("name", resultMapping.getColumn()); Assert.assertEquals("name", resultMapping.getProperty()); Assert.assertNull(resultMapping.getJdbcType()); Assert.assertEquals(StringTypeHandler.class, resultMapping.getTypeHandler().getClass()); @@ -220,12 +220,12 @@ public void testAll(){ } ResultMap resultMap = entityTable.getResultMap(configuration); - Assert.assertEquals("[USER_NAME]", resultMap.getMappedColumns().toString()); + Assert.assertEquals("[NAME]", resultMap.getMappedColumns().toString()); Assert.assertEquals(1, resultMap.getResultMappings().size()); ResultMapping resultMapping = resultMap.getResultMappings().get(0); - Assert.assertEquals("user_name", resultMapping.getColumn()); + Assert.assertEquals("name", resultMapping.getColumn()); Assert.assertEquals("name", resultMapping.getProperty()); Assert.assertNotNull(resultMapping.getJdbcType()); Assert.assertEquals(BlobTypeHandler.class, resultMapping.getTypeHandler().getClass()); diff --git a/core/src/test/java/tk/mybatis/mapper/annotation/NameStyleTest.java b/core/src/test/java/tk/mybatis/mapper/annotation/NameStyleTest.java index 6c3a83c09..b53dea9d0 100644 --- a/core/src/test/java/tk/mybatis/mapper/annotation/NameStyleTest.java +++ b/core/src/test/java/tk/mybatis/mapper/annotation/NameStyleTest.java @@ -61,12 +61,12 @@ public void testCamelhump(){ } ResultMap resultMap = entityTable.getResultMap(configuration); - Assert.assertEquals("[USER_NAME]", resultMap.getMappedColumns().toString()); + Assert.assertEquals("[USERNAME]", resultMap.getMappedColumns().toString()); Assert.assertEquals(1, resultMap.getResultMappings().size()); ResultMapping resultMapping = resultMap.getResultMappings().get(0); - Assert.assertEquals("user_name", resultMapping.getColumn()); + Assert.assertEquals("userName", resultMapping.getColumn()); Assert.assertEquals("userName", resultMapping.getProperty()); Assert.assertNull(resultMapping.getJdbcType()); Assert.assertEquals(StringTypeHandler.class, resultMapping.getTypeHandler().getClass()); @@ -101,12 +101,12 @@ public void testCamelhumpAndUppercase(){ } ResultMap resultMap = entityTable.getResultMap(configuration); - Assert.assertEquals("[USER_NAME]", resultMap.getMappedColumns().toString()); + Assert.assertEquals("[USERNAME]", resultMap.getMappedColumns().toString()); Assert.assertEquals(1, resultMap.getResultMappings().size()); ResultMapping resultMapping = resultMap.getResultMappings().get(0); - Assert.assertEquals("USER_NAME", resultMapping.getColumn()); + Assert.assertEquals("userName", resultMapping.getColumn()); Assert.assertEquals("userName", resultMapping.getProperty()); Assert.assertNull(resultMapping.getJdbcType()); Assert.assertEquals(StringTypeHandler.class, resultMapping.getTypeHandler().getClass()); @@ -141,12 +141,12 @@ public void testCamelhumpAndLowercase(){ } ResultMap resultMap = entityTable.getResultMap(configuration); - Assert.assertEquals("[USER_NAME]", resultMap.getMappedColumns().toString()); + Assert.assertEquals("[USERNAME]", resultMap.getMappedColumns().toString()); Assert.assertEquals(1, resultMap.getResultMappings().size()); ResultMapping resultMapping = resultMap.getResultMappings().get(0); - Assert.assertEquals("user_name", resultMapping.getColumn()); + Assert.assertEquals("userName", resultMapping.getColumn()); Assert.assertEquals("userName", resultMapping.getProperty()); Assert.assertNull(resultMapping.getJdbcType()); Assert.assertEquals(StringTypeHandler.class, resultMapping.getTypeHandler().getClass()); @@ -226,7 +226,7 @@ public void testUppercase(){ Assert.assertEquals(1, resultMap.getResultMappings().size()); ResultMapping resultMapping = resultMap.getResultMappings().get(0); - Assert.assertEquals("USERNAME", resultMapping.getColumn()); + Assert.assertEquals("userName", resultMapping.getColumn()); Assert.assertEquals("userName", resultMapping.getProperty()); Assert.assertNull(resultMapping.getJdbcType()); Assert.assertEquals(StringTypeHandler.class, resultMapping.getTypeHandler().getClass()); @@ -266,7 +266,7 @@ public void testLowercase(){ Assert.assertEquals(1, resultMap.getResultMappings().size()); ResultMapping resultMapping = resultMap.getResultMappings().get(0); - Assert.assertEquals("username", resultMapping.getColumn()); + Assert.assertEquals("userName", resultMapping.getColumn()); Assert.assertEquals("userName", resultMapping.getProperty()); Assert.assertNull(resultMapping.getJdbcType()); Assert.assertEquals(StringTypeHandler.class, resultMapping.getTypeHandler().getClass()); diff --git a/core/src/test/java/tk/mybatis/mapper/mapperhelper/ComplexEntityTest.java b/core/src/test/java/tk/mybatis/mapper/mapperhelper/ComplexEntityTest.java index 5d07777cd..78a8276ab 100644 --- a/core/src/test/java/tk/mybatis/mapper/mapperhelper/ComplexEntityTest.java +++ b/core/src/test/java/tk/mybatis/mapper/mapperhelper/ComplexEntityTest.java @@ -152,7 +152,7 @@ public void test() { sqlBuilder.append(SqlHelper.fromTable(entityClass, entityTable.getName())); sqlBuilder.append(SqlHelper.whereAllIfColumns(entityClass, config.isNotEmpty())); final String sql = sqlBuilder.toString(); - Assert.assertEquals("SELECT id,user_name,address,state FROM user " + + Assert.assertEquals("SELECT id AS id,user_name AS userName,address AS address,state AS state FROM user " + "" + " AND id = #{id}" + " AND user_name = #{userName}" + @@ -170,7 +170,7 @@ public void test() { Assert.assertEquals("id", idMapping.getProperty()); Assert.assertTrue(idMapping.getFlags().contains(ResultFlag.ID)); - Assert.assertEquals("user_name", userNameMapping.getColumn()); + Assert.assertEquals("userName", userNameMapping.getColumn()); Assert.assertEquals("userName", userNameMapping.getProperty()); Assert.assertEquals("address", addressMapping.getColumn());