Browse Source

添加 getSql(String, Map)

James 3 years ago
parent
commit
9edf539535

+ 4 - 0
src/main/java/com/jfinal/plugin/activerecord/Db.java

@@ -704,6 +704,10 @@ public class Db {
     	return MAIN.getSql(key);
     	return MAIN.getSql(key);
     }
     }
     
     
+    public static String getSql(String key, Map data) {
+        return MAIN.getSql(key, data);
+    }
+    
     public static SqlPara getSqlPara(String key, Record record) {
     public static SqlPara getSqlPara(String key, Record record) {
     	return MAIN.getSqlPara(key, record);
     	return MAIN.getSqlPara(key, record);
     }
     }

+ 4 - 0
src/main/java/com/jfinal/plugin/activerecord/DbPro.java

@@ -1386,6 +1386,10 @@ public class DbPro {
     	return config.getSqlKit().getSql(key);
     	return config.getSqlKit().getSql(key);
     }
     }
     
     
+    public String getSql(String key, Map data) {
+        return config.getSqlKit().getSql(key, data);
+    }
+    
     public SqlPara getSqlPara(String key, Record record) {
     public SqlPara getSqlPara(String key, Record record) {
     	return getSqlPara(key, record.getColumns());
     	return getSqlPara(key, record.getColumns());
     }
     }

+ 7 - 3
src/main/java/com/jfinal/plugin/activerecord/sql/SqlKit.java

@@ -113,7 +113,7 @@ public class SqlKit {
 		return false;
 		return false;
 	}
 	}
 	
 	
-	private Template getSqlTemplate(String key) {
+	public Template getSqlTemplate(String key) {
 		Template template = sqlTemplateMap.get(key);
 		Template template = sqlTemplateMap.get(key);
 		if (template == null) {	// 此 if 分支,处理起初没有定义,但后续不断追加 sql 的情况
 		if (template == null) {	// 此 if 分支,处理起初没有定义,但后续不断追加 sql 的情况
 			if ( !devMode ) {
 			if ( !devMode ) {
@@ -143,10 +143,14 @@ public class SqlKit {
 	}
 	}
 	
 	
 	public String getSql(String key) {
 	public String getSql(String key) {
-		Template template = getSqlTemplate(key);
-		return template != null ? template.renderToString(null) : null;
+		return getSql(key, null);
 	}
 	}
 	
 	
+	public String getSql(String key, Map data) {
+        Template template = getSqlTemplate(key);
+        return template != null ? template.renderToString(data) : null;
+    }
+	
 	/**
 	/**
 	 * 示例:
 	 * 示例:
 	 * 1:sql 定义
 	 * 1:sql 定义