3.0.4.52

noear · Sep 19, 2017 · 2ae5764 · 2ae5764
1 parent 58ecc8f
commit 2ae5764
Show file tree

Hide file tree

Showing 10 changed files with 137 additions and 98 deletions.
diff --git a/java/.idea/workspace.xml b/java/.idea/workspace.xml
diff --git a/java/Weed3/META-INF/MANIFEST.MF b/java/Weed3/META-INF/MANIFEST.MF
@@ -1,2 +1,2 @@
-Manifest-Version: 3.0.4.51
+Manifest-Version: 3.0.4.52
 
diff --git a/java/Weed3/src/_readme.txt b/java/Weed3/src/_readme.txt
@@ -1,3 +1,6 @@
+3.0.4.52::
+1.DbTableQueryBase::修改.添加 count(...);
+
 3.0.4.51::
 1.WeedConfig::修改.添加 onExecuteAft
 2.WeedConfig::修改.添加 onExecuteBef
@@ -6,7 +9,7 @@
 5.DbTableQueryBase::修改.添加 count();
 6.DbTableQueryBase::修改.添加 from();
 7.DbTableQueryBase::修改.添加 log(...);
-1.DbTableQueryBase::修改.添加 insertUpdate();
+1.DbTableQueryBase::修改.添加 updateList(); //测试
 
 3.0.4.50::
 1.DataItem::修改.取消 intValue2(); //同上

diff --git a/java/Weed3/src/noear/weed/Command.java b/java/Weed3/src/noear/weed/Command.java
@@ -11,6 +11,8 @@ public class Command {
     public String       tag;
     /*是否进行日志*/
     public boolean      isLog = false;
+
+
     /*命令id*/
     public String       key;
     /*命令文本*/

diff --git a/java/Weed3/src/noear/weed/DbAccess.java b/java/Weed3/src/noear/weed/DbAccess.java
@@ -27,7 +27,7 @@ public abstract class DbAccess<T extends DbAccess> implements IWeedKey,IQuery,Se
     /*获取访问标识（由子类实现）*/
     protected abstract String getCommandID();
 
-    protected Act1<Command> onCommandExpr = null;
+    private Act1<Command> onCommandExpr = null;
 
     public T onCommandBuilt(Act1<Command> expr){
         this.onCommandExpr = expr;

diff --git a/java/Weed3/src/noear/weed/DbTableQueryBase.java b/java/Weed3/src/noear/weed/DbTableQueryBase.java
@@ -421,7 +421,11 @@ public T hint(String hint){
     }
 
     public long count() throws SQLException{
-        return select("COUNT(*)").getVariate().longValue(0l);
+        return count("COUNT(*)");
+    }
+
+    public long count(String expr) throws SQLException{
+        return select(expr).getVariate().longValue(0l);
     }
 
     public IQuery select(String columns) {

diff --git a/java/out/production/Weed3/_readme.txt b/java/out/production/Weed3/_readme.txt
@@ -1,3 +1,6 @@
+3.0.4.52::
+1.DbTableQueryBase::修改.添加 count(...);
+
 3.0.4.51::
 1.WeedConfig::修改.添加 onExecuteAft
 2.WeedConfig::修改.添加 onExecuteBef
@@ -6,7 +9,7 @@
 5.DbTableQueryBase::修改.添加 count();
 6.DbTableQueryBase::修改.添加 from();
 7.DbTableQueryBase::修改.添加 log(...);
-1.DbTableQueryBase::修改.添加 insertUpdate();
+1.DbTableQueryBase::修改.添加 updateList(); //测试
 
 3.0.4.50::
 1.DataItem::修改.取消 intValue2(); //同上

diff --git a/java/out/production/Weed3/noear/weed/Command.class b/java/out/production/Weed3/noear/weed/Command.class
diff --git a/java/out/production/Weed3/noear/weed/DbAccess.class b/java/out/production/Weed3/noear/weed/DbAccess.class
diff --git a/java/out/production/Weed3/noear/weed/DbTableQueryBase.class b/java/out/production/Weed3/noear/weed/DbTableQueryBase.class