Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add MIN and MAX aggregate support for MONEY datatype #3410

Open
wants to merge 7 commits into
base: BABEL_5_X_DEV
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -2005,3 +2005,13 @@ CREATE FUNCTION sys.smallmoneysmaller(sys.SMALLMONEY, sys.SMALLMONEY)
RETURNS sys.SMALLMONEY
AS 'babelfishpg_money', 'fixeddecimalsmaller'
LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;

CREATE FUNCTION sys.moneylarger(sys.MONEY, sys.MONEY)
RETURNS sys.MONEY
AS 'babelfishpg_money', 'fixeddecimallarger'
LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;

CREATE FUNCTION sys.moneysmaller(sys.MONEY, sys.MONEY)
RETURNS sys.MONEY
AS 'babelfishpg_money', 'fixeddecimalsmaller'
LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
Original file line number Diff line number Diff line change
Expand Up @@ -80,3 +80,17 @@ CREATE AGGREGATE sys.max(sys.smallmoney) (
COMBINEFUNC = sys.smallmoneylarger,
PARALLEL = SAFE
);

CREATE AGGREGATE sys.min(sys.money) (
SFUNC = sys.moneysmaller,
STYPE = sys.money,
COMBINEFUNC = sys.moneysmaller,
PARALLEL = SAFE
);

CREATE AGGREGATE sys.max(sys.money) (
SFUNC = sys.moneylarger,
STYPE = sys.money,
COMBINEFUNC = sys.moneylarger,
PARALLEL = SAFE
);
Original file line number Diff line number Diff line change
Expand Up @@ -103,5 +103,29 @@ CREATE OPERATOR sys.% (
END IF;
END $$;

CREATE OR REPLACE FUNCTION sys.moneylarger(sys.MONEY, sys.MONEY)
RETURNS sys.MONEY
AS 'babelfishpg_money', 'fixeddecimallarger'
LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;

CREATE OR REPLACE FUNCTION sys.moneysmaller(sys.MONEY, sys.MONEY)
RETURNS sys.MONEY
AS 'babelfishpg_money', 'fixeddecimalsmaller'
LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;

CREATE OR REPLACE AGGREGATE sys.min(sys.money) (
SFUNC = sys.moneysmaller,
STYPE = sys.money,
COMBINEFUNC = sys.moneysmaller,
PARALLEL = SAFE
);

CREATE OR REPLACE AGGREGATE sys.max(sys.money) (
SFUNC = sys.moneylarger,
STYPE = sys.money,
COMBINEFUNC = sys.moneylarger,
PARALLEL = SAFE
);

-- Reset search_path to not affect any subsequent scripts
SELECT set_config('search_path', trim(leading 'sys, ' from current_setting('search_path')), false);
4 changes: 2 additions & 2 deletions test/JDBC/expected/BABEL-3006.out
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ select cast(pg_typeof(m) as varchar(20)) d from (select min(d) as m from t3006_m
go
~~START~~
varchar
fixeddecimal
money
~~END~~

~~START~~
Expand All @@ -173,7 +173,7 @@ select cast(pg_typeof(m) as varchar(20)) d from (select max(d) as m from t3006_m
go
~~START~~
varchar
fixeddecimal
money
~~END~~

~~START~~
Expand Down
65 changes: 65 additions & 0 deletions test/JDBC/expected/money_aggregate-vu-cleanup.out
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
DROP PROCEDURE IF EXISTS get_column_info_p1;
GO

DROP TABLE IF EXISTS TestMoneyTable;
GO

DROP TABLE IF EXISTS ResultTable1;
GO

DROP TABLE IF EXISTS ResultTable2;
GO

DROP TABLE IF EXISTS ResultTable3;
GO

DROP TABLE IF EXISTS ResultTable4;
GO

DROP TABLE IF EXISTS ResultTable5;
GO

DROP TABLE IF EXISTS ResultTable6;
GO

DROP TABLE IF EXISTS ResultTable7;
GO

DROP TABLE IF EXISTS ResultTable8;
GO

DROP TABLE IF EXISTS ResultTable9;
GO

DROP TABLE IF EXISTS ResultTable10;
GO

DROP TABLE IF EXISTS EmptyMoneyTable;
GO

DROP TABLE IF EXISTS ResultTableEmpty;
GO

DROP TABLE IF EXISTS ExtremeMoneyTable;
GO

DROP TABLE IF EXISTS ResultTableExtreme;
GO

DROP TABLE IF EXISTS MixedNullMoneyTable;
GO

DROP TABLE IF EXISTS ResultTableMixedNull;
GO

DROP TABLE IF EXISTS OverflowMoneyTable;
GO

DROP TABLE IF EXISTS ResultTableOverflow;
GO

DROP TABLE IF EXISTS NonMoneyTable;
GO

DROP TABLE IF EXISTS ResultTableNonMoney;
GO
188 changes: 188 additions & 0 deletions test/JDBC/expected/money_aggregate-vu-prepare.out
Original file line number Diff line number Diff line change
@@ -0,0 +1,188 @@
CREATE TABLE TestMoneyTable (
ID INT IDENTITY(1,1) PRIMARY KEY,
Amount MONEY,
Description NVARCHAR(100)
);
GO

-- Insert test data
INSERT INTO TestMoneyTable (Amount, Description) VALUES
(100.50, 'Item 1'),
(200.75, 'Item 2'),
(150.25, 'Item 3'),
(300.00, 'Item 4'),
(250.50, 'Item 5'),
(NULL, 'Null Amount');
GO
~~ROW COUNT: 6~~


CREATE PROCEDURE get_column_info_p1
@table_name text
AS
BEGIN
SELECT c.[name] AS column_name,
t.[name] AS [type_name],
c.[max_length],
c.[precision],
c.[scale]
FROM sys.columns c
INNER JOIN sys.types t
ON c.user_type_id = t.user_type_id
WHERE object_id = object_id(@table_name)
ORDER BY c.[name];
END
GO

-- Test Case 1: MAX aggregation
SELECT MAX(Amount) AS MaxAmount
roshan0708 marked this conversation as resolved.
Show resolved Hide resolved
INTO ResultTable1
FROM TestMoneyTable;
GO

-- Test Case 2: MIN aggregation
SELECT MIN(Amount) AS MinAmount
INTO ResultTable2
FROM TestMoneyTable;
GO

-- Test Case 3: AVG aggregation
SELECT AVG(Amount) AS AvgAmount
INTO ResultTable3
FROM TestMoneyTable;
GO

-- Test Case 4: SUM aggregation
SELECT SUM(Amount) AS TotalAmount
INTO ResultTable4
FROM TestMoneyTable;
GO

-- Test Case 5: COUNT aggregation (should remain as INT)
SELECT COUNT(Amount) AS CountAmount
INTO ResultTable5
FROM TestMoneyTable;
GO

-- Test Case 6: Multiple aggregations in one query
SELECT
MAX(Amount) AS MaxAmount,
MIN(Amount) AS MinAmount,
AVG(Amount) AS AvgAmount,
SUM(Amount) AS TotalAmount,
COUNT(Amount) AS CountAmount
INTO ResultTable6
FROM TestMoneyTable;
GO

-- Test Case 7: Aggregation with GROUP BY
SELECT
Description,
MAX(Amount) AS MaxAmount
INTO ResultTable7
FROM TestMoneyTable
GROUP BY Description;
GO

-- Test Case 8: Aggregation with subquery
SELECT MaxAmount
INTO ResultTable8
FROM (
SELECT MAX(Amount) AS MaxAmount
FROM TestMoneyTable
) AS Subquery;
GO

-- Test Case 9: Aggregation with HAVING clause
SELECT
Description,
MAX(Amount) AS MaxAmount
INTO ResultTable9
FROM TestMoneyTable
GROUP BY Description
HAVING MAX(Amount) > 200;
GO

-- Test Case 10: Aggregation with calculated MONEY column
SELECT
MAX(Amount * 2) AS DoubleMaxAmount
INTO ResultTable10
FROM TestMoneyTable;
GO

-- Negative Test Case: Empty table
CREATE TABLE EmptyMoneyTable (Amount MONEY);
GO

SELECT MAX(Amount) AS MaxAmount
INTO ResultTableEmpty
FROM EmptyMoneyTable;
GO

-- Edge Test Case: Extreme values
CREATE TABLE ExtremeMoneyTable (Amount MONEY);
GO

INSERT INTO ExtremeMoneyTable VALUES
(922337203685477.5807), -- Maximum positive value for MONEY
(-922337203685477.5808); -- Minimum negative value for MONEY
roshan0708 marked this conversation as resolved.
Show resolved Hide resolved
GO
~~ROW COUNT: 2~~


SELECT MAX(Amount) AS MaxAmount, MIN(Amount) AS MinAmount
INTO ResultTableExtreme
FROM ExtremeMoneyTable;
GO

-- Arbitrary Test Case: Mixing NULL and non-NULL values
CREATE TABLE MixedNullMoneyTable (Amount MONEY);
GO

INSERT INTO MixedNullMoneyTable VALUES
(100.00), (NULL), (200.00), (NULL), (300.00);
GO
~~ROW COUNT: 5~~


SELECT
AVG(Amount) AS AvgAmount,
SUM(Amount) AS TotalAmount,
COUNT(Amount) AS CountNonNull,
COUNT(*) AS CountAll
INTO ResultTableMixedNull
FROM MixedNullMoneyTable;
GO

-- Edge Test Case: Aggregating calculated values that exceed MONEY range
CREATE TABLE OverflowMoneyTable (Amount MONEY);
GO

INSERT INTO OverflowMoneyTable VALUES
(922337203685477), (922337203685477);
GO
~~ROW COUNT: 2~~


SELECT SUM(Amount) AS TotalAmount
INTO ResultTableOverflow
FROM OverflowMoneyTable;
GO
~~ERROR (Code: 33557097)~~

~~ERROR (Message: fixeddecimal out of range)~~


-- Negative Test Case: Trying to aggregate non-MONEY column as MONEY
CREATE TABLE NonMoneyTable (Amount VARCHAR(20));
GO

INSERT INTO NonMoneyTable VALUES ('100.00'), ('200.00');
GO
~~ROW COUNT: 2~~


SELECT SUM(CAST(Amount AS MONEY)) AS TotalAmount
INTO ResultTableNonMoney
FROM NonMoneyTable;
GO
Loading