数据管理解决Elasticsearch查询兼容问题

datagear-persistence/src/main/java/org/datagear/persistence/Dialect.java

@@ -48,13 +48,11 @@ public interface Dialect
 	/**
 	 * 构建分页查询SQL。
 	 * <p>
-	 * 如果由于参数不合法等原因无法构建分页查询SQL，则返回{@code null}。
+	 * 如果由于参数不合法等原因无法构建分页查询SQL，返回{@code null}。
 	 * </p>
 	 * 
-	 * @param queryView
-	 *            查询视图SQL
-	 * @param condition
-	 *            查询条件SQL，允许为{@code null}
+	 * @param query
+	 *            查询SQL
 	 * @param orders
 	 *            排序集，允许为{@code null}或者空数组
 	 * @param startRow
@@ -63,23 +61,26 @@ public interface Dialect
 	 *            查询记录数
 	 * @return
 	 */
-	SqlBuilder toPagingSql(SqlBuilder queryView, SqlBuilder condition, Order[] orders, long startRow, int count);
+	SqlBuilder toPagingQuerySql(SqlBuilder query, Order[] orders, long startRow, int count);
 
 	/**
 	 * 构建关键字SQL查询条件。
 	 * <p>
+	 * SQL查询条件应该使用{@linkplain QueryColumnMetaInfo#getColumnPath()}作为列引用。
+	 * </p>
+	 * <p>
 	 * 返回{@code null}、或者空{@linkplain SqlBuilder}表示无关键字SQL查询条件。
 	 * </p>
 	 * 
 	 * @param model
 	 * @param query
 	 *            此次查询
-	 * @param queryColumnPropertyPaths
-	 *            此次查询的结果集{@linkplain ColumnPropertyPath}列表
+	 * @param queryColumnMetaInfos
+	 *            此次查询的结果集{@linkplain QueryColumnMetaInfo}列表
 	 * @return
 	 */
 	SqlBuilder toKeywordQueryCondition(Model model, Query query,
-			List<? extends ColumnPropertyPath> queryColumnPropertyPaths);
+			List<? extends QueryColumnMetaInfo> queryColumnMetaInfos);
 
 	/**
 	 * 给定SQL类型的列是否是可排序的。
@@ -88,4 +89,16 @@ public interface Dialect
 	 * @return
 	 */
 	boolean isSortable(int sqlType);
+
+	/**
+	 * 获取用于{@linkplain #toPagingQuerySql(SqlBuilder, Order[], long, int)}的排序名。
+	 * <p>
+	 * 如果{@linkplain #toPagingQuerySql(SqlBuilder, Order[], long, int)}内部包裹初始的查询SQL，
+	 * 那么只能使用{@linkplain QueryColumnMetaInfo#getColumnAlias()}作为排序名。
+	 * </p>
+	 * 
+	 * @param queryColumnMetaInfo
+	 * @return
+	 */
+	String getPagingQueryOrderName(QueryColumnMetaInfo queryColumnMetaInfo);
 }

datagear-persistence/src/main/java/org/datagear/persistence/PersistenceManager.java

@@ -302,8 +302,8 @@ public interface PersistenceManager
 	 * @param obj
 	 * @param propertyPathInfo
 	 * @param propertyModelPattern
-	 *            是否采用属性模型方式，如果为{@code true}，返回{@linkplain QueryResultMetaInfo#getColumnPropertyPaths()}列表中仅包含此属性模型的{@linkplain ColumnPropertyPath}，
-	 *            且{@linkplain ColumnPropertyPath#getPropertyPath()}将被截取至属性模型级的属性路径。
+	 *            是否采用属性模型方式，如果为{@code true}，返回{@linkplain QueryResultMetaInfo#getQueryColumnMetaInfos()}列表中仅包含此属性模型的{@linkplain QueryColumnMetaInfo}，
+	 *            且{@linkplain QueryColumnMetaInfo#getPropertyPath()}将被截取至属性模型级的属性路径。
 	 * @return
 	 * @throws PersistenceException
 	 */

datagear-persistence/src/main/java/org/datagear/persistence/QueryColumnMetaInfo.java

@@ -7,20 +7,20 @@ package org.datagear.persistence;
 import java.io.Serializable;
 
 /**
- * 列对应的属性路径。
+ * 查询结果列元信息。
  * 
  * @author datagear@163.com
  *
  */
-public class ColumnPropertyPath implements Serializable
+public class QueryColumnMetaInfo implements Serializable
 {
 	private static final long serialVersionUID = 1L;
 
-	/** 列名称 */
-	private String columnName;
+	/** 列路径，比如："T0"."COLUMN_0" */
+	private String columnPath;
 
-	/** 添加数据库标识符引用的列名称 */
-	private String columnNameQuote;
+	/** 列别名 */
+	private String columnAlias;
 
 	/** 列SQL类型 */
 	private int columnSqlType;
@@ -34,41 +34,41 @@ public class ColumnPropertyPath implements Serializable
 	/** 属性路径 */
 	private String propertyPath;
 
-	public ColumnPropertyPath()
+	public QueryColumnMetaInfo()
 	{
 		super();
 	}
 
-	public ColumnPropertyPath(String columnName, String columnNameQuote, int columnSqlType, boolean token,
+	public QueryColumnMetaInfo(String columnPath, String columnAlias, int columnSqlType, boolean token,
 			boolean sizeColumn, String propertyPath)
 	{
 		super();
-		this.columnName = columnName;
-		this.columnNameQuote = columnNameQuote;
+		this.columnPath = columnPath;
+		this.columnAlias = columnAlias;
 		this.columnSqlType = columnSqlType;
 		this.token = token;
 		this.sizeColumn = sizeColumn;
 		this.propertyPath = propertyPath;
 	}
 
-	public String getColumnName()
+	public String getColumnPath()
 	{
-		return columnName;
+		return columnPath;
 	}
 
-	public void setColumnName(String columnName)
+	public void setColumnPath(String columnPath)
 	{
-		this.columnName = columnName;
+		this.columnPath = columnPath;
 	}
 
-	public String getColumnNameQuote()
+	public String getColumnAlias()
 	{
-		return columnNameQuote;
+		return columnAlias;
 	}
 
-	public void setColumnNameQuote(String columnNameQuote)
+	public void setColumnAlias(String columnAlias)
 	{
-		this.columnNameQuote = columnNameQuote;
+		this.columnAlias = columnAlias;
 	}
 
 	public int getColumnSqlType()
@@ -114,7 +114,7 @@ public class ColumnPropertyPath implements Serializable
 	@Override
 	public String toString()
 	{
-		return getClass().getSimpleName() + " [columnName=" + columnName + ", columnNameQuote=" + columnNameQuote
+		return getClass().getSimpleName() + "[columnPath=" + columnPath + ", columnAlias=" + columnAlias
 				+ ", columnSqlType=" + columnSqlType + ", token=" + token + ", sizeColumn=" + sizeColumn
 				+ ", propertyPath=" + propertyPath + "]";
 	}

datagear-persistence/src/main/java/org/datagear/persistence/QueryResultMetaInfo.java

@@ -9,7 +9,7 @@ import java.util.List;
 import org.datagear.model.Model;
 
 /**
- * 查询结果集元信息。
+ * 查询结果元信息。
  * 
  * @author datagear@163.com
  *
@@ -20,18 +20,18 @@ public class QueryResultMetaInfo
 	private Model model;
 
 	/** 列结果集属性路径列表 */
-	private List<ColumnPropertyPath> columnPropertyPaths;
+	private List<QueryColumnMetaInfo> queryColumnMetaInfos;
 
 	public QueryResultMetaInfo()
 	{
 		super();
 	}
 
-	public QueryResultMetaInfo(Model model, List<ColumnPropertyPath> columnPropertyPaths)
+	public QueryResultMetaInfo(Model model, List<QueryColumnMetaInfo> queryColumnMetaInfos)
 	{
 		super();
 		this.model = model;
-		this.columnPropertyPaths = columnPropertyPaths;
+		this.queryColumnMetaInfos = queryColumnMetaInfos;
 	}
 
 	public Model getModel()
@@ -44,19 +44,19 @@ public class QueryResultMetaInfo
 		this.model = model;
 	}
 
-	public List<ColumnPropertyPath> getColumnPropertyPaths()
+	public List<QueryColumnMetaInfo> getQueryColumnMetaInfos()
 	{
-		return columnPropertyPaths;
+		return queryColumnMetaInfos;
 	}
 
-	public void setColumnPropertyPaths(List<ColumnPropertyPath> columnPropertyPaths)
+	public void setQueryColumnMetaInfos(List<QueryColumnMetaInfo> queryColumnMetaInfos)
 	{
-		this.columnPropertyPaths = columnPropertyPaths;
+		this.queryColumnMetaInfos = queryColumnMetaInfos;
 	}
 
 	@Override
 	public String toString()
 	{
-		return getClass().getSimpleName() + " [model=" + model + ", columnPropertyPaths=" + columnPropertyPaths + "]";
+		return getClass().getSimpleName() + " [model=" + model + ", queryColumnMetaInfos=" + queryColumnMetaInfos + "]";
 	}
 }

datagear-persistence/src/main/java/org/datagear/persistence/support/AbstractDataAccessObject.java

@@ -194,7 +194,7 @@ public abstract class AbstractDataAccessObject
 			rs = queryResultSet.getResultSet();
 
 			if (count >= 0 && startRow > 1)
-				JdbcUtil.moveToBeforeRow(rs, startRow - 1);
+				JdbcUtil.moveToBeforeRow(rs, startRow);
 
 			int endRow = (count >= 0 ? startRow + count : -1);
 

datagear-persistence/src/main/java/org/datagear/persistence/support/AbstractDialect.java

@@ -9,10 +9,10 @@ import java.util.List;
 
 import org.datagear.dbinfo.SqlTypeInfo.SearchableType;
 import org.datagear.model.Model;
-import org.datagear.persistence.ColumnPropertyPath;
 import org.datagear.persistence.Dialect;
 import org.datagear.persistence.Order;
 import org.datagear.persistence.Query;
+import org.datagear.persistence.QueryColumnMetaInfo;
 import org.datagear.persistence.SqlBuilder;
 import org.datagear.util.JDBCCompatiblity;
 import org.datagear.util.JdbcUtil;
@@ -58,7 +58,7 @@ public abstract class AbstractDialect implements Dialect
 
 	@Override
 	public SqlBuilder toKeywordQueryCondition(Model model, Query query,
-			List<? extends ColumnPropertyPath> queryColumnPropertyPaths)
+			List<? extends QueryColumnMetaInfo> queryColumnMetaInfos)
 	{
 		SqlBuilder keywordCondition = SqlBuilder.valueOf();
 
@@ -69,12 +69,12 @@ public abstract class AbstractDialect implements Dialect
 		String likeOpt = (query.isNotLike() ? " NOT LIKE " : " LIKE ");
 		String equalOpt = (query.isNotLike() ? " != " : " = ");
 
-		for (ColumnPropertyPath columnPropertyPath : queryColumnPropertyPaths)
+		for (QueryColumnMetaInfo queryColumnMetaInfo : queryColumnMetaInfos)
 		{
-			if (!columnPropertyPath.isToken())
+			if (!queryColumnMetaInfo.isToken())
 				continue;
 
-			int sqlType = columnPropertyPath.getColumnSqlType();
+			int sqlType = queryColumnMetaInfo.getColumnSqlType();
 
 			@JDBCCompatiblity("很多驱动程序的值为SearchableType.ALL但实际并不支持LIKE语法（比如：PostgreSQL JDBC 42.2.5），"
 					+ "这里为了兼容，不采用SearchableType逻辑")
@@ -82,7 +82,7 @@ public abstract class AbstractDialect implements Dialect
 			String myOperator = null;
 			Object myKeyword = null;
 			// PropertyPath propertyPath =
-			// PropertyPath.valueOf(columnPropertyPath.getPropertyPath());
+			// PropertyPath.valueOf(queryColumnMetaInfo.getPropertyPath());
 			// PropertyPathInfo propertyPathInfo =
 			// PropertyPathInfo.valueOf(model, propertyPath);
 			// Property tailProperty = propertyPathInfo.getPropertyTail();
@@ -124,7 +124,7 @@ public abstract class AbstractDialect implements Dialect
 				if (!keywordCondition.isEmpty())
 					keywordCondition.sql(joinOpt);
 
-				keywordCondition.sql(columnPropertyPath.getColumnNameQuote() + myOperator + "?", myKeyword);
+				keywordCondition.sql(queryColumnMetaInfo.getColumnPath() + myOperator + "?", myKeyword);
 			}
 		}
 
@@ -146,6 +146,12 @@ public abstract class AbstractDialect implements Dialect
 		return false;
 	}
 
+	@Override
+	public String getPagingQueryOrderName(QueryColumnMetaInfo queryColumnMetaInfo)
+	{
+		return quote(queryColumnMetaInfo.getColumnAlias());
+	}
+
 	/**
 	 * 指定SQL类型是否可用作LIKE条件。
 	 * 

datagear-persistence/src/main/java/org/datagear/persistence/support/DefaultDialectSource.java

@@ -156,12 +156,12 @@ public class DefaultDialectSource implements DialectSource
 							}
 
 							// 试探能够成功的分页实现
-							if (dialect != null && combinedDialectBuilder.getToPagingSqlDialectBuilder() == null)
+							if (dialect != null && combinedDialectBuilder.getToPagingQuerySqlDialectBuilder() == null)
 							{
 								try
 								{
 									if (testDialectToPagingSql(cn, databaseMetaData, testInfo, dialect))
-										combinedDialectBuilder.setToPagingSqlDialectBuilder(dialectBuilder);
+										combinedDialectBuilder.setToPagingQuerySqlDialectBuilder(dialectBuilder);
 								}
 								catch (Exception e)
 								{
@@ -237,15 +237,12 @@ public class DefaultDialectSource implements DialectSource
 		String tableQuote = identifierQuote + testInfo.getTableName() + identifierQuote;
 		String columnName = identifierQuote + testInfo.getOrderColumnName() + identifierQuote;
 
-		SqlBuilder queryView = SqlBuilder.valueOf();
-		queryView.sql("SELECT * FROM ").sql(tableQuote);
-
-		SqlBuilder condition = SqlBuilder.valueOf();
-		condition.sql(" 1=1 ");
+		SqlBuilder query = SqlBuilder.valueOf();
+		query.sql("SELECT * FROM ").sql(tableQuote);
 
 		Order[] orders = Order.asArray(Order.valueOf(columnName, Order.ASC));
 
-		SqlBuilder pagingQuerySql = dialect.toPagingSql(queryView, condition, orders, 1, 5);
+		SqlBuilder pagingQuerySql = dialect.toPagingQuerySql(query, orders, 1, 5);
 
 		executeQuery(cn, pagingQuerySql);
 
@@ -320,7 +317,7 @@ public class DefaultDialectSource implements DialectSource
 
 	protected static class CombinedDialect extends AbstractDialect
 	{
-		private Dialect toPagingSqlDialect;
+		private Dialect toPagingQuerySqlDialect;
 
 		public CombinedDialect()
 		{
@@ -332,50 +329,49 @@ public class DefaultDialectSource implements DialectSource
 			super(identifierQuote);
 		}
 
-		public Dialect getToPagingSqlDialect()
+		public Dialect getToPagingQuerySqlDialect()
 		{
-			return toPagingSqlDialect;
+			return toPagingQuerySqlDialect;
 		}
 
-		public void setToPagingSqlDialect(Dialect toPagingSqlDialect)
+		public void setToPagingQuerySqlDialect(Dialect toPagingQuerySqlDialect)
 		{
-			this.toPagingSqlDialect = toPagingSqlDialect;
+			this.toPagingQuerySqlDialect = toPagingQuerySqlDialect;
 		}
 
 		@Override
 		public boolean supportsPagingSql()
 		{
-			return (this.toPagingSqlDialect != null);
+			return (this.toPagingQuerySqlDialect != null);
 		}
 
 		@Override
-		public SqlBuilder toPagingSql(SqlBuilder queryView, SqlBuilder condition, Order[] orders, long startRow,
-				int count)
+		public SqlBuilder toPagingQuerySql(SqlBuilder query, Order[] orders, long startRow, int count)
 		{
-			if (this.toPagingSqlDialect == null)
+			if (this.toPagingQuerySqlDialect == null)
 				return null;
 
-			return this.toPagingSqlDialect.toPagingSql(queryView, condition, orders, startRow, count);
+			return this.toPagingQuerySqlDialect.toPagingQuerySql(query, orders, startRow, count);
 		}
 	}
 
 	protected static class CombinedDialectBuilder extends AbstractDialectBuilder
 	{
-		private DialectBuilder toPagingSqlDialectBuilder;
+		private DialectBuilder toPagingQuerySqlDialectBuilder;
 
 		public CombinedDialectBuilder()
 		{
 			super();
 		}
 
-		public DialectBuilder getToPagingSqlDialectBuilder()
+		public DialectBuilder getToPagingQuerySqlDialectBuilder()
 		{
-			return toPagingSqlDialectBuilder;
+			return toPagingQuerySqlDialectBuilder;
 		}
 
-		public void setToPagingSqlDialectBuilder(DialectBuilder toPagingSqlDialectBuilder)
+		public void setToPagingQuerySqlDialectBuilder(DialectBuilder toPagingQuerySqlDialectBuilder)
 		{
-			this.toPagingSqlDialectBuilder = toPagingSqlDialectBuilder;
+			this.toPagingQuerySqlDialectBuilder = toPagingQuerySqlDialectBuilder;
 		}
 
 		@Override
@@ -385,8 +381,8 @@ public class DefaultDialectSource implements DialectSource
 
 			dialect.setIdentifierQuote(getIdentifierQuote(cn));
 
-			if (this.toPagingSqlDialectBuilder != null)
-				dialect.setToPagingSqlDialect(this.toPagingSqlDialectBuilder.build(cn));
+			if (this.toPagingQuerySqlDialectBuilder != null)
+				dialect.setToPagingQuerySqlDialect(this.toPagingQuerySqlDialectBuilder.build(cn));
 
 			return dialect;
 		}

datagear-persistence/src/main/java/org/datagear/persistence/support/SelectPersistenceOperation.java

@@ -43,13 +43,13 @@ import org.datagear.model.features.NotReadable;
 import org.datagear.model.features.Token;
 import org.datagear.model.support.MU;
 import org.datagear.model.support.PropertyPath;
-import org.datagear.persistence.ColumnPropertyPath;
 import org.datagear.persistence.Dialect;
 import org.datagear.persistence.Order;
 import org.datagear.persistence.PagingData;
 import org.datagear.persistence.PagingQuery;
 import org.datagear.persistence.PersistenceException;
 import org.datagear.persistence.Query;
+import org.datagear.persistence.QueryColumnMetaInfo;
 import org.datagear.persistence.QueryResultMetaInfo;
 import org.datagear.persistence.SqlBuilder;
 import org.datagear.persistence.collection.SizeOnlyCollection;
@@ -296,15 +296,22 @@ public class SelectPersistenceOperation extends AbstractModelPersistenceOperatio
 	public PagingData<Object> pagingQuery(Connection cn, Dialect dialect, String table, Model model,
 			PagingQuery pagingQuery)
 	{
-		List<ColumnPropertyPath> selectColumnPropertyPaths = new ArrayList<ColumnPropertyPath>();
+		List<QueryColumnMetaInfo> queryColumnMetaInfos = new ArrayList<QueryColumnMetaInfo>();
 
-		SqlBuilder queryView = buildQueryViewForModel(dialect, table, null, selectColumnPropertyPaths, model);
+		@JDBCCompatiblity("某些驱动程序在执行类似“select * from (select column_0 as c_0 from table) T where c_0 =1”时，“c_0=1”不起作用，"
+				+ "但可以支持“select * from (select column_0 as c_0 from table where column_0 =1) T”（比如Elasticsearch JDBC 7.4.0），"
+				+ "为了兼容，这里把查询条件都移到内层了，并把条件中的列名都改为使用QueryColumnMetaInfo.columnPath")
+		SqlBuilder queryView = buildQueryViewForModel(dialect, table, null, queryColumnMetaInfos, model);
+		SqlBuilder condition = buildQueryCondition(dialect, model, pagingQuery, queryColumnMetaInfos);
+		if (!SqlBuilder.isEmpty(condition))
+		{
+			queryView.sql(" WHERE ");
+			queryView.sql(condition);
+		}
 
-		SqlBuilder condition = buildQueryCondition(dialect, model, pagingQuery, selectColumnPropertyPaths);
+		Order[] orders = buildQueryOrders(dialect, model, pagingQuery, queryColumnMetaInfos);
 
-		Order[] orders = buildQueryOrders(dialect, model, pagingQuery, selectColumnPropertyPaths);
-
-		long total = queryCount(cn, queryView, condition);
+		long total = queryCount(cn, queryView);
 
 		PagingData<Object> pagingData = new PagingData<Object>(pagingQuery.getPage(), total, pagingQuery.getPageSize());
 
@@ -316,7 +323,7 @@ public class SelectPersistenceOperation extends AbstractModelPersistenceOperatio
 		// 数据库分页
 		if (dialect.supportsPagingSql())
 		{
-			query = dialect.toPagingSql(queryView, condition, orders, startRow, count);
+			query = dialect.toPagingQuerySql(queryView, orders, startRow, count);
 
 			if (query != null)
 			{
@@ -327,7 +334,7 @@ public class SelectPersistenceOperation extends AbstractModelPersistenceOperatio
 
 		// 内存分页
 		if (query == null)
-			query = buildQuery(dialect, queryView, condition, orders);
+			query = buildQuery(dialect, queryView, orders);
 
 		List<Object> list = query(cn, query, model, startRow, count);
 
@@ -357,19 +364,23 @@ public class SelectPersistenceOperation extends AbstractModelPersistenceOperatio
 		Mapper mapper = getMapper(model, property);
 
 		SqlBuilder modelTableFieldCondition = buildRecordCondition(cn, dialect, model, obj, null);
-		List<ColumnPropertyPath> selectColumnPropertyPaths = new ArrayList<ColumnPropertyPath>();
-
-		SqlBuilder queryView = buildQueryViewForProperty(dialect, table, modelTableFieldCondition,
-				selectColumnPropertyPaths, model, property, mapper, null);
+		List<QueryColumnMetaInfo> queryColumnMetaInfos = new ArrayList<QueryColumnMetaInfo>();
 
+		@JDBCCompatiblity("与pagingQuery方法问题相同")
+		SqlBuilder queryView = buildQueryViewForProperty(dialect, table, modelTableFieldCondition, queryColumnMetaInfos,
+				model, property, mapper, null);
 		if (propertyModelQueryPattern)
-			selectColumnPropertyPaths = toPropertyColumnPropertyPaths(selectColumnPropertyPaths, model, property);
+			queryColumnMetaInfos = toPropertyQueryColumnMetaInfos(queryColumnMetaInfos, model, property);
+		SqlBuilder condition = buildQueryCondition(dialect, model, pagingQuery, queryColumnMetaInfos);
+		if (!SqlBuilder.isEmpty(condition))
+		{
+			queryView.sql(" WHERE ");
+			queryView.sql(condition);
+		}
 
-		SqlBuilder condition = buildQueryCondition(dialect, model, pagingQuery, selectColumnPropertyPaths);
+		Order[] orders = buildQueryOrders(dialect, model, pagingQuery, queryColumnMetaInfos);
 
-		Order[] orders = buildQueryOrders(dialect, model, pagingQuery, selectColumnPropertyPaths);
-
-		long total = queryCount(cn, queryView, condition);
+		long total = queryCount(cn, queryView);
 
 		PagingData<Object> pagingData = new PagingData<Object>(pagingQuery.getPage(), total, pagingQuery.getPageSize());
 
@@ -381,7 +392,7 @@ public class SelectPersistenceOperation extends AbstractModelPersistenceOperatio
 		// 数据库分页
 		if (dialect.supportsPagingSql())
 		{
-			query = dialect.toPagingSql(queryView, condition, orders, startRow, count);
+			query = dialect.toPagingQuerySql(queryView, orders, startRow, count);
 
 			if (query != null)
 			{
@@ -392,7 +403,7 @@ public class SelectPersistenceOperation extends AbstractModelPersistenceOperatio
 
 		// 内存分页
 		if (query == null)
-			query = buildQuery(dialect, queryView, condition, orders);
+			query = buildQuery(dialect, queryView, orders);
 
 		List<Object> list = queryPropValue(cn, dialect, table, query, model, property, mapper, startRow, count);
 
@@ -404,20 +415,15 @@ public class SelectPersistenceOperation extends AbstractModelPersistenceOperatio
 	/**
 	 * 查询数量。
 	 * 
-	 * @param queryView
-	 * @param condition
-	 *            允许为{@code null}。
+	 * @param query
 	 * @return
 	 * 
 	 */
-	public long queryCount(Connection cn, SqlBuilder queryView, SqlBuilder condition)
+	public long queryCount(Connection cn, SqlBuilder query)
 	{
-		SqlBuilder query = SqlBuilder.valueOf().sql("SELECT COUNT(*) FROM (").sql(queryView).sql(") A");
+		SqlBuilder countQuery = SqlBuilder.valueOf().sql("SELECT COUNT(*) FROM (").sql(query).sql(") T");
 
-		if (!SqlBuilder.isEmpty(condition))
-			query.sql(" WHERE ").sql(condition);
-
-		long re = executeCountQuery(cn, query);
+		long re = executeCountQuery(cn, countQuery);
 
 		return re;
 	}
@@ -467,20 +473,20 @@ public class SelectPersistenceOperation extends AbstractModelPersistenceOperatio
 	 */
 	public QueryResultMetaInfo getQueryResultMetaInfo(Dialect dialect, String table, Model model)
 	{
-		List<ColumnPropertyPath> selectColumnPropertyPaths = new ArrayList<ColumnPropertyPath>();
+		List<QueryColumnMetaInfo> queryColumnMetaInfos = new ArrayList<QueryColumnMetaInfo>();
 
 		TableAliasGenerator tableAliasGenerator = new SequentialTableAliasGenerator();
 
 		String tableNameQuote = toQuoteName(dialect, table);
 		String tableAliasQuote = toQuoteName(dialect, tableAliasGenerator.next());
 
-		appendModelQueryView(dialect, model, null, null, selectColumnPropertyPaths, null, true, tableNameQuote,
+		appendModelQueryView(dialect, model, null, null, queryColumnMetaInfos, null, true, tableNameQuote,
 				tableAliasQuote, null, null, tableAliasGenerator);
 		// 查询模型数据使用“LEFT JOIN”，因为有属性值为null的情况。
-		appendPropertyQueryView(dialect, model, null, null, selectColumnPropertyPaths, null, true, tableAliasQuote,
-				null, tableAliasGenerator, null, " LEFT JOIN ", true, this.selectOptions.getMaxQueryDepth());
+		appendPropertyQueryView(dialect, model, null, null, queryColumnMetaInfos, null, true, tableAliasQuote, null,
+				tableAliasGenerator, null, " LEFT JOIN ", true, this.selectOptions.getMaxQueryDepth());
 
-		return new QueryResultMetaInfo(model, selectColumnPropertyPaths);
+		return new QueryResultMetaInfo(model, queryColumnMetaInfos);
 	}
 
 	/**
@@ -491,8 +497,8 @@ public class SelectPersistenceOperation extends AbstractModelPersistenceOperatio
 	 * @param model
 	 * @param property
 	 * @param propertyModelPattern
-	 *            是否采用属性模型方式，如果为{@code true}，返回{@linkplain QueryResultMetaInfo#getColumnPropertyPaths()}列表中仅包含此属性模型的{@linkplain ColumnPropertyPath}，
-	 *            且{@linkplain ColumnPropertyPath#getPropertyPath()}将被截取。
+	 *            是否采用属性模型方式，如果为{@code true}，返回{@linkplain QueryResultMetaInfo#getQueryColumnMetaInfos()}列表中仅包含此属性模型的{@linkplain QueryColumnMetaInfo}，
+	 *            且{@linkplain QueryColumnMetaInfo#getPropertyPath()}将被截取。
 	 * @return
 	 */
 	public QueryResultMetaInfo getQueryPropValueQueryResultMetaInfo(Dialect dialect, String table, Model model,
@@ -500,25 +506,24 @@ public class SelectPersistenceOperation extends AbstractModelPersistenceOperatio
 	{
 		Mapper mapper = getMapper(model, property);
 
-		List<ColumnPropertyPath> selectColumnPropertyPaths = new ArrayList<ColumnPropertyPath>();
+		List<QueryColumnMetaInfo> queryColumnMetaInfos = new ArrayList<QueryColumnMetaInfo>();
 
 		TableAliasGenerator tableAliasGenerator = new SequentialTableAliasGenerator();
 
 		String tableNameQuote = toQuoteName(dialect, table);
 		String tableAliasQuote = toQuoteName(dialect, tableAliasGenerator.next());
 
-		appendModelQueryView(dialect, model, null, null, selectColumnPropertyPaths, null, false, tableNameQuote,
+		appendModelQueryView(dialect, model, null, null, queryColumnMetaInfos, null, false, tableNameQuote,
 				tableAliasQuote, null, null, tableAliasGenerator);
-		appendPropertyQueryView(dialect, model, null, null, selectColumnPropertyPaths, null, false, tableAliasQuote,
-				null, tableAliasGenerator, property.getName(), " LEFT JOIN ", true,
-				this.selectOptions.getMaxQueryDepth());
+		appendPropertyQueryView(dialect, model, null, null, queryColumnMetaInfos, null, false, tableAliasQuote, null,
+				tableAliasGenerator, property.getName(), " LEFT JOIN ", true, this.selectOptions.getMaxQueryDepth());
 
 		// 查询属性数据使用“INNER JOIN”，因为要排除属性值为null的情况。
-		appendPropertyQueryView(dialect, model, null, null, selectColumnPropertyPaths, null, true, tableAliasQuote,
-				null, property, MU.getPropertyIndex(model, property), mapper, tableAliasGenerator, null, " INNER JOIN ",
+		appendPropertyQueryView(dialect, model, null, null, queryColumnMetaInfos, null, true, tableAliasQuote, null,
+				property, MU.getPropertyIndex(model, property), mapper, tableAliasGenerator, null, " INNER JOIN ",
 				false, true, false, this.selectOptions.getMaxQueryDepth());
 
-		QueryResultMetaInfo queryResultMetaInfo = new QueryResultMetaInfo(model, selectColumnPropertyPaths);
+		QueryResultMetaInfo queryResultMetaInfo = new QueryResultMetaInfo(model, queryColumnMetaInfos);
 
 		if (propertyModelPattern)
 			queryResultMetaInfo = toPropertyQueryResultMetaInfo(queryResultMetaInfo, model, property);
@@ -537,42 +542,42 @@ public class SelectPersistenceOperation extends AbstractModelPersistenceOperatio
 	protected QueryResultMetaInfo toPropertyQueryResultMetaInfo(QueryResultMetaInfo queryResultMetaInfo, Model model,
 			Property property)
 	{
-		List<ColumnPropertyPath> propertyModelColumnPropertyPaths = toPropertyColumnPropertyPaths(
-				queryResultMetaInfo.getColumnPropertyPaths(), model, property);
+		List<QueryColumnMetaInfo> propertyModelQueryColumnMetaInfos = toPropertyQueryColumnMetaInfos(
+				queryResultMetaInfo.getQueryColumnMetaInfos(), model, property);
 
-		return new QueryResultMetaInfo(MU.getModel(property), propertyModelColumnPropertyPaths);
+		return new QueryResultMetaInfo(MU.getModel(property), propertyModelQueryColumnMetaInfos);
 	}
 
 	/**
-	 * 将模型对应的{@linkplain ColumnPropertyPath}列表转换为属性对应的{@linkplain ColumnPropertyPath}列表。
+	 * 将模型对应的{@linkplain QueryColumnMetaInfo}列表转换为属性对应的{@linkplain QueryColumnMetaInfo}列表。
 	 * 
-	 * @param modelColumnPropertyPaths
+	 * @param modelQueryColumnMetaInfos
 	 * @param model
 	 * @param property
 	 * @return
 	 */
-	protected List<ColumnPropertyPath> toPropertyColumnPropertyPaths(List<ColumnPropertyPath> modelColumnPropertyPaths,
-			Model model, Property property)
+	protected List<QueryColumnMetaInfo> toPropertyQueryColumnMetaInfos(
+			List<QueryColumnMetaInfo> modelQueryColumnMetaInfos, Model model, Property property)
 	{
-		List<ColumnPropertyPath> propertyModelColumnPropertyPaths = new ArrayList<ColumnPropertyPath>();
+		List<QueryColumnMetaInfo> propertyModelQueryColumnMetaInfos = new ArrayList<QueryColumnMetaInfo>();
 
 		String myPropertyPathPrefix = getPropertyPath(model, property, null) + PropertyPath.PROPERTY_STRING;
 
-		for (ColumnPropertyPath columnPropertyPath : modelColumnPropertyPaths)
+		for (QueryColumnMetaInfo queryColumnMetaInfo : modelQueryColumnMetaInfos)
 		{
-			String propertyPath = columnPropertyPath.getPropertyPath();
+			String propertyPath = queryColumnMetaInfo.getPropertyPath();
 
 			if (!propertyPath.startsWith(myPropertyPathPrefix))
 				continue;
 
 			propertyPath = propertyPath.substring(myPropertyPathPrefix.length());
 
-			propertyModelColumnPropertyPaths.add(new ColumnPropertyPath(columnPropertyPath.getColumnName(),
-					columnPropertyPath.getColumnNameQuote(), columnPropertyPath.getColumnSqlType(),
-					columnPropertyPath.isToken(), columnPropertyPath.isSizeColumn(), propertyPath));
+			propertyModelQueryColumnMetaInfos.add(new QueryColumnMetaInfo(queryColumnMetaInfo.getColumnPath(),
+					queryColumnMetaInfo.getColumnAlias(), queryColumnMetaInfo.getColumnSqlType(),
+					queryColumnMetaInfo.isToken(), queryColumnMetaInfo.isSizeColumn(), propertyPath));
 		}
 
-		return propertyModelColumnPropertyPaths;
+		return propertyModelQueryColumnMetaInfos;
 	}
 
 	/**
@@ -629,16 +634,16 @@ public class SelectPersistenceOperation extends AbstractModelPersistenceOperatio
 
 			String tableAliasQuote = toQuoteName(dialect, tableAliasGenerator.next());
 
-			List<ColumnPropertyPath> selectColumnPropertyPaths = new ArrayList<ColumnPropertyPath>();
+			List<QueryColumnMetaInfo> queryColumnMetaInfos = new ArrayList<QueryColumnMetaInfo>();
 
-			appendPropertyQueryView(dialect, model, null, null, selectColumnPropertyPaths, null, true, tableAliasQuote,
-					null, property, propertyIndex, mapper, tableAliasGenerator, null, "", true, true, false,
+			appendPropertyQueryView(dialect, model, null, null, queryColumnMetaInfos, null, true, tableAliasQuote, null,
+					property, propertyIndex, mapper, tableAliasGenerator, null, "", true, true, false,
 					this.selectOptions.getMaxQueryDepth());
 
 			SqlBuilder propValueQuery = SqlBuilder.valueOf().sql("SELECT ").delimit(",");
 
-			for (ColumnPropertyPath columnPropertyPath : selectColumnPropertyPaths)
-				propValueQuery.sqld(columnPropertyPath.getColumnNameQuote());
+			for (QueryColumnMetaInfo queryColumnMetaInfo : queryColumnMetaInfos)
+				propValueQuery.sqld(toQuoteName(dialect, queryColumnMetaInfo.getColumnAlias()));
 
 			propValueQuery.sql(" FROM (").sql(query).sql(") ").sql(tableAliasQuote);
 
@@ -690,25 +695,21 @@ public class SelectPersistenceOperation extends AbstractModelPersistenceOperatio
 	 * 
 	 * @param dialect
 	 * @param queryView
-	 * @param condition
 	 * @param orders
 	 * @return
 	 */
-	protected SqlBuilder buildQuery(Dialect dialect, SqlBuilder queryView, SqlBuilder condition, Order[] orders)
+	protected SqlBuilder buildQuery(Dialect dialect, SqlBuilder queryView, Order[] orders)
 	{
 		SqlBuilder query;
 
 		SqlBuilder orderSql = Order.toOrderSql(orders);
 
-		if (SqlBuilder.isEmpty(condition) && SqlBuilder.isEmpty(orderSql))
+		if (SqlBuilder.isEmpty(orderSql))
 			query = queryView;
 		else
 		{
 			query = SqlBuilder.valueOf().sql("SELECT * FROM (").sql(queryView).sql(") T");
 
-			if (!SqlBuilder.isEmpty(condition))
-				query.sql(" WHERE ").sql(condition);
-
 			if (!SqlBuilder.isEmpty(orderSql))
 				query.sql(" ORDER BY ").sql(orderSql);
 
@@ -725,13 +726,13 @@ public class SelectPersistenceOperation extends AbstractModelPersistenceOperatio
 	 * @param table
 	 * @param modelTableFieldCondition
 	 *            模型表字段级查询条件，允许为{@code null}
-	 * @param selectColumnPropertyPaths
+	 * @param queryColumnMetaInfos
 	 *            允许为{@code null}，写入SELECT结果集列别名信息的列表
 	 * @param model
 	 * @return
 	 */
 	protected SqlBuilder buildQueryViewForModel(Dialect dialect, String table, SqlBuilder modelTableFieldCondition,
-			List<ColumnPropertyPath> selectColumnPropertyPaths, Model model)
+			List<QueryColumnMetaInfo> queryColumnMetaInfos, Model model)
 	{
 		SqlBuilder selectSql = SqlBuilder.valueOf().sql("SELECT ").delimit(",");
 		SqlBuilder fromSql = SqlBuilder.valueOf().sql(" FROM ");
@@ -741,12 +742,11 @@ public class SelectPersistenceOperation extends AbstractModelPersistenceOperatio
 		String tableNameQuote = toQuoteName(dialect, table);
 		String tableAliasQuote = toQuoteName(dialect, tableAliasGenerator.next());
 
-		appendModelQueryView(dialect, model, selectSql, fromSql, selectColumnPropertyPaths, null, true, tableNameQuote,
+		appendModelQueryView(dialect, model, selectSql, fromSql, queryColumnMetaInfos, null, true, tableNameQuote,
 				tableAliasQuote, modelTableFieldCondition, null, tableAliasGenerator);
 		// 查询模型数据使用“LEFT JOIN”，因为有属性值为null的情况。
-		appendPropertyQueryView(dialect, model, selectSql, fromSql, selectColumnPropertyPaths, null, true,
-				tableAliasQuote, null, tableAliasGenerator, null, " LEFT JOIN ", true,
-				this.selectOptions.getMaxQueryDepth());
+		appendPropertyQueryView(dialect, model, selectSql, fromSql, queryColumnMetaInfos, null, true, tableAliasQuote,
+				null, tableAliasGenerator, null, " LEFT JOIN ", true, this.selectOptions.getMaxQueryDepth());
 
 		selectSql.sql(fromSql);
 
@@ -760,7 +760,7 @@ public class SelectPersistenceOperation extends AbstractModelPersistenceOperatio
 	 * @param table
 	 * @param modelTableFieldCondition
 	 *            模型表字段级查询条件，允许为{@code null}
-	 * @param selectColumnPropertyPaths
+	 * @param queryColumnMetaInfos
 	 *            允许为{@code null}，写入SELECT结果集列别名信息的列表
 	 * @param model
 	 * @param property
@@ -770,7 +770,7 @@ public class SelectPersistenceOperation extends AbstractModelPersistenceOperatio
 	 * @return
 	 */
 	protected SqlBuilder buildQueryViewForProperty(Dialect dialect, String table, SqlBuilder modelTableFieldCondition,
-			List<ColumnPropertyPath> selectColumnPropertyPaths, Model model, Property property, Mapper mapper,
+			List<QueryColumnMetaInfo> queryColumnMetaInfos, Model model, Property property, Mapper mapper,
 			SqlBuilder propertyTableFieldCondition)
 	{
 		SqlBuilder selectSql = SqlBuilder.valueOf().sql("SELECT ").delimit(",");
@@ -781,15 +781,15 @@ public class SelectPersistenceOperation extends AbstractModelPersistenceOperatio
 		String tableNameQuote = toQuoteName(dialect, table);
 		String tableAliasQuote = toQuoteName(dialect, tableAliasGenerator.next());
 
-		appendModelQueryView(dialect, model, selectSql, fromSql, selectColumnPropertyPaths, null, false, tableNameQuote,
+		appendModelQueryView(dialect, model, selectSql, fromSql, queryColumnMetaInfos, null, false, tableNameQuote,
 				tableAliasQuote, modelTableFieldCondition, null, tableAliasGenerator);
-		appendPropertyQueryView(dialect, model, selectSql, fromSql, selectColumnPropertyPaths, null, false,
-				tableAliasQuote, null, tableAliasGenerator, property.getName(), " LEFT JOIN ", true,
+		appendPropertyQueryView(dialect, model, selectSql, fromSql, queryColumnMetaInfos, null, false, tableAliasQuote,
+				null, tableAliasGenerator, property.getName(), " LEFT JOIN ", true,
 				this.selectOptions.getMaxQueryDepth());
 
 		// 查询属性数据使用“INNER JOIN”，因为要排除属性值为null的情况。
-		appendPropertyQueryView(dialect, model, selectSql, fromSql, selectColumnPropertyPaths, null, true,
-				tableAliasQuote, null, property, MU.getPropertyIndex(model, property), mapper, tableAliasGenerator,
+		appendPropertyQueryView(dialect, model, selectSql, fromSql, queryColumnMetaInfos, null, true, tableAliasQuote,
+				null, property, MU.getPropertyIndex(model, property), mapper, tableAliasGenerator,
 				propertyTableFieldCondition, " INNER JOIN ", false, true, false, this.selectOptions.getMaxQueryDepth());
 
 		selectSql.sql(fromSql);
@@ -808,7 +808,7 @@ public class SelectPersistenceOperation extends AbstractModelPersistenceOperatio
 	 *            允许为{@code null}，如果为{@code null}，则不写入SELECT语句
 	 * @param fromSql
 	 *            允许为{@code null}，如果为{@code null}，则不写入FROM语句
-	 * @param selectColumnPropertyPaths
+	 * @param queryColumnMetaInfos
 	 *            允许为{@code null}，写入SELECT结果集列别名信息的列表
 	 * @param modelPropertyPath
 	 *            允许为{@code null}，模型所处的上下文属性路径
@@ -823,7 +823,7 @@ public class SelectPersistenceOperation extends AbstractModelPersistenceOperatio
 	 * @param tableAliasGenerator
 	 */
 	protected void appendModelQueryView(Dialect dialect, Model model, SqlBuilder selectSql, SqlBuilder fromSql,
-			List<ColumnPropertyPath> selectColumnPropertyPaths, String modelPropertyPath, boolean asToken,
+			List<QueryColumnMetaInfo> queryColumnMetaInfos, String modelPropertyPath, boolean asToken,
 			String tableNameQuote, String tableAliasQuote, SqlBuilder tableFieldCondition, String columnAliasPrefix,
 			TableAliasGenerator tableAliasGenerator)
 	{
@@ -858,10 +858,9 @@ public class SelectPersistenceOperation extends AbstractModelPersistenceOperatio
 			{
 				ModelTableMapper mtm = MapperUtil.castModelTableMapper(mapper);
 
-				appendPropertyQueryViewForModelTableMapper(dialect, model, selectSql, fromSql,
-						selectColumnPropertyPaths, modelPropertyPath, isAsTokenProperty(asToken, model, property),
-						tableAliasQuote, columnAliasPrefix, property, i, mtm, tableAliasGenerator, null, " INNER JOIN ",
-						true, false, 1);
+				appendPropertyQueryViewForModelTableMapper(dialect, model, selectSql, fromSql, queryColumnMetaInfos,
+						modelPropertyPath, isAsTokenProperty(asToken, model, property), tableAliasQuote,
+						columnAliasPrefix, property, i, mtm, tableAliasGenerator, null, " INNER JOIN ", true, false, 1);
 			}
 		}
 	}
@@ -877,7 +876,7 @@ public class SelectPersistenceOperation extends AbstractModelPersistenceOperatio
 	 *            允许为{@code null}，如果为{@code null}，则不写入SELECT语句
 	 * @param fromSql
 	 *            允许为{@code null}，如果为{@code null}，则不写入FROM语句
-	 * @param selectColumnPropertyPaths
+	 * @param queryColumnMetaInfos
 	 *            允许为{@code null}，写入SELECT结果集列别名信息的列表
 	 * @param modelPropertyPath
 	 *            允许为{@code null}，模型所处的上下文属性路径
@@ -894,7 +893,7 @@ public class SelectPersistenceOperation extends AbstractModelPersistenceOperatio
 	 * @param queryDepth
 	 */
 	protected void appendPropertyQueryView(Dialect dialect, Model model, SqlBuilder selectSql, SqlBuilder fromSql,
-			List<ColumnPropertyPath> selectColumnPropertyPaths, String modelPropertyPath, boolean asTokenModel,
+			List<QueryColumnMetaInfo> queryColumnMetaInfos, String modelPropertyPath, boolean asTokenModel,
 			String modelTableAliasQuote, String modelColumnAliasPrefix, TableAliasGenerator tableAliasGenerator,
 			String ignorePropertyName, String joinTypeSql, boolean appendCountForMultipleProperty, int queryDepth)
 	{
@@ -919,17 +918,16 @@ public class SelectPersistenceOperation extends AbstractModelPersistenceOperatio
 
 			if (mapper.isOneToOne() || mapper.isManyToOne())
 			{
-				appendPropertyQueryView(dialect, model, selectSql, fromSql, selectColumnPropertyPaths,
-						modelPropertyPath, isAsTokenProperty(asTokenModel, model, property), modelTableAliasQuote,
-						modelColumnAliasPrefix, property, i, mapper, tableAliasGenerator, null, joinTypeSql, false,
-						true, true, queryDepth);
+				appendPropertyQueryView(dialect, model, selectSql, fromSql, queryColumnMetaInfos, modelPropertyPath,
+						isAsTokenProperty(asTokenModel, model, property), modelTableAliasQuote, modelColumnAliasPrefix,
+						property, i, mapper, tableAliasGenerator, null, joinTypeSql, false, true, true, queryDepth);
 			}
 			else if (mapper.isOneToMany() || mapper.isManyToMany())
 			{
 				if (appendCountForMultipleProperty)
 				{
-					appendPropertyQueryView(dialect, model, selectSql, fromSql, selectColumnPropertyPaths,
-							modelPropertyPath, isAsTokenProperty(asTokenModel, model, property), modelTableAliasQuote,
+					appendPropertyQueryView(dialect, model, selectSql, fromSql, queryColumnMetaInfos, modelPropertyPath,
+							isAsTokenProperty(asTokenModel, model, property), modelTableAliasQuote,
 							modelColumnAliasPrefix, property, i, mapper, tableAliasGenerator, null, joinTypeSql, false,
 							true, true, queryDepth);
 				}
@@ -948,7 +946,7 @@ public class SelectPersistenceOperation extends AbstractModelPersistenceOperatio
 	 *            允许为{@code null}，如果为{@code null}，则不写入SELECT语句
 	 * @param fromSql
 	 *            允许为{@code null}，如果为{@code null}，则不写入FROM语句
-	 * @param selectColumnPropertyPaths
+	 * @param queryColumnMetaInfos
 	 *            允许为{@code null}，写入SELECT结果集列别名信息的列表
 	 * @param modelPropertyPath
 	 *            允许为{@code null}，模型所处的上下文属性路径
@@ -971,7 +969,7 @@ public class SelectPersistenceOperation extends AbstractModelPersistenceOperatio
 	 * @return
 	 */
 	protected boolean appendPropertyQueryView(Dialect dialect, Model model, SqlBuilder selectSql, SqlBuilder fromSql,
-			List<ColumnPropertyPath> selectColumnPropertyPaths, String modelPropertyPath, boolean asTokenProperty,
+			List<QueryColumnMetaInfo> queryColumnMetaInfos, String modelPropertyPath, boolean asTokenProperty,
 			String modelTableAliasQuote, String modelColumnAliasPrefix, Property property, int propertyIndex,
 			Mapper mapper, TableAliasGenerator tableAliasGenerator, SqlBuilder propertyTableFieldCondition,
 			String joinTypeSql, boolean appendModelTableMapperPrimitiveValueProperty,
@@ -989,17 +987,16 @@ public class SelectPersistenceOperation extends AbstractModelPersistenceOperatio
 		{
 			ModelTableMapper mtm = MapperUtil.castModelTableMapper(mapper);
 
-			return appendPropertyQueryViewForModelTableMapper(dialect, model, selectSql, fromSql,
-					selectColumnPropertyPaths, modelPropertyPath, asTokenProperty, modelTableAliasQuote,
-					modelColumnAliasPrefix, property, propertyIndex, mtm, tableAliasGenerator,
-					propertyTableFieldCondition, joinTypeSql, appendModelTableMapperPrimitiveValueProperty,
-					appendModelTableMapperEntityProperty, queryDepth);
+			return appendPropertyQueryViewForModelTableMapper(dialect, model, selectSql, fromSql, queryColumnMetaInfos,
+					modelPropertyPath, asTokenProperty, modelTableAliasQuote, modelColumnAliasPrefix, property,
+					propertyIndex, mtm, tableAliasGenerator, propertyTableFieldCondition, joinTypeSql,
+					appendModelTableMapperPrimitiveValueProperty, appendModelTableMapperEntityProperty, queryDepth);
 		}
 		else if (MapperUtil.isPropertyTableMapper(mapper))
 		{
 			PropertyTableMapper ptm = MapperUtil.castPropertyTableMapper(mapper);
 
-			appendPropertyQueryViewForPropertyTableMapper(dialect, model, selectSql, fromSql, selectColumnPropertyPaths,
+			appendPropertyQueryViewForPropertyTableMapper(dialect, model, selectSql, fromSql, queryColumnMetaInfos,
 					modelPropertyPath, asTokenProperty, modelTableAliasQuote, modelColumnAliasPrefix, property,
 					propertyIndex, ptm, tableAliasGenerator, propertyTableFieldCondition, joinTypeSql,
 					onlyCountForMultipleProperty, queryDepth);
@@ -1010,7 +1007,7 @@ public class SelectPersistenceOperation extends AbstractModelPersistenceOperatio
 		{
 			JoinTableMapper jtm = MapperUtil.castJoinTableMapper(mapper);
 
-			appendPropertyQueryViewForJoinTableMapper(dialect, model, selectSql, fromSql, selectColumnPropertyPaths,
+			appendPropertyQueryViewForJoinTableMapper(dialect, model, selectSql, fromSql, queryColumnMetaInfos,
 					modelPropertyPath, asTokenProperty, modelTableAliasQuote, modelColumnAliasPrefix, property,
 					propertyIndex, jtm, tableAliasGenerator, propertyTableFieldCondition, joinTypeSql,
 					onlyCountForMultipleProperty, queryDepth);
@@ -1032,7 +1029,7 @@ public class SelectPersistenceOperation extends AbstractModelPersistenceOperatio
 	 *            允许为{@code null}，如果为{@code null}，则不写入SELECT语句
 	 * @param fromSql
 	 *            允许为{@code null}，如果为{@code null}，则不写入FROM语句
-	 * @param selectColumnPropertyPaths
+	 * @param queryColumnMetaInfos
 	 *            允许为{@code null}，写入SELECT结果集列别名信息的列表
 	 * @param modelPropertyPath
 	 *            允许为{@code null}，模型所处的上下文属性路径
@@ -1053,7 +1050,7 @@ public class SelectPersistenceOperation extends AbstractModelPersistenceOperatio
 	 * @return
 	 */
 	protected boolean appendPropertyQueryViewForModelTableMapper(Dialect dialect, Model model, SqlBuilder selectSql,
-			SqlBuilder fromSql, List<ColumnPropertyPath> selectColumnPropertyPaths, String modelPropertyPath,
+			SqlBuilder fromSql, List<QueryColumnMetaInfo> queryColumnMetaInfos, String modelPropertyPath,
 			boolean asTokenProperty, String modelTableAliasQuote, String modelColumnAliasPrefix, Property property,
 			int propertyIndex, ModelTableMapper mapper, TableAliasGenerator tableAliasGenerator,
 			SqlBuilder propertyTableFieldCondition, String joinTypeSql,
@@ -1071,20 +1068,19 @@ public class SelectPersistenceOperation extends AbstractModelPersistenceOperatio
 		{
 			if (appendModelTableMapperPrimitiveValueProperty)
 			{
-				String columnNameQuote = toQuoteName(dialect, mapper.getPrimitiveColumnName());
+				String columnPath = modelTableAliasQuote + "." + toQuoteName(dialect, mapper.getPrimitiveColumnName());
 				String columnAlias = toPropertyPathColumnAlias(modelColumnAliasPrefix, property, propertyIndex);
-				String columnAliasQuote = toQuoteName(dialect, columnAlias);
 				JdbcType jdbcType = property.getFeature(JdbcType.class);
 
 				if (selectSql != null)
-					selectSql.sqld(modelTableAliasQuote + "." + columnNameQuote + " AS " + columnAliasQuote);
+					selectSql.sqld(columnPath + " AS " + toQuoteName(dialect, columnAlias));
 
-				if (selectColumnPropertyPaths != null)
+				if (queryColumnMetaInfos != null)
 				{
-					ColumnPropertyPath columnPropertyPath = new ColumnPropertyPath(columnAlias, columnAliasQuote,
+					QueryColumnMetaInfo queryColumnMetaInfo = new QueryColumnMetaInfo(columnPath, columnAlias,
 							jdbcType.getValue(), asTokenProperty, false,
 							getPropertyPath(model, property, modelPropertyPath));
-					selectColumnPropertyPaths.add(columnPropertyPath);
+					queryColumnMetaInfos.add(queryColumnMetaInfo);
 				}
 
 				appended = true;
@@ -1108,7 +1104,7 @@ public class SelectPersistenceOperation extends AbstractModelPersistenceOperatio
 				if (fromSql != null)
 					fromSql.sql(joinTypeSql);
 
-				appendModelQueryView(dialect, propertyModel, selectSql, fromSql, selectColumnPropertyPaths,
+				appendModelQueryView(dialect, propertyModel, selectSql, fromSql, queryColumnMetaInfos,
 						myModelPropertyPath, asTokenProperty, ptableNameQuote, ptableAliasQuote,
 						propertyTableFieldCondition, myColumnAliasPrefix, tableAliasGenerator);
 
@@ -1127,7 +1123,7 @@ public class SelectPersistenceOperation extends AbstractModelPersistenceOperatio
 				}
 
 				// 属性的属性查询要使用LEFT JOIN，因为可能有NULL属性值
-				appendPropertyQueryView(dialect, propertyModel, selectSql, fromSql, selectColumnPropertyPaths,
+				appendPropertyQueryView(dialect, propertyModel, selectSql, fromSql, queryColumnMetaInfos,
 						myModelPropertyPath, asTokenProperty, ptableAliasQuote, myColumnAliasPrefix,
 						tableAliasGenerator, getMappedByWith(mapper), " LEFT JOIN ", true, queryDepth - 1);
 
@@ -1146,7 +1142,7 @@ public class SelectPersistenceOperation extends AbstractModelPersistenceOperatio
 	 *            允许为{@code null}，如果为{@code null}，则不写入SELECT语句
 	 * @param fromSql
 	 *            允许为{@code null}，如果为{@code null}，则不写入FROM语句
-	 * @param selectColumnPropertyPaths
+	 * @param queryColumnMetaInfos
 	 *            允许为{@code null}，写入SELECT结果集列别名信息的列表
 	 * @param modelPropertyPath
 	 *            允许为{@code null}，模型所处的上下文属性路径
@@ -1165,7 +1161,7 @@ public class SelectPersistenceOperation extends AbstractModelPersistenceOperatio
 	 * @param queryDepth
 	 */
 	protected void appendPropertyQueryViewForPropertyTableMapper(Dialect dialect, Model model, SqlBuilder selectSql,
-			SqlBuilder fromSql, List<ColumnPropertyPath> selectColumnPropertyPaths, String modelPropertyPath,
+			SqlBuilder fromSql, List<QueryColumnMetaInfo> queryColumnMetaInfos, String modelPropertyPath,
 			boolean asTokenProperty, String modelTableAliasQuote, String modelColumnAliasPrefix, Property property,
 			int propertyIndex, PropertyTableMapper mapper, TableAliasGenerator tableAliasGenerator,
 			SqlBuilder propertyTableFieldCondition, String joinTypeSql, boolean onlyCountForMultipleProperty,
@@ -1195,26 +1191,27 @@ public class SelectPersistenceOperation extends AbstractModelPersistenceOperatio
 
 		if (onlyCount)
 		{
-			String sizeAlias = toPropertyPathColumnAlias(myColumnAliasPrefix, SizeOnlyCollection.SIZE_PROPERTY_NAME);
-			String sizeQuoteAlias = toQuoteName(dialect, sizeAlias);
+			String columnAlias = toPropertyPathColumnAlias(myColumnAliasPrefix, SizeOnlyCollection.SIZE_PROPERTY_NAME);
+			String columnAliasQuote = toQuoteName(dialect, columnAlias);
+			String columnPath = ptableAliasQuote + "." + columnAliasQuote;
 
 			if (selectSql != null)
-				selectSql.sqld("(CASE WHEN " + ptableAliasQuote + "." + sizeQuoteAlias + " IS NOT NULL THEN "
-						+ ptableAliasQuote + "." + sizeQuoteAlias + " ELSE 0 END) AS " + sizeQuoteAlias);
+				selectSql.sqld("(CASE WHEN " + columnPath + " IS NOT NULL THEN " + columnPath + " ELSE 0 END) AS "
+						+ columnAliasQuote);
 
-			if (selectColumnPropertyPaths != null)
+			if (queryColumnMetaInfos != null)
 			{
-				ColumnPropertyPath columnPropertyPath = new ColumnPropertyPath(sizeAlias, sizeQuoteAlias, Types.BIGINT,
+				QueryColumnMetaInfo queryColumnMetaInfo = new QueryColumnMetaInfo(columnPath, columnAlias, Types.BIGINT,
 						asTokenProperty, true,
 						PropertyPath.concatPropertyName(myModelPropertyPath, SizeOnlyCollection.SIZE_PROPERTY_NAME));
-				selectColumnPropertyPaths.add(columnPropertyPath);
+				queryColumnMetaInfos.add(queryColumnMetaInfo);
 			}
 
 			if (fromSql != null)
 			{
 				fromSql.sql(" (SELECT ").delimit(", ");
 
-				fromSql.sqld(" COUNT(*) AS " + sizeQuoteAlias);
+				fromSql.sqld(" COUNT(*) AS " + columnAliasQuote);
 
 				for (int i = 0; i < ptableMkeyColumnNamesQuote.length; i++)
 					fromSql.sqld(ptableMkeyColumnNamesQuote[i]);
@@ -1231,9 +1228,9 @@ public class SelectPersistenceOperation extends AbstractModelPersistenceOperatio
 		}
 		else
 		{
-			appendModelQueryView(dialect, propertyModel, selectSql, fromSql, selectColumnPropertyPaths,
-					myModelPropertyPath, asTokenProperty, ptableNameQuote, ptableAliasQuote,
-					propertyTableFieldCondition, myColumnAliasPrefix, tableAliasGenerator);
+			appendModelQueryView(dialect, propertyModel, selectSql, fromSql, queryColumnMetaInfos, myModelPropertyPath,
+					asTokenProperty, ptableNameQuote, ptableAliasQuote, propertyTableFieldCondition,
+					myColumnAliasPrefix, tableAliasGenerator);
 		}
 
 		if (fromSql != null)
@@ -1252,7 +1249,7 @@ public class SelectPersistenceOperation extends AbstractModelPersistenceOperatio
 		if (!onlyCount)
 		{
 			// 属性的属性查询要使用LEFT JOIN，因为可能有NULL属性值
-			appendPropertyQueryView(dialect, propertyModel, selectSql, fromSql, selectColumnPropertyPaths,
+			appendPropertyQueryView(dialect, propertyModel, selectSql, fromSql, queryColumnMetaInfos,
 					myModelPropertyPath, asTokenProperty, ptableAliasQuote, myColumnAliasPrefix, tableAliasGenerator,
 					getMappedByWith(mapper), " LEFT JOIN ", true, queryDepth - 1);
 		}
@@ -1266,7 +1263,7 @@ public class SelectPersistenceOperation extends AbstractModelPersistenceOperatio
 	 *            允许为{@code null}，如果为{@code null}，则不写入SELECT语句
 	 * @param fromSql
 	 *            允许为{@code null}，如果为{@code null}，则不写入FROM语句
-	 * @param selectColumnPropertyPaths
+	 * @param queryColumnMetaInfos
 	 *            允许为{@code null}，写入SELECT结果集列别名信息的列表
 	 * @param modelPropertyPath
 	 *            允许为{@code null}，模型所处的上下文属性路径
@@ -1285,7 +1282,7 @@ public class SelectPersistenceOperation extends AbstractModelPersistenceOperatio
 	 * @param queryDepth
 	 */
 	protected void appendPropertyQueryViewForJoinTableMapper(Dialect dialect, Model model, SqlBuilder selectSql,
-			SqlBuilder fromSql, List<ColumnPropertyPath> selectColumnPropertyPaths, String modelPropertyPath,
+			SqlBuilder fromSql, List<QueryColumnMetaInfo> queryColumnMetaInfos, String modelPropertyPath,
 			boolean asTokenProperty, String modelTableAliasQuote, String modelColumnAliasPrefix, Property property,
 			int propertyIndex, JoinTableMapper mapper, TableAliasGenerator tableAliasGenerator,
 			SqlBuilder propertyTableFieldCondition, String joinTypeSql, boolean onlyCountForMultipleProperty,
@@ -1314,26 +1311,27 @@ public class SelectPersistenceOperation extends AbstractModelPersistenceOperatio
 
 		if (onlyCount)
 		{
-			String sizeAlias = toPropertyPathColumnAlias(myColumnAliasPrefix, SizeOnlyCollection.SIZE_PROPERTY_NAME);
-			String sizeQuoteAlias = toQuoteName(dialect, sizeAlias);
+			String columnAlias = toPropertyPathColumnAlias(myColumnAliasPrefix, SizeOnlyCollection.SIZE_PROPERTY_NAME);
+			String columnAliasQuote = toQuoteName(dialect, columnAlias);
+			String columnPath = jointableAliasQuote + "." + columnAliasQuote;
 
 			if (selectSql != null)
-				selectSql.sqld("(CASE WHEN " + jointableAliasQuote + "." + sizeQuoteAlias + " IS NOT NULL THEN "
-						+ jointableAliasQuote + "." + sizeQuoteAlias + " ELSE 0 END) AS " + sizeQuoteAlias);
+				selectSql.sqld("(CASE WHEN " + columnPath + " IS NOT NULL THEN " + columnPath + " ELSE 0 END) AS "
+						+ columnAliasQuote);
 
-			if (selectColumnPropertyPaths != null)
+			if (queryColumnMetaInfos != null)
 			{
-				ColumnPropertyPath columnPropertyPath = new ColumnPropertyPath(sizeAlias, sizeQuoteAlias, Types.BIGINT,
+				QueryColumnMetaInfo queryColumnMetaInfo = new QueryColumnMetaInfo(columnPath, columnAlias, Types.BIGINT,
 						asTokenProperty, true,
 						PropertyPath.concatPropertyName(myModelPropertyPath, SizeOnlyCollection.SIZE_PROPERTY_NAME));
-				selectColumnPropertyPaths.add(columnPropertyPath);
+				queryColumnMetaInfos.add(queryColumnMetaInfo);
 			}
 
 			if (fromSql != null)
 			{
 				fromSql.sql(" (SELECT ").delimit(", ");
 
-				fromSql.sqld(" COUNT(*) AS " + sizeQuoteAlias);
+				fromSql.sqld(" COUNT(*) AS " + columnAliasQuote);
 
 				for (int i = 0; i < mkeyColumnNamesQuote.length; i++)
 					fromSql.sqld(mkeyColumnNamesQuote[i]);
@@ -1381,9 +1379,9 @@ public class SelectPersistenceOperation extends AbstractModelPersistenceOperatio
 			if (fromSql != null)
 				fromSql.sql(joinTypeSql);
 
-			appendModelQueryView(dialect, propertyModel, selectSql, fromSql, selectColumnPropertyPaths,
-					myModelPropertyPath, asTokenProperty, ptableNameQuote, ptableAliasQuote,
-					propertyTableFieldCondition, myColumnAliasPrefix, tableAliasGenerator);
+			appendModelQueryView(dialect, propertyModel, selectSql, fromSql, queryColumnMetaInfos, myModelPropertyPath,
+					asTokenProperty, ptableNameQuote, ptableAliasQuote, propertyTableFieldCondition,
+					myColumnAliasPrefix, tableAliasGenerator);
 
 			if (fromSql != null)
 			{
@@ -1404,7 +1402,7 @@ public class SelectPersistenceOperation extends AbstractModelPersistenceOperatio
 			}
 
 			// 属性的属性查询要使用LEFT JOIN，因为可能有NULL属性值
-			appendPropertyQueryView(dialect, propertyModel, selectSql, fromSql, selectColumnPropertyPaths,
+			appendPropertyQueryView(dialect, propertyModel, selectSql, fromSql, queryColumnMetaInfos,
 					myModelPropertyPath, asTokenProperty, ptableAliasQuote, myColumnAliasPrefix, tableAliasGenerator,
 					getMappedByWith(mapper), " LEFT JOIN ", true, queryDepth - 1);
 		}
@@ -1509,24 +1507,26 @@ public class SelectPersistenceOperation extends AbstractModelPersistenceOperatio
 	}
 
 	/**
-	 * 将给定字符串中的{@linkplain ColumnPropertyPath#getPropertyPath()}替换为{@linkplain ColumnPropertyPath#getColumnName()}。
+	 * 将给定字符串中的{@linkplain QueryColumnMetaInfo#getPropertyPath()}替换为{@linkplain QueryColumnMetaInfo#getColumnPath()}。
 	 * 
-	 * @param columnPropertyPaths
+	 * @param dialect
+	 * @param queryColumnMetaInfos
 	 * @param str
 	 * @return
 	 */
-	protected String replacePropertyPathToQuoteColumnName(List<ColumnPropertyPath> columnPropertyPaths, String str)
+	protected String replacePropertyPathToColumnPath(Dialect dialect, List<QueryColumnMetaInfo> queryColumnMetaInfos,
+			String str)
 	{
 		if (str == null || str.isEmpty())
 			return str;
 
-		List<ColumnPropertyPath> myColumnPropertyPaths = new ArrayList<ColumnPropertyPath>(columnPropertyPaths);
+		List<QueryColumnMetaInfo> myQueryColumnMetaInfos = new ArrayList<QueryColumnMetaInfo>(queryColumnMetaInfos);
 
 		// 优先替换更长的属性路径，避免长路径名里包含短路径名时导致替换错乱
-		Collections.sort(myColumnPropertyPaths, new Comparator<ColumnPropertyPath>()
+		Collections.sort(myQueryColumnMetaInfos, new Comparator<QueryColumnMetaInfo>()
 		{
 			@Override
-			public int compare(ColumnPropertyPath o1, ColumnPropertyPath o2)
+			public int compare(QueryColumnMetaInfo o1, QueryColumnMetaInfo o2)
 			{
 				String o1PropertyPath = o1.getPropertyPath();
 				String o2PropertyPath = o2.getPropertyPath();
@@ -1538,13 +1538,12 @@ public class SelectPersistenceOperation extends AbstractModelPersistenceOperatio
 			}
 		});
 
-		for (ColumnPropertyPath columnPropertyPath : myColumnPropertyPaths)
+		for (QueryColumnMetaInfo queryColumnMetaInfo : myQueryColumnMetaInfos)
 		{
-			String pp = columnPropertyPath.getPropertyPath();
-			String qcn = columnPropertyPath.getColumnNameQuote();
+			String pp = queryColumnMetaInfo.getPropertyPath();
 
 			str = Pattern.compile(pp, Pattern.LITERAL | Pattern.CASE_INSENSITIVE).matcher(str)
-					.replaceAll(Matcher.quoteReplacement(qcn));
+					.replaceAll(Matcher.quoteReplacement(queryColumnMetaInfo.getColumnPath()));
 		}
 
 		return str;
@@ -1619,15 +1618,18 @@ public class SelectPersistenceOperation extends AbstractModelPersistenceOperatio
 
 	/**
 	 * 由{@linkplain Query}构建查询条件SQL。
+	 * <p>
+	 * 如果没有任何查询条件，返回{@code null}。
+	 * </p>
 	 * 
 	 * @param dialect
 	 * @param model
 	 * @param query
-	 * @param selectColumnPropertyPaths
+	 * @param queryColumnMetaInfos
 	 * @return
 	 */
 	protected SqlBuilder buildQueryCondition(Dialect dialect, Model model, Query query,
-			List<ColumnPropertyPath> selectColumnPropertyPaths)
+			List<QueryColumnMetaInfo> queryColumnMetaInfos)
 	{
 		if (!query.hasKeyword() && !query.hasCondition())
 			return null;
@@ -1635,7 +1637,7 @@ public class SelectPersistenceOperation extends AbstractModelPersistenceOperatio
 		String conditionStr = (query.hasCondition() ? query.getCondition().trim() : null);
 		boolean hasCondition = !StringUtil.isEmpty(conditionStr);
 
-		SqlBuilder keywordCondition = dialect.toKeywordQueryCondition(model, query, selectColumnPropertyPaths);
+		SqlBuilder keywordCondition = dialect.toKeywordQueryCondition(model, query, queryColumnMetaInfos);
 
 		if (!hasCondition)
 		{
@@ -1645,7 +1647,7 @@ public class SelectPersistenceOperation extends AbstractModelPersistenceOperatio
 		{
 			SqlBuilder queryCondition = SqlBuilder.valueOf();
 
-			conditionStr = replacePropertyPathToQuoteColumnName(selectColumnPropertyPaths, conditionStr);
+			conditionStr = replacePropertyPathToColumnPath(dialect, queryColumnMetaInfos, conditionStr);
 
 			if (SqlBuilder.isEmpty(keywordCondition))
 				queryCondition.sql(conditionStr);
@@ -1662,11 +1664,11 @@ public class SelectPersistenceOperation extends AbstractModelPersistenceOperatio
 	 * @param dialect
 	 * @param model
 	 * @param query
-	 * @param selectColumnPropertyPaths
+	 * @param queryColumnMetaInfos
 	 * @return
 	 */
 	protected Order[] buildQueryOrders(Dialect dialect, Model model, Query query,
-			List<ColumnPropertyPath> selectColumnPropertyPaths)
+			List<QueryColumnMetaInfo> queryColumnMetaInfos)
 	{
 		if (!query.hasOrder())
 			return null;
@@ -1687,25 +1689,25 @@ public class SelectPersistenceOperation extends AbstractModelPersistenceOperatio
 
 			int orderNameLength = orderName.length();
 
-			ColumnPropertyPath exactlyMatched = null;
-			List<ColumnPropertyPath> startsWiths = null;
+			QueryColumnMetaInfo exactlyMatched = null;
+			List<QueryColumnMetaInfo> startsWiths = null;
 			boolean startsWithsHasToken = false;
 
-			for (ColumnPropertyPath columnPropertyPath : selectColumnPropertyPaths)
+			for (QueryColumnMetaInfo queryColumnMetaInfo : queryColumnMetaInfos)
 			{
-				int sqlType = columnPropertyPath.getColumnSqlType();
+				int sqlType = queryColumnMetaInfo.getColumnSqlType();
 
 				if (!dialect.isSortable(sqlType))
 					continue;
 
-				String propertyPath = columnPropertyPath.getPropertyPath();
+				String propertyPath = queryColumnMetaInfo.getPropertyPath();
 
 				if (propertyPath.startsWith(orderName))
 				{
 					// 基本属性
 					if (propertyPath.length() == orderNameLength)
 					{
-						exactlyMatched = columnPropertyPath;
+						exactlyMatched = queryColumnMetaInfo;
 						break;
 					}
 					else
@@ -1716,11 +1718,11 @@ public class SelectPersistenceOperation extends AbstractModelPersistenceOperatio
 						if (c == PropertyPath.PROPERTY)
 						{
 							if (startsWiths == null)
-								startsWiths = new ArrayList<ColumnPropertyPath>();
+								startsWiths = new ArrayList<QueryColumnMetaInfo>();
 
-							startsWiths.add(columnPropertyPath);
+							startsWiths.add(queryColumnMetaInfo);
 
-							if (!startsWithsHasToken && columnPropertyPath.isToken())
+							if (!startsWithsHasToken && queryColumnMetaInfo.isToken())
 								startsWithsHasToken = true;
 						}
 					}
@@ -1729,23 +1731,23 @@ public class SelectPersistenceOperation extends AbstractModelPersistenceOperatio
 
 			if (exactlyMatched != null)
 			{
-				re.add(Order.valueOf(exactlyMatched.getColumnNameQuote(), orderType));
+				re.add(Order.valueOf(toQuoteName(dialect, exactlyMatched.getColumnAlias()), orderType));
 			}
 			else if (startsWiths != null)
 			{
 				for (int j = 0; j < startsWiths.size(); j++)
 				{
-					ColumnPropertyPath startsWith = startsWiths.get(j);
+					QueryColumnMetaInfo startsWith = startsWiths.get(j);
 
 					// 优先取Token属性
 					if (startsWithsHasToken)
 					{
 						if (startsWith.isToken())
-							re.add(Order.valueOf(startsWith.getColumnNameQuote(), orderType));
+							re.add(Order.valueOf(dialect.getPagingQueryOrderName(startsWith), orderType));
 					}
 					else
 					{
-						re.add(Order.valueOf(startsWith.getColumnNameQuote(), orderType));
+						re.add(Order.valueOf(dialect.getPagingQueryOrderName(startsWith), orderType));
 					}
 
 					// 无论是否Token属性，都仅取前三个，避免过多排序项影响性能

datagear-persistence/src/main/java/org/datagear/persistence/support/dialect/MysqlDialect.java

@@ -33,33 +33,23 @@ public class MysqlDialect extends AbstractDialect
 	}
 
 	@Override
-	public SqlBuilder toPagingSql(SqlBuilder queryView, SqlBuilder condition, Order[] orders, long startRow, int count)
+	public SqlBuilder toPagingQuerySql(SqlBuilder query, Order[] orders, long startRow, int count)
 	{
 		SqlBuilder sql = SqlBuilder.valueOf();
 
 		SqlBuilder orderSql = toOrderSql(orders);
 
-		if (isEmptySql(condition) && isEmptySql(orderSql))
+		if (isEmptySql(orderSql))
 		{
-			sql.sql(queryView);
+			sql.sql(query);
 		}
 		else
 		{
 			sql.sql("SELECT * FROM (");
-			sql.sql(queryView);
-			sql.sql(") t ");
-
-			if (!isEmptySql(condition))
-			{
-				sql.sql(" WHERE ");
-				sql.sql(condition);
-			}
-
-			if (!isEmptySql(orderSql))
-			{
-				sql.sql(" ORDER BY ");
-				sql.sql(orderSql);
-			}
+			sql.sql(query);
+			sql.sql(") T ");
+			sql.sql(" ORDER BY ");
+			sql.sql(orderSql);
 		}
 
 		sql.sql(" LIMIT " + (startRow - 1) + ", " + count);

datagear-persistence/src/main/java/org/datagear/persistence/support/dialect/OracleDialect.java

@@ -33,7 +33,7 @@ public class OracleDialect extends AbstractDialect
 	}
 
 	@Override
-	public SqlBuilder toPagingSql(SqlBuilder queryView, SqlBuilder condition, Order[] orders, long startRow, int count)
+	public SqlBuilder toPagingQuerySql(SqlBuilder query, Order[] orders, long startRow, int count)
 	{
 		SqlBuilder sql = SqlBuilder.valueOf();
 
@@ -41,22 +41,16 @@ public class OracleDialect extends AbstractDialect
 
 		sql.sql("SELECT T2.* FROM (SELECT T1.*, ROWNUM AS ROWNUM_____ FROM (");
 
-		if (isEmptySql(condition) && isEmptySql(orderSql))
+		if (isEmptySql(orderSql))
 		{
-			sql.sql(queryView);
+			sql.sql(query);
 		}
 		else
 		{
 			sql.sql("SELECT * FROM (");
-			sql.sql(queryView);
+			sql.sql(query);
 			sql.sql(") T0 ");
 
-			if (!isEmptySql(condition))
-			{
-				sql.sql(" WHERE ");
-				sql.sql(condition);
-			}
-
 			if (!isEmptySql(orderSql))
 			{
 				sql.sql(" ORDER BY ");

datagear-persistence/src/main/java/org/datagear/persistence/support/dialect/SqlServerDialect.java

@@ -33,7 +33,7 @@ public class SqlServerDialect extends AbstractDialect
 	}
 
 	@Override
-	public SqlBuilder toPagingSql(SqlBuilder queryView, SqlBuilder condition, Order[] orders, long startRow, int count)
+	public SqlBuilder toPagingQuerySql(SqlBuilder query, Order[] orders, long startRow, int count)
 	{
 		// SqlServer分页需要排序字段
 		if (orders == null || orders.length == 0)
@@ -44,12 +44,9 @@ public class SqlServerDialect extends AbstractDialect
 		SqlBuilder orderSql = toOrderSql(orders);
 
 		sql.sql("SELECT T1.* FROM (SELECT ROW_NUMBER() OVER (ORDER BY ").sql(orderSql).sql(") AS ROWNUM_____, T0.* ");
-		sql.sql(" FROM (").sql(queryView).sql(
+		sql.sql(" FROM (").sql(query).sql(
 				") T0 ) T1 WHERE (T1.ROWNUM_____ >= " + startRow + " AND T1.ROWNUM_____ < " + (startRow + count) + ")");
 
-		if (!isEmptySql(condition))
-			sql.sql(" AND (").sql(condition).sql(")");
-
 		return sql;
 	}
 }

datagear-web/src/main/java/org/datagear/web/controller/DataController.java

@@ -33,7 +33,7 @@ import org.datagear.model.features.NotEditable;
 import org.datagear.model.support.MU;
 import org.datagear.model.support.PropertyPath;
 import org.datagear.model.support.PropertyPathInfo;
-import org.datagear.persistence.ColumnPropertyPath;
+import org.datagear.persistence.QueryColumnMetaInfo;
 import org.datagear.persistence.Dialect;
 import org.datagear.persistence.PagingData;
 import org.datagear.persistence.PagingQuery;
@@ -2008,12 +2008,12 @@ public class DataController extends AbstractSchemaModelConnController
 	{
 		List<PropertyPathDisplayName> propertyPathDisplayNames = new ArrayList<PropertyPathDisplayName>();
 
-		List<ColumnPropertyPath> columnPropertyPaths = queryResultMetaInfo.getColumnPropertyPaths();
-		for (ColumnPropertyPath columnPropertyPath : columnPropertyPaths)
+		List<QueryColumnMetaInfo> queryColumnMetaInfos = queryResultMetaInfo.getQueryColumnMetaInfos();
+		for (QueryColumnMetaInfo queryColumnMetaInfo : queryColumnMetaInfos)
 		{
 			PropertyPathDisplayName propertyPathDisplayName = new PropertyPathDisplayName();
 
-			String propertyPath = columnPropertyPath.getPropertyPath();
+			String propertyPath = queryColumnMetaInfo.getPropertyPath();
 
 			propertyPathDisplayName.setPropertyPath(propertyPath);
 			propertyPathDisplayName.setDisplayName(ModelUtils.displayName(queryResultMetaInfo.getModel(),