Register missing money operators in system catalogs

The operators money*int8, int8*money, and money/int8 were implemented in
code but not registered in pg_operator or pg_proc.

Reviewed-by: Pavel Stehule <pavel.stehule@gmail.com>

diff --git a/src/include/catalog/catversion.h b/src/include/catalog/catversion.h
index 6da1fe9340e569a4b95a89c3f557675698ba2525..54211f5618d2dacaf51feaa05f26cb481e953b5f 100644 (file)
--- a/src/include/catalog/catversion.h
+++ b/src/include/catalog/catversion.h
@@ -53,6 +53,6 @@
  */
 
 /*                                                     yyyymmddN */
-#define CATALOG_VERSION_NO     201701171
+#define CATALOG_VERSION_NO     201701172
 
 #endif

diff --git a/src/include/catalog/pg_operator.h b/src/include/catalog/pg_operator.h
index aeb792703d646929078465a5f9cc91d357360271..b1d25b5efb5564844f6d22cc12750bc67c2c9926 100644 (file)
--- a/src/include/catalog/pg_operator.h
+++ b/src/include/catalog/pg_operator.h
@@ -709,6 +709,10 @@ DATA(insert OID = 908 (  "*"          PGNSP PGUID b f f    790  701        790 916   0 cash_mul_
 DESCR("multiply");
 DATA(insert OID = 909 (  "/"      PGNSP PGUID b f f    790  701        790   0   0 cash_div_flt8 - - ));
 DESCR("divide");
+DATA(insert OID = 3346 (  "*"     PGNSP PGUID b f f    790  20         790 3349  0 cash_mul_int8 - - ));
+DESCR("multiply");
+DATA(insert OID = 3347 (  "/"     PGNSP PGUID b f f    790  20         790   0   0 cash_div_int8 - - ));
+DESCR("divide");
 DATA(insert OID = 912 (  "*"      PGNSP PGUID b f f    790  23         790 917   0 cash_mul_int4 - - ));
 DESCR("multiply");
 DATA(insert OID = 913 (  "/"      PGNSP PGUID b f f    790  23         790   0   0 cash_div_int4 - - ));
@@ -719,6 +723,8 @@ DATA(insert OID = 915 (  "/"           PGNSP PGUID b f f    790  21         790   0   0 cash_div_
 DESCR("divide");
 DATA(insert OID = 916 (  "*"      PGNSP PGUID b f f    701  790        790 908   0 flt8_mul_cash - - ));
 DESCR("multiply");
+DATA(insert OID = 3349 (  "*"     PGNSP PGUID b f f    20      790             790 3346  0 int8_mul_cash - - ));
+DESCR("multiply");
 DATA(insert OID = 917 (  "*"      PGNSP PGUID b f f    23      790             790 912   0 int4_mul_cash - - ));
 DESCR("multiply");
 DATA(insert OID = 918 (  "*"      PGNSP PGUID b f f    21      790             790 914   0 int2_mul_cash - - ));

diff --git a/src/include/catalog/pg_proc.h b/src/include/catalog/pg_proc.h
index 7fc0e037b6890e52e5db7c19d5f24aa83cb04ca5..4e425e1b51b114174f93c2dc5fb3d09cd896234b 100644 (file)
--- a/src/include/catalog/pg_proc.h
+++ b/src/include/catalog/pg_proc.h
@@ -957,8 +957,11 @@ DESCR("name of the current database");
 DATA(insert OID = 817 (  current_query           PGNSP PGUID 12 1 0 0 0 f f f f f f v r 0 0 25 "" _null_ _null_ _null_ _null_  _null_ current_query _null_ _null_ _null_ ));
 DESCR("get the currently executing query");
 
+DATA(insert OID = 3343 (  int8_mul_cash                   PGNSP PGUID 12 1 0 0 0 f f f f t f i s 2 0 790 "20 790" _null_ _null_ _null_ _null_ _null_ int8_mul_cash _null_ _null_ _null_ ));
 DATA(insert OID =  862 (  int4_mul_cash                   PGNSP PGUID 12 1 0 0 0 f f f f t f i s 2 0 790 "23 790" _null_ _null_ _null_ _null_ _null_ int4_mul_cash _null_ _null_ _null_ ));
 DATA(insert OID =  863 (  int2_mul_cash                   PGNSP PGUID 12 1 0 0 0 f f f f t f i s 2 0 790 "21 790" _null_ _null_ _null_ _null_ _null_ int2_mul_cash _null_ _null_ _null_ ));
+DATA(insert OID = 3344 (  cash_mul_int8                   PGNSP PGUID 12 1 0 0 0 f f f f t f i s 2 0 790 "790 20" _null_ _null_ _null_ _null_ _null_ cash_mul_int8 _null_ _null_ _null_ ));
+DATA(insert OID = 3345 (  cash_div_int8                   PGNSP PGUID 12 1 0 0 0 f f f f t f i s 2 0 790 "790 20" _null_ _null_ _null_ _null_ _null_ cash_div_int8 _null_ _null_ _null_ ));
 DATA(insert OID =  864 (  cash_mul_int4                   PGNSP PGUID 12 1 0 0 0 f f f f t f i s 2 0 790 "790 23" _null_ _null_ _null_ _null_ _null_ cash_mul_int4 _null_ _null_ _null_ ));
 DATA(insert OID =  865 (  cash_div_int4                   PGNSP PGUID 12 1 0 0 0 f f f f t f i s 2 0 790 "790 23" _null_ _null_ _null_ _null_ _null_ cash_div_int4 _null_ _null_ _null_ ));
 DATA(insert OID =  866 (  cash_mul_int2                   PGNSP PGUID 12 1 0 0 0 f f f f t f i s 2 0 790 "790 21" _null_ _null_ _null_ _null_ _null_ cash_mul_int2 _null_ _null_ _null_ ));

diff --git a/src/test/regress/expected/money.out b/src/test/regress/expected/money.out
index a05fdd9f422590828071e3450aa5b3b4e3eec7bf..0cc69f925f50122f59b6462a2709c6a939b810f5 100644 (file)
--- a/src/test/regress/expected/money.out
+++ b/src/test/regress/expected/money.out
@@ -69,6 +69,24 @@ SELECT m / 2::int2 FROM money_data;
    $61.50
 (1 row)
 
+SELECT m * 2::int8 FROM money_data;
+ ?column? 
+----------
+  $246.00
+(1 row)
+
+SELECT 2::int8 * m FROM money_data;
+ ?column? 
+----------
+  $246.00
+(1 row)
+
+SELECT m / 2::int8 FROM money_data;
+ ?column? 
+----------
+   $61.50
+(1 row)
+
 SELECT m * 2::float8 FROM money_data;
  ?column? 
 ----------

diff --git a/src/test/regress/sql/money.sql b/src/test/regress/sql/money.sql
index 9e89e32d77345e27aa236486fe372cf8186f0c54..f5a92f2a6951595398967402a0ab87c61ac19fd4 100644 (file)
--- a/src/test/regress/sql/money.sql
+++ b/src/test/regress/sql/money.sql
@@ -16,6 +16,9 @@ SELECT m / 2 FROM money_data;
 SELECT m * 2::int2 FROM money_data;
 SELECT 2::int2 * m FROM money_data;
 SELECT m / 2::int2 FROM money_data;
+SELECT m * 2::int8 FROM money_data;
+SELECT 2::int8 * m FROM money_data;
+SELECT m / 2::int8 FROM money_data;
 SELECT m * 2::float8 FROM money_data;
 SELECT 2::float8 * m FROM money_data;
 SELECT m / 2::float8 FROM money_data;