Skip to content

Commit f1a2de7

Browse files
committed
Modify the task query statement
1 parent 6e9a470 commit f1a2de7

3 files changed

Lines changed: 32 additions & 37 deletions

File tree

config/dbinfo.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@
3333
"user": "sahara",
3434
"password": "1111",
3535
"server": "localhost",
36-
"database": "mydb",
36+
"database": "sampledb",
3737
"port": 3306,
3838
"options": {
39-
"connectionTimeout": 30000
39+
"connectionTimeout": 3000
4040
}
4141
},
4242
"sourceDB": {
@@ -52,8 +52,8 @@
5252
"encrypt": true,
5353
"trustServerCertificate": true,
5454
"enableArithAbort": true,
55-
"requestTimeout": 300000,
56-
"connectionTimeout": 30000
55+
"requestTimeout": 3000,
56+
"connectionTimeout": 3000
5757
}
5858
},
5959
"postgresDB": {
@@ -65,8 +65,8 @@
6565
"port": 5432,
6666
"options": {
6767
"max": 10,
68-
"idleTimeoutMillis": 30000,
69-
"connectionTimeout": 30000
68+
"idleTimeoutMillis": 3000,
69+
"connectionTimeout": 3000
7070
}
7171
},
7272
"sqliteDB": {
@@ -87,7 +87,7 @@
8787
"poolMin": 0,
8888
"poolMax": 4,
8989
"poolIncrement": 1,
90-
"queueTimeout": 30000,
90+
"queueTimeout": 3000,
9191
"stmtCacheSize": 30
9292
}
9393
}

queries/queries-sample-orders.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
ORDER BY o.OrderDate DESC
5050
]]>
5151
</sheet>
52-
<sheet name="Wildcard_Customer" use="true" exceptColumns="IsActive,CreatedDate,LastUpdated" db="mysql">
52+
<sheet name="Wildcard_Customer" use="true" exceptColumns="IsActive,CreatedDate,LastUpdated" db="mariaDB">
5353
<![CDATA[
5454
SELECT c.*
5555
FROM Orders o

queries/queries-with-dynamic-variables.xml

Lines changed: 24 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<queries>
2-
<excel db="sampleDB" output="d:/temp/dynamic_variables_test_${DATE:yyyy-MM-dd}.csv" maxRows="20" style="modern" aggregateInfoTemplate="Related data {count} records {details}">
2+
<excel db="sampleDB" output="d:/temp/dynamic_variables_test_${DATE:yyyyMMddhhmmss}.xlsx" maxRows="20" style="modern" aggregateInfoTemplate="Related data {count} records {details}">
33
<!-- Style template ID (default: default) -->
44
<!-- Available templates: default, modern, dark, colorful, minimal, business, premium -->
55
<!-- Can be overridden with individual style attributes if needed -->
@@ -19,7 +19,7 @@
1919
<!-- Dynamic variable definitions -->
2020
<dynamicVars>
2121
<!-- Default type (column_identified): Create arrays for each column -->
22-
<dynamicVar name="customerData" description="Customer data by column" database="sampleDB">
22+
<dynamicVar name="customerData" description="Customer data by column">
2323
<![CDATA[
2424
SELECT CustomerID, CustomerName, City, Region, CustomerType
2525
FROM SampleDB.dbo.Customers
@@ -37,25 +37,20 @@
3737
]]>
3838
</dynamicVar>
3939

40-
<!-- Default type (column_identified): Create arrays for each column -->
41-
<dynamicVar name="activeOrders" description="Active orders list" database="sampleDB">
40+
<!-- Default type (column_identified): Create arrays for each column -->
41+
<dynamicVar name="activeOrders" description="Active orders list" db="sampleDB">
4242
<![CDATA[
4343
SELECT OrderID
44-
FROM SampleDB.dbo.Orders
44+
FROM Orders
4545
WHERE OrderStatus = 'Pending'
46-
ORDER BY OrderID
4746
]]>
4847
</dynamicVar>
4948

5049
<!-- Default type (column_identified): Dynamic variable combining datetime functions and regular variables -->
51-
<dynamicVar name="recentOrders" description="Recent orders information" database="sampleDB">
50+
<dynamicVar name="recentOrders" description="Recent orders information" db="sampleDB">
5251
<![CDATA[
5352
SELECT OrderID, OrderNumber, OrderDate
54-
FROM SampleDB.dbo.Orders
55-
WHERE OrderDate >= '${startDate}'
56-
AND OrderDate <= '${endDate}'
57-
AND OrderDate >= DATEADD(day, -30, '${CURRENT_DATE}')
58-
ORDER BY OrderDate DESC
53+
FROM Orders
5954
]]>
6055
</dynamicVar>
6156
</dynamicVars>
@@ -70,7 +65,7 @@
7065
c.City as City,
7166
c.Region as Region,
7267
c.CustomerType as CustomerType
73-
FROM SampleDB.dbo.Customers c
68+
FROM Customers c
7469
WHERE c.Region IN (${regionList})
7570
ORDER BY c.CustomerID
7671
]]>
@@ -79,58 +74,58 @@
7974

8075

8176
<!-- Sheet definitions -->
82-
<sheet name="${envType}_DynamicVar_Seoul_Busan_Test" use="true" queryRef="customer_base" aggregateColumn="Region" aggregateInfoTemplate="Customer distribution by region: {count} records {details}" maxRows="100" db="sampleDB">
77+
<sheet name="${envType}_DynamicVar_Seoul_Busan_Test" use="true" queryRef="customer_base" aggregateColumn="Region" aggregateInfoTemplate="Customer distribution by region: {count} records {details}" maxRows="100" db="mariaDB">
8378
<params>
8479
<param name="regionList">["서울", "부산"]</param>
8580
</params>
8681
</sheet>
8782

8883

89-
<sheet name="OrderDetail_DynamicVar_Test2" use="true" aggregateColumn="OrderStatus" aggregateInfoTemplate="Order status summary: {count} records {details}">
84+
<sheet name="OrderDetail_DynamicVar_Test2" use="true" aggregateColumn="OrderStatus" aggregateInfoTemplate="Order status summary: {count} records {details}" db="postgresDB">
9085
<![CDATA[
9186
SELECT
9287
o.OrderID as OrderID,
9388
o.OrderNumber as OrderNumber,
9489
o.OrderStatus as OrderStatus,
9590
od.OrderDetailID as DetailID,
96-
FORMAT(o.TotalAmount, 'N0') as TotalAmount
97-
FROM SampleDB.dbo.Orders o
98-
INNER JOIN SampleDB.dbo.OrderDetails od ON o.OrderID = od.OrderID
91+
o.TotalAmount
92+
FROM Orders o
93+
INNER JOIN OrderDetails od ON o.OrderID = od.OrderID
9994
WHERE o.OrderID IN (${orderDetails.OrderID})
10095
AND o.OrderID IN (${activeOrders.OrderID})
10196
ORDER BY o.OrderID DESC
10297
]]>
10398
</sheet>
10499

105-
<sheet name="OrderDetail_DynamicVar_Test" use="true" aggregateColumn="OrderStatus" aggregateInfoTemplate="Order status analysis: {count} records {details}">
100+
<sheet name="OrderDetail_DynamicVar_Test" use="true" aggregateColumn="OrderStatus" aggregateInfoTemplate="Order status analysis: {count} records {details}" db="postgresDB">
106101
<![CDATA[
107102
SELECT
108103
o.OrderNumber as OrderNumber,
109-
FORMAT(o.OrderDate, 'yyyy-MM-dd') as OrderDate,
104+
o.OrderDate as OrderDate,
110105
o.OrderStatus as OrderStatus,
111106
c.CustomerName as CustomerName,
112-
FORMAT(o.TotalAmount, 'N0') as TotalAmount
113-
FROM SampleDB.dbo.Orders o
114-
INNER JOIN SampleDB.dbo.Customers c ON o.CustomerID = c.CustomerID
107+
o.TotalAmount
108+
FROM Orders o
109+
INNER JOIN Customers c ON o.CustomerID = c.CustomerID
115110
WHERE o.OrderID IN (${recentOrders.OrderID})
116111
AND o.OrderStatus IN (${statusList})
117112
ORDER BY o.OrderDate DESC
118113
]]>
119114
</sheet>
120115

121-
<sheet name="Combined_DynamicVar_Test" use="true" aggregateInfoTemplate="Related data {count} records">
116+
<sheet name="Combined_DynamicVar_Test" use="true" aggregateInfoTemplate="Related data {count} records" db="oracleDB">
122117
<![CDATA[
123118
SELECT
124119
c.CustomerName as CustomerName,
125120
c.Region as Region,
126121
COUNT(o.OrderID) as OrderCount,
127-
FORMAT(SUM(o.TotalAmount), 'N0') as TotalOrderAmount
128-
FROM SampleDB.dbo.Customers c
129-
INNER JOIN SampleDB.dbo.Orders o ON c.CustomerID = o.CustomerID
122+
SUM(o.TotalAmount) as TotalOrderAmount
123+
FROM Customers c
124+
INNER JOIN Orders o ON c.CustomerID = o.CustomerID
130125
WHERE c.CustomerID IN (${customerData.CustomerID})
131126
AND c.Region IN (${customerData.Region})
132-
AND o.OrderID IN (${activeOrders.OrderID})
133-
AND o.OrderDate >= '${startDate}'
127+
AND o.OrderID IN (${activeOrders.OrderID})
128+
AND o.OrderDate >= '${startDate}'
134129
AND o.OrderDate <= '${endDate}'
135130
GROUP BY c.CustomerName, c.Region
136131
ORDER BY TotalOrderAmount DESC

0 commit comments

Comments
 (0)