From 4b91d6f9fd8e3e7866e8ecf285d7ea4659b2eecc Mon Sep 17 00:00:00 2001 From: wenshao Date: Mon, 23 May 2011 08:55:28 +0000 Subject: [PATCH] =?UTF-8?q?=E6=B7=B7=E6=B7=86=E6=B5=8B=E8=AF=95=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://code.alibabatech.com/svn/druid/trunk@203 b9813039-fb51-4c41-a8b9-e21c2acb5095 --- src/test/resources/bvt/parser/oracle-0.txt | 4 ++-- src/test/resources/bvt/parser/oracle-1.txt | 4 ++-- src/test/resources/bvt/parser/oracle-15.txt | 12 +++++------ src/test/resources/bvt/parser/oracle-19.txt | 4 ++-- src/test/resources/bvt/parser/oracle-20.txt | 22 ++++++++++----------- src/test/resources/bvt/parser/oracle-21.txt | 4 ++-- src/test/resources/bvt/parser/oracle-22.txt | 8 ++++---- src/test/resources/bvt/parser/oracle-23.txt | 4 ++-- 8 files changed, 31 insertions(+), 31 deletions(-) diff --git a/src/test/resources/bvt/parser/oracle-0.txt b/src/test/resources/bvt/parser/oracle-0.txt index 26cb4b4b59..9eff01390f 100644 --- a/src/test/resources/bvt/parser/oracle-0.txt +++ b/src/test/resources/bvt/parser/oracle-0.txt @@ -2,7 +2,7 @@ SELECT                 ID as id,                 to_char(GMT_MODIFIED,'yyyymmdd hh24:mi:ss') as gmtModified,                                COL5 as col5             -FROM BPM_ACTINST             +FROM ABC_ABC             WHERE IS_DELETED='n'                   AND end_time is null   AND deadline_time < sysdate   @@ -14,6 +14,6 @@ AND rownum<:34   ORDER BY id   ; --------------------------- SELECT ID AS id, to_char(GMT_MODIFIED, 'yyyymmdd hh24:mi:ss') AS gmtModified, COL5 AS col5 -FROM BPM_ACTINST +FROM ABC_ABC WHERE IS_DELETED = 'n' AND end_time IS NULL AND deadline_time < sysdate AND approval_time IS NULL AND id > :1 AND (col2 IN (:2, :3, :4, :5, :6, :7, :8, :9, :10, :11, :12, :13, :14, :15, :16, :17, :18, :19, :20, :21, :22, :23, :24, :25, :26, :27, :28, :29, :30, :31, :32, :33) AND rownum < :34) ORDER BY id; \ No newline at end of file diff --git a/src/test/resources/bvt/parser/oracle-1.txt b/src/test/resources/bvt/parser/oracle-1.txt index d01da35542..b888f3a816 100644 --- a/src/test/resources/bvt/parser/oracle-1.txt +++ b/src/test/resources/bvt/parser/oracle-1.txt @@ -1,4 +1,4 @@ -INSERT INTO GLOBAL_ACCOUNT_SMD +INSERT INTO AC_DE_F (ID, GMT_MODIFIED, MODIFIER, @@ -58,7 +58,7 @@ INSERT INTO GLOBAL_ACCOUNT_SMD WHERE ACCOUNT_ID = :B2 AND DOMAIN = :B1 --------------------------- -INSERT INTO GLOBAL_ACCOUNT_SMD +INSERT INTO AC_DE_F (ID, GMT_MODIFIED, MODIFIER, GMT_CREATE, CREATOR , DOMAIN, EMPLOYEE_NUMBER, COMPANY_NAME, HOMEPAGE_URL, BACKGROUND , CATEGORY_ID, REMARK, MEMBER_ID, SALES_OWNER_ID, ACCOUNT_ID diff --git a/src/test/resources/bvt/parser/oracle-15.txt b/src/test/resources/bvt/parser/oracle-15.txt index 92c419fa99..d358ea43cf 100644 --- a/src/test/resources/bvt/parser/oracle-15.txt +++ b/src/test/resources/bvt/parser/oracle-15.txt @@ -7,9 +7,9 @@ FROM (SELECT A.*, rownum cnt E.DESCRIPTION AS CUSTSTATNAME, F.DESCRIPTION AS ATYPENAME, null AS FNAME, G.DESCRIPTION AS B2BVALIDFLAGNAME, A.VALIDFLAG FROM Q_CUSTOMERS A, Q_CUSTINFO C, - (SELECT * FROM Q_DOMAINCDSTRING WHERE DOMAINCD = 'CUSTOMERS_CUSTSTAT') E, - (SELECT * FROM Q_DOMAINCDSTRING WHERE DOMAINCD = 'CUSTOMERS_ATYPE') F, - (SELECT * FROM Q_DOMAINCDSTRING WHERE DOMAINCD = 'CUSTOMERS_B2BVALIDFLAG') G + (SELECT * FROM F_A_DE WHERE DOMAINCD = 'CUSTOMERS_CUSTSTAT') E, + (SELECT * FROM F_A_DE WHERE DOMAINCD = 'CUSTOMERS_ATYPE') F, + (SELECT * FROM F_A_DE WHERE DOMAINCD = 'CUSTOMERS_B2BVALIDFLAG') G WHERE A.CUSTID = C.CUSTID AND A.CUSTSTAT = E.CODE( + ) @@ -26,13 +26,13 @@ FROM (SELECT A.*, rownum AS cnt , C.CONTFAX, C.CONTEMAIL, C.CUSTAREA AS AREANAME, C.CUSTADDR, C.ORGINDUSTRY AS ORGINDUSTRYNAME , E.DESCRIPTION AS CUSTSTATNAME, F.DESCRIPTION AS ATYPENAME, NULL AS FNAME, G.DESCRIPTION AS B2BVALIDFLAGNAME, A.VALIDFLAG FROM Q_CUSTOMERS A, Q_CUSTINFO C, (SELECT * - FROM Q_DOMAINCDSTRING + FROM F_A_DE WHERE DOMAINCD = 'CUSTOMERS_CUSTSTAT' ) E, (SELECT * - FROM Q_DOMAINCDSTRING + FROM F_A_DE WHERE DOMAINCD = 'CUSTOMERS_ATYPE' ) F, (SELECT * - FROM Q_DOMAINCDSTRING + FROM F_A_DE WHERE DOMAINCD = 'CUSTOMERS_B2BVALIDFLAG' ) G WHERE A.CUSTID = C.CUSTID AND A.CUSTSTAT = CODE(+) AND A.ATYPE = CODE(+) AND A.b2bValidFlag = CODE(+) AND A.MEMBERID = ? diff --git a/src/test/resources/bvt/parser/oracle-19.txt b/src/test/resources/bvt/parser/oracle-19.txt index 7421c95ef5..1445dea007 100644 --- a/src/test/resources/bvt/parser/oracle-19.txt +++ b/src/test/resources/bvt/parser/oracle-19.txt @@ -3,7 +3,7 @@ from ( select rownum rnm, z.* from ( select name as value,value as key - from app_resource_cae + from a_b_c where is_deleted='n' and type='fuse' order by ordering ) z where rownum < ? ) where rnm >= ? @@ -13,7 +13,7 @@ where rownum < ? ) where rnm >= ? SELECT * FROM (SELECT rownum AS rnm, z.* FROM (SELECT name AS value, value AS KEY - FROM app_resource_cae + FROM a_b_c WHERE is_deleted = 'n' AND type = 'fuse' ORDER BY ordering ) z diff --git a/src/test/resources/bvt/parser/oracle-20.txt b/src/test/resources/bvt/parser/oracle-20.txt index cd47655b6f..36236d4790 100644 --- a/src/test/resources/bvt/parser/oracle-20.txt +++ b/src/test/resources/bvt/parser/oracle-20.txt @@ -1,16 +1,16 @@ - SELECT RC_CLOT_INFO_EXT.*, RC_CLOT_TRUNK.NAME AS TRUNK_NAME - FROM RC_CLOT_INFO,RC_CLOT_INFO_EXT, RC_CLOT_TRUNK - WHERE RC_CLOT_INFO.is_deleted='n' and - RC_CLOT_INFO.TRUNK_ID=RC_CLOT_TRUNK.ID - AND RC_CLOT_INFO.ID=RC_CLOT_INFO_EXT.CLOT_ID - AND RC_CLOT_INFO_EXT.GMT_MODIFIED >=? -ORDER BY RC_CLOT_TRUNK.NAME,RC_CLOT_INFO.id NULLS LAST + SELECT A_B_C.*, EE_2.NAME AS TRUNK_NAME + FROM AA_2,A_B_C, EE_2 + WHERE AA_2.is_deleted='n' and + AA_2.TRUNK_ID=EE_2.ID + AND AA_2.ID=A_B_C.CLOT_ID + AND A_B_C.GMT_MODIFIED >=? +ORDER BY EE_2.NAME,AA_2.id NULLS LAST --------------------------- -SELECT RC_CLOT_INFO_EXT.*, RC_CLOT_TRUNK.NAME AS TRUNK_NAME -FROM RC_CLOT_INFO, RC_CLOT_INFO_EXT, RC_CLOT_TRUNK -WHERE RC_CLOT_INFO.is_deleted = 'n' AND RC_CLOT_INFO.TRUNK_ID = RC_CLOT_TRUNK.ID AND RC_CLOT_INFO.ID = RC_CLOT_INFO_EXT.CLOT_ID AND RC_CLOT_INFO_EXT.GMT_MODIFIED >= ? -ORDER BY RC_CLOT_TRUNK.NAME, RC_CLOT_INFO.id NULLS LAST; +SELECT A_B_C.*, EE_2.NAME AS TRUNK_NAME +FROM AA_2, A_B_C, EE_2 +WHERE AA_2.is_deleted = 'n' AND AA_2.TRUNK_ID = EE_2.ID AND AA_2.ID = A_B_C.CLOT_ID AND A_B_C.GMT_MODIFIED >= ? +ORDER BY EE_2.NAME, AA_2.id NULLS LAST; diff --git a/src/test/resources/bvt/parser/oracle-21.txt b/src/test/resources/bvt/parser/oracle-21.txt index facadd42ee..11bedb5044 100644 --- a/src/test/resources/bvt/parser/oracle-21.txt +++ b/src/test/resources/bvt/parser/oracle-21.txt @@ -4,7 +4,7 @@ select * from ( select distinct(tt.id) use_less_id, tt.* from ( select t.*, rct.parent_id, RCT.NAME as trunk_name - from rc_clot_info t, rc_clot_trunk rct + from x_1_2 t, k_2_3 rct where t.is_deleted ='n' and t.trunk_id = rct.id ) tt CONNECT BY prior parent_id = trunk_id @@ -20,7 +20,7 @@ SELECT * FROM (SELECT rownum AS rnm, z.* FROM (SELECT DISTINCT tt.id AS use_less_id, tt.* FROM (SELECT t.*, rct.parent_id, RCT.NAME AS trunk_name - FROM rc_clot_info t, rc_clot_trunk rct + FROM x_1_2 t, k_2_3 rct WHERE t.is_deleted = 'n' AND t.trunk_id = rct.id ) tt START WITH trunk_name = 'rc.mf.Caesar' diff --git a/src/test/resources/bvt/parser/oracle-22.txt b/src/test/resources/bvt/parser/oracle-22.txt index da7041d143..6ff0771371 100644 --- a/src/test/resources/bvt/parser/oracle-22.txt +++ b/src/test/resources/bvt/parser/oracle-22.txt @@ -7,11 +7,11 @@ from SELECT DISTINCT * FROM ( SELECT lower(a.role_name) || '#' || a.permission_id as key, 'y' as value - FROM app_role_permission A + FROM f_p_23 A WHERE a.is_deleted = 'n' UNION ALL SELECT lower(b.role_name) || '#' || a.permission_id, 'y' - FROM app_role_permission A, app_role_base_role B + FROM f_p_23 A, app_role_base_role B WHERE a.is_deleted = 'n' AND b.is_deleted = 'n' AND a.role_name = b.base_role_name ) ) c @@ -28,11 +28,11 @@ FROM (SELECT rownum AS rnm, z.* FROM (SELECT * FROM (SELECT DISTINCT * FROM (SELECT lower(a.role_name) || '#' || a.permission_id AS KEY, 'y' AS value - FROM app_role_permission A + FROM f_p_23 A WHERE a.is_deleted = 'n' UNION ALL SELECT lower(b.role_name) || '#' || a.permission_id, 'y' - FROM app_role_permission A, app_role_base_role B + FROM f_p_23 A, app_role_base_role B WHERE a.is_deleted = 'n' AND b.is_deleted = 'n' AND a.role_name = b.base_role_name ) ) c diff --git a/src/test/resources/bvt/parser/oracle-23.txt b/src/test/resources/bvt/parser/oracle-23.txt index e9e19e16a5..572b7f80ee 100644 --- a/src/test/resources/bvt/parser/oracle-23.txt +++ b/src/test/resources/bvt/parser/oracle-23.txt @@ -1,7 +1,7 @@ select nodeId,nodeName,taskflowName,taskflowVersion from ( select /*+ use_hash(n f) ordered */ n.ID nodeId,n.name nodeName,f.name taskflowName,f.version taskflowVersion - from "HT_TASK_FLOW_NODE_WA_2" n, "HT_TASK_FLOW_WA_2" f + from "AB" n, "BC_3" f where n.owner = ? and n.STATUS in ( ? ) and n.GMT_MODIFIED < ? and n.IS_AUTO = 'Y' and n.task_flow_id = f.id order by f.priority desc nulls last, f.gmt_create asc ) where rownum < ? @@ -11,7 +11,7 @@ from ( --------------------------- SELECT nodeId, nodeName, taskflowName, taskflowVersion FROM (SELECT /*+use_hash(n f) ordered*/ n.ID AS nodeId, n.name AS nodeName, f.name AS taskflowName, f.version AS taskflowVersion - FROM "HT_TASK_FLOW_NODE_WA_2" n, "HT_TASK_FLOW_WA_2" f + FROM "AB" n, "BC_3" f WHERE n.owner = ? AND (n.STATUS IN (?) AND n.GMT_MODIFIED < ? AND n.IS_AUTO = 'Y' AND n.task_flow_id = f.id) ORDER BY f.priority DESC NULLS LAST, f.gmt_create ASC )