Merge pull request #2324 from dolthub/jennifer/type

resolve type in CREATE FUNCTION with empty search path

Author: jennifersp

postgres/parser/types/types.go

@@ -1256,7 +1256,7 @@ var familyNames = map[Family]string{
 	BytesFamily:          "bytes",
 	CollatedStringFamily: "collatedstring",
 	DateFamily:           "date",
-	DecimalFamily:        "decimal",
+	DecimalFamily:        "numeric",
 	EnumFamily:           "enum",
 	FloatFamily:          "float",
 	GeographyFamily:      "geography",

server/analyzer/resolve_type.go

@@ -175,18 +175,14 @@ func resolveType(ctx *sql.Context, typ *pgtypes.DoltgresType) (*pgtypes.Doltgres
 	if typ.IsResolvedType() {
 		return typ, nil
 	}
-	schema, err := core.GetSchemaName(ctx, nil, typ.ID.SchemaName())
-	if err != nil {
-		return nil, err
-	}
 	typs, err := core.GetTypesCollectionFromContext(ctx)
 	if err != nil {
 		return nil, err
 	}
-	resolvedTyp, err := typs.GetType(ctx, id.NewType(schema, typ.ID.TypeName()))
-	if err != nil {
-		return nil, err
-	}
+
+	// schema name can be empty
+	schema, _ := core.GetSchemaName(ctx, nil, typ.ID.SchemaName())
+	resolvedTyp, _ := typs.GetType(ctx, id.NewType(schema, typ.ID.TypeName()))
 	if resolvedTyp == nil {
 		// If a blank schema is provided, then we'll also try the pg_catalog, since a type is most likely to be there
 		if typ.ID.SchemaName() == "" {

testing/go/create_function_plpgsql_test.go

@@ -1376,5 +1376,48 @@ END;
 				},
 			},
 		},
+		{
+			Name: "resolve type with empty search path",
+			SetUpScript: []string{
+				"set search_path to ''",
+				`CREATE TABLE public.ambienttempdetail (tempdetailid integer NOT NULL, panelprojectid integer, threshold_value numeric(10,2), readingintervalinmin integer);`,
+				`insert into public.ambienttempdetail values (1, 101, 25.5, 15);`,
+			},
+			Assertions: []ScriptTestAssertion{
+				{
+					Query: `CREATE FUNCTION public.ambienttempdetail_insertupdate(p_panel_project_id integer, p_threshold_value numeric, p_reading_interval_in_min integer) RETURNS integer
+    LANGUAGE plpgsql
+    AS $$
+DECLARE
+    v_rtn_value INTEGER;
+BEGIN
+    IF NOT EXISTS (SELECT * FROM AmbientTempDetail WHERE PanelProjectId = p_panel_project_id) THEN
+        INSERT INTO AmbientTempDetail (PanelProjectId, Threshold_Value, ReadingIntervalInMin)
+        VALUES (p_panel_project_id, p_threshold_value, p_reading_interval_in_min)
+        RETURNING TempDetailId INTO v_rtn_value;
+    ELSE
+        UPDATE AmbientTempDetail
+        SET PanelProjectId = p_panel_project_id,
+            Threshold_Value = p_threshold_value,
+            ReadingIntervalInMin = p_reading_interval_in_min
+        WHERE PanelProjectId = p_panel_project_id;
+        v_rtn_value := p_panel_project_id;
+    END IF;
+    
+    RETURN v_rtn_value;
+END;
+$$;`,
+					Expected: []sql.Row{},
+				},
+				{
+					Query: "set search_path to 'public'",
+				},
+				{
+					Skip:     true,
+					Query:    "SELECT public.ambienttempdetail_insertupdate(101, 25.5, 15);",
+					Expected: []sql.Row{{101}},
+				},
+			},
+		},
 	})
 }