Fix SQL3 type return value.

For non-SQL3 types ecpg used to return -Oid. This will break if there are
enough Oids to fill the namespace. Therefore we play it safe and return 0 if
there is no Oid->SQL3 tyoe mapping available.

1 files changed, 17 insertions, 20 deletions

diff --git a/src/interfaces/ecpg/test/expected/sql-dyntest.c b/src/interfaces/ecpg/test/expected/sql-dyntest.c
index ebc8f22ed9d..1871e1338ff 100644
--- a/src/interfaces/ecpg/test/expected/sql-dyntest.c
+++ b/src/interfaces/ecpg/test/expected/sql-dyntest.c
@@ -385,10 +385,7 @@ if (sqlca.sqlcode < 0) error ( );}
 		printf ("varchar()");
 	      break;
 	    default:
-	      if (TYPE < 0)
-		printf ("<OID %d>", -TYPE);
-	      else
-		printf ("<SQL3 %d>", TYPE);
+	      printf ("<SQL3 %d>", TYPE);
 	      break;
 	    }
 	  printf (")\n\toctet_length: %d returned_octet_length: %d)\n\t= ",
@@ -402,10 +399,10 @@ if (sqlca.sqlcode < 0) error ( );}
 	      { ECPGget_desc(__LINE__, "MYDESC", INDEX,ECPGd_data,
 	ECPGt_bool,&(BOOLVAR),(long)1,(long)1,sizeof(bool), ECPGd_EODT);
 
-#line 166 "dyntest.pgc"
+#line 163 "dyntest.pgc"
 
 if (sqlca.sqlcode < 0) error ( );}
-#line 166 "dyntest.pgc"
+#line 163 "dyntest.pgc"
 
 		printf ("%s\n", BOOLVAR ? "true" : "false");
 		break;
@@ -414,10 +411,10 @@ if (sqlca.sqlcode < 0) error ( );}
 	      { ECPGget_desc(__LINE__, "MYDESC", INDEX,ECPGd_data,
 	ECPGt_int,&(INTVAR),(long)1,(long)1,sizeof(int), ECPGd_EODT);
 
-#line 171 "dyntest.pgc"
+#line 168 "dyntest.pgc"
 
 if (sqlca.sqlcode < 0) error ( );}
-#line 171 "dyntest.pgc"
+#line 168 "dyntest.pgc"
 
 		printf ("%d\n", INTVAR);
 		break;
@@ -425,10 +422,10 @@ if (sqlca.sqlcode < 0) error ( );}
 	      { ECPGget_desc(__LINE__, "MYDESC", INDEX,ECPGd_data,
 	ECPGt_double,&(DOUBLEVAR),(long)1,(long)1,sizeof(double), ECPGd_EODT);
 
-#line 175 "dyntest.pgc"
+#line 172 "dyntest.pgc"
 
 if (sqlca.sqlcode < 0) error ( );}
-#line 175 "dyntest.pgc"
+#line 172 "dyntest.pgc"
 
 		printf ("%.*f\n", PRECISION, DOUBLEVAR);
 		break;
@@ -437,10 +434,10 @@ if (sqlca.sqlcode < 0) error ( );}
 	ECPGt_char,(STRINGVAR),(long)1024,(long)1,(1024)*sizeof(char), ECPGd_di_code,
 	ECPGt_int,&(DATETIME_INTERVAL_CODE),(long)1,(long)1,sizeof(int), ECPGd_EODT);
 
-#line 181 "dyntest.pgc"
+#line 178 "dyntest.pgc"
 
 if (sqlca.sqlcode < 0) error ( );}
-#line 181 "dyntest.pgc"
+#line 178 "dyntest.pgc"
 
 		printf ("%d \"%s\"\n", DATETIME_INTERVAL_CODE, STRINGVAR);
 		break;
@@ -449,10 +446,10 @@ if (sqlca.sqlcode < 0) error ( );}
 	      { ECPGget_desc(__LINE__, "MYDESC", INDEX,ECPGd_data,
 	ECPGt_char,(STRINGVAR),(long)1024,(long)1,(1024)*sizeof(char), ECPGd_EODT);
 
-#line 186 "dyntest.pgc"
+#line 183 "dyntest.pgc"
 
 if (sqlca.sqlcode < 0) error ( );}
-#line 186 "dyntest.pgc"
+#line 183 "dyntest.pgc"
 
 		printf ("\"%s\"\n", STRINGVAR);
 		break;
@@ -460,10 +457,10 @@ if (sqlca.sqlcode < 0) error ( );}
 	      { ECPGget_desc(__LINE__, "MYDESC", INDEX,ECPGd_data,
 	ECPGt_char,(STRINGVAR),(long)1024,(long)1,(1024)*sizeof(char), ECPGd_EODT);
 
-#line 190 "dyntest.pgc"
+#line 187 "dyntest.pgc"
 
 if (sqlca.sqlcode < 0) error ( );}
-#line 190 "dyntest.pgc"
+#line 187 "dyntest.pgc"
 
 		printf ("<\"%s\">\n", STRINGVAR);
 		break;
@@ -472,17 +469,17 @@ if (sqlca.sqlcode < 0) error ( );}
     }
 
   { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "close MYCURS", ECPGt_EOIT, ECPGt_EORT);
-#line 197 "dyntest.pgc"
+#line 194 "dyntest.pgc"
 
 if (sqlca.sqlcode < 0) error ( );}
-#line 197 "dyntest.pgc"
+#line 194 "dyntest.pgc"
 
 
   ECPGdeallocate_desc(__LINE__, "MYDESC");
-#line 199 "dyntest.pgc"
+#line 196 "dyntest.pgc"
 
 if (sqlca.sqlcode < 0) error ( );
-#line 199 "dyntest.pgc"
+#line 196 "dyntest.pgc"
 
 
   return 0;