Fix bug in our code when using to_timestamp() or to_date() without "TM".

bmomjian · bmomjian · commit 9e9e387ecfc3 · 2007-02-08T03:22:28.000Z
Assume "TM" when input fields are variable-length, like month or day
names.  This matches Oracle behavior.
diff --git a/src/backend/utils/adt/formatting.c b/src/backend/utils/adt/formatting.c
@@ -1,7 +1,7 @@
 /* -----------------------------------------------------------------------
  * formatting.c
  *
- * $PostgreSQL: pgsql/src/backend/utils/adt/formatting.c,v 1.118 2007/01/12 23:34:54 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/utils/adt/formatting.c,v 1.119 2007/02/08 03:22:28 momjian Exp $
  *
  *
  *	 Portions Copyright (c) 1999-2007, PostgreSQL Global Development Group
@@ -2093,10 +2093,7 @@ dch_date(int arg, char *inout, int suf, bool is_to_char, bool is_interval,
 		{
 			tmfc->mm = seq_search(inout, months_full, ONE_UPPER, FULL_SIZ, &len) + 1;
 			CHECK_SEQ_SEARCH(len, "MONTH/Month/month");
-			if (S_FM(suf))
-				return len;
-			else
-				return 9;
+			return len;
 		}
 		else if (arg == DCH_MON || arg == DCH_Mon || arg == DCH_mon)
 		{
@@ -2108,10 +2105,7 @@ dch_date(int arg, char *inout, int suf, bool is_to_char, bool is_interval,
 		{
 			tmfc->d = seq_search(inout, days, ONE_UPPER, FULL_SIZ, &len);
 			CHECK_SEQ_SEARCH(len, "DAY/Day/day");
-			if (S_FM(suf))
-				return len;
-			else
-				return 9;
+			return len;
 		}
 		else if (arg == DCH_DY || arg == DCH_Dy || arg == DCH_dy)
 		{
@@ -2636,10 +2630,7 @@ dch_date(int arg, char *inout, int suf, bool is_to_char, bool is_interval,
 			{
 				tmfc->mm = 12 - seq_search(inout, rm_months_upper, ALL_UPPER, FULL_SIZ, &len);
 				CHECK_SEQ_SEARCH(len, "RM");
-				if (S_FM(suf))
-					return len;
-				else
-					return 4;
+				return len;
 			}
 			break;
 		case DCH_rm:
@@ -2655,10 +2646,7 @@ dch_date(int arg, char *inout, int suf, bool is_to_char, bool is_interval,
 			{
 				tmfc->mm = 12 - seq_search(inout, rm_months_lower, ALL_LOWER, FULL_SIZ, &len);
 				CHECK_SEQ_SEARCH(len, "rm");
-				if (S_FM(suf))
-					return len;
-				else
-					return 4;
+				return len;
 			}
 			break;
 		case DCH_W:

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`/* -----------------------------------------------------------------------`
`2`	`2`	`* formatting.c`
`3`	`3`	`*`
`4`		`- * $PostgreSQL: pgsql/src/backend/utils/adt/formatting.c,v 1.118 2007/01/12 23:34:54 tgl Exp $`
	`4`	`+ * $PostgreSQL: pgsql/src/backend/utils/adt/formatting.c,v 1.119 2007/02/08 03:22:28 momjian Exp $`
`5`	`5`	`*`
`6`	`6`	`*`
`7`	`7`	`* Portions Copyright (c) 1999-2007, PostgreSQL Global Development Group`
`@@ -2093,10 +2093,7 @@ dch_date(int arg, char *inout, int suf, bool is_to_char, bool is_interval,`
`2093`	`2093`	`{`
`2094`	`2094`	`tmfc->mm = seq_search(inout, months_full, ONE_UPPER, FULL_SIZ, &len) + 1;`
`2095`	`2095`	`CHECK_SEQ_SEARCH(len, "MONTH/Month/month");`
`2096`		`- if (S_FM(suf))`
`2097`		`- return len;`
`2098`		`- else`
`2099`		`- return 9;`
	`2096`	`+ return len;`
`2100`	`2097`	`}`
`2101`	`2098`	`else if (arg == DCH_MON \|\| arg == DCH_Mon \|\| arg == DCH_mon)`
`2102`	`2099`	`{`
`@@ -2108,10 +2105,7 @@ dch_date(int arg, char *inout, int suf, bool is_to_char, bool is_interval,`
`2108`	`2105`	`{`
`2109`	`2106`	`tmfc->d = seq_search(inout, days, ONE_UPPER, FULL_SIZ, &len);`
`2110`	`2107`	`CHECK_SEQ_SEARCH(len, "DAY/Day/day");`
`2111`		`- if (S_FM(suf))`
`2112`		`- return len;`
`2113`		`- else`
`2114`		`- return 9;`
	`2108`	`+ return len;`
`2115`	`2109`	`}`
`2116`	`2110`	`else if (arg == DCH_DY \|\| arg == DCH_Dy \|\| arg == DCH_dy)`
`2117`	`2111`	`{`
`@@ -2636,10 +2630,7 @@ dch_date(int arg, char *inout, int suf, bool is_to_char, bool is_interval,`
`2636`	`2630`	`{`
`2637`	`2631`	`tmfc->mm = 12 - seq_search(inout, rm_months_upper, ALL_UPPER, FULL_SIZ, &len);`
`2638`	`2632`	`CHECK_SEQ_SEARCH(len, "RM");`
`2639`		`- if (S_FM(suf))`
`2640`		`- return len;`
`2641`		`- else`
`2642`		`- return 4;`
	`2633`	`+ return len;`
`2643`	`2634`	`}`
`2644`	`2635`	`break;`
`2645`	`2636`	`case DCH_rm:`
`@@ -2655,10 +2646,7 @@ dch_date(int arg, char *inout, int suf, bool is_to_char, bool is_interval,`
`2655`	`2646`	`{`
`2656`	`2647`	`tmfc->mm = 12 - seq_search(inout, rm_months_lower, ALL_LOWER, FULL_SIZ, &len);`
`2657`	`2648`	`CHECK_SEQ_SEARCH(len, "rm");`
`2658`		`- if (S_FM(suf))`
`2659`		`- return len;`
`2660`		`- else`
`2661`		`- return 4;`
	`2649`	`+ return len;`
`2662`	`2650`	`}`
`2663`	`2651`	`break;`
`2664`	`2652`	`case DCH_W:`