Update sample queries and db schema creation script

Author: mrjung72

config/dbinfo.json

@@ -59,9 +59,9 @@
   "postgresDB": {
     "type": "postgresql",
     "user": "postgres",
-    "password": "password",
+    "password": "1111",
     "server": "localhost",
-    "database": "mydb",
+    "database": "postgres",
     "port": 5432,
     "options": {
       "max": 10,

queries/queries-sample-orders.xml

@@ -1,5 +1,5 @@
 <queries>
-  <excel db="oracleDB" output="d:/temp/sales_summary_${DATE.KST:yyyyMMddhhmmss}.xlsx" maxRows="20" style="modern">
+  <excel db="oracleDB" output="d:/temp/sales_summary_${DATE.KST:yyyyMMddhhmmss}.xlsx" maxRows="200" style="modern">
     <!-- Style template ID (default: default) -->
     <!-- Available templates: default, modern, dark, colorful, minimal, business, premium -->
     <!-- Can be overridden with individual style attributes if needed -->
@@ -9,47 +9,47 @@
     <var name="startDate">2024-01-01</var>
     <var name="endDate">2024-06-30</var>
     <var name="regionList">["Seoul", "Busan"]</var>
-    <var name="statusList">["ACTIVE", "PENDING", "COMPLETED"]</var>
+    <var name="statusList">["Pending", "Shipped", "Delivered"]</var>
     <var name="categoryIds">[1, 2, 3, 5]</var>
     <var name="maxRows">1000</var>
   </vars>
-  <sheet name="${envType}_Order_List" use="true" aggregateColumn="PaymentMethod" maxRows="100" db="sampleDB">
+  <sheet name="${envType}_Order_List" use="true" aggregateColumn="PaymentMethod" maxRows="100" db="oracleDB">
     <![CDATA[
       SELECT 
         OrderNumber as OrderNumber,
-        FORMAT(OrderDate, 'yyyy-MM-dd') as OrderDate,
+        OrderDate,
         OrderStatus as OrderStatus,
         PaymentStatus as PaymentStatus,
-        FORMAT(TotalAmount, 'N0') as TotalAmount,
         PaymentMethod as PaymentMethod
       FROM Orders
       WHERE OrderDate >= '${startDate}' AND OrderDate <= '${endDate}'
       ORDER BY OrderDate DESC
     ]]>
   </sheet>
-  <sheet name="Customer_List" use="true" aggregateColumn="Region" style="dark">
+  <sheet name="Customer_List" use="true" aggregateColumn="Region" style="dark" db="sampleDB">
     <![CDATA[
       SELECT *
       FROM Customers
     ]]>
   </sheet>
-  <sheet name="Customer_Details_Regional_Statistics_Summary" use="true">
+  <sheet name="Customer_Details_Regional_Statistics_Summary" use="true" db="postgresDB">
     <![CDATA[
       SELECT 
         o.OrderNumber as OrderNumber,
         c.CustomerName as CustomerName,
-        od.ProductName as ProductName,
-        FORMAT(od.UnitPrice, 'N0') as UnitPrice,
+        p.ProductName as ProductName,
+        p.UnitPrice,
         od.Quantity as Quantity,
-        FORMAT(od.LineTotal, 'N0') as LineTotal
+        od.LineTotal
       FROM Orders o
       INNER JOIN Customers c ON o.CustomerID = c.CustomerID
       INNER JOIN OrderDetails od ON o.OrderID = od.OrderID
+      INNER JOIN Products p ON od.ProductID = p.ProductID
       WHERE o.OrderDate >= '${startDate}' AND o.OrderDate <= '${endDate}'
       ORDER BY o.OrderDate DESC
     ]]>
   </sheet>
-  <sheet name="Wildcard_Customer" use="true" exceptColumns="IsActive,CreatedDate,LastUpdated">
+  <sheet name="Wildcard_Customer" use="true" exceptColumns="IsActive,CreatedDate,LastUpdated" db="mysql">
     <![CDATA[
       SELECT c.*
       FROM Orders o
@@ -59,7 +59,7 @@
       ORDER BY o.OrderDate DESC
     ]]>
   </sheet>
-  <sheet name="Wildcard_Order" use="true" exceptColumns="OrderDate,RequiredDate,ShippedDate,OrderStatus,ShipVia,Freight,ShipName,ShipAddress,ShipCity">
+  <sheet name="Wildcard_Order" use="true" exceptColumns="OrderDate,RequiredDate,ShippedDate" db="mariaDB">
     <![CDATA[
       SELECT o.*
       FROM Orders o
@@ -79,14 +79,4 @@
       ORDER BY OrderDate DESC
     ]]>
   </sheet>
-  <sheet name="Products_By_Category" use="true" aggregateColumn="CategoryName" exceptColumns="OrderDate,RequiredDate,ShippedDate">
-    <![CDATA[
-      SELECT P.*
-      FROM Products p
-      INNER JOIN Categories c ON p.CategoryID = c.CategoryID
-      WHERE p.CategoryID IN (${categoryIds})
-        AND p.Discontinued = 0
-      ORDER BY c.CategoryName, p.ProductName
-    ]]>
-  </sheet>
 </queries> 

resources/create_sample_tables_mysql.sql

@@ -56,11 +56,15 @@ CREATE TABLE Orders (
     RequiredDate DATETIME NULL,
     ShippedDate DATETIME NULL,
     OrderStatus VARCHAR(20) DEFAULT 'Pending',
+    SubTotal DECIMAL(15,2) DEFAULT 0,
     TotalAmount DECIMAL(15,2) DEFAULT 0,
     DiscountAmount DECIMAL(15,2) DEFAULT 0,
     TaxAmount DECIMAL(15,2) DEFAULT 0,
     NetAmount DECIMAL(15,2) DEFAULT 0,
     ShippingAddress VARCHAR(200) NULL,
+    PaymentMethod VARCHAR(30) NULL,
+    PaymentStatus VARCHAR(20) DEFAULT 'Unpaid',
+    EmployeeID INT NULL,
     Notes TEXT NULL,
     CreatedDate DATETIME DEFAULT CURRENT_TIMESTAMP,
     LastUpdated DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,

resources/create_sample_tables_postgresql.sql

@@ -71,11 +71,15 @@ CREATE TABLE Orders (
     RequiredDate TIMESTAMP NULL,
     ShippedDate TIMESTAMP NULL,
     OrderStatus VARCHAR(20) DEFAULT 'Pending',
+    SubTotal DECIMAL(15,2) DEFAULT 0,
     TotalAmount DECIMAL(15,2) DEFAULT 0,
     DiscountAmount DECIMAL(15,2) DEFAULT 0,
     TaxAmount DECIMAL(15,2) DEFAULT 0,
     NetAmount DECIMAL(15,2) DEFAULT 0,
     ShippingAddress VARCHAR(200) NULL,
+    PaymentMethod VARCHAR(30) NULL,
+    PaymentStatus VARCHAR(20) DEFAULT 'Unpaid',
+    EmployeeID INTEGER NULL,
     Notes TEXT NULL,
     CreatedDate TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
     LastUpdated TIMESTAMP DEFAULT CURRENT_TIMESTAMP,