Commit167330b

committed

Fix convertiong regprocedure to text, small refactoring

1 parent59778f5 commit167330bCopy full SHA for 167330b

File tree

+21

-12

lines changed

+21

-12

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ BEGIN`
`141`	`141`
`142`	`142`	`/* Fetch init_callback from 'params' table*/`
`143`	`143`	`WITH stub_callback(stub)as (values (0))`
`144`		`-SELECTcoalesce(init_callback,NULL)`
	`144`	`+SELECT init_callback`
`145`	`145`	`FROM stub_callback`
`146`	`146`	`LEFT JOIN @extschema@.pathman_config_paramsAS params`
`147`	`147`	`ONparams.partrel= parent_relid`

Lines changed: 15 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ CREATE TABLE IF NOT EXISTS @extschema@.pathman_config_params (`
`52`	`52`	`partrelREGCLASSNOT NULLPRIMARY KEY,`
`53`	`53`	`enable_parentBOOLEANNOT NULL DEFAULT FALSE,`
`54`	`54`	`autoBOOLEANNOT NULL DEFAULT TRUE,`
`55`		`-init_callbackTEXT,`
	`55`	`+init_callbackTEXT DEFAULTNULL,`
`56`	`56`	`spawn_using_bgwBOOLEANNOT NULL DEFAULT FALSE`
`57`	`57`
`58`	`58`	`CHECK (@extschema@.validate_part_callback(init_callback))/* check signature*/`
`@@ -157,12 +157,21 @@ CREATE OR REPLACE FUNCTION @extschema@.set_init_callback(`
`157`	`157`	`callbackREGPROC DEFAULT0)`
`158`	`158`	`RETURNS VOIDAS`
`159`	`159`	`$$`
	`160`	`+DECLARE`
	`161`	`+regproc_textTEXT;`
`160`	`162`	`BEGIN`
`161`		`-PERFORM @extschema@.pathman_set_param(relation,'init_callback',`
`162`		`-CASE WHEN callback<>0`
`163`		`-THEN regprocedureout(callback)::text`
`164`		`-ELSENULL END);`
`165`		`-`
	`163`	`+IF callback!=0 THEN`
	`164`	`+EXECUTE'SELECT quote_ident(nspname) \|\|''.'' \|\| quote_ident(proname)'`
	`165`	`+'\|\|''('' \|\| (SELECT string_agg(x.argtype::regtype::text,'','')'`
	`166`	`+' FROM unnest(proargtypes) AS x(argtype))'`
	`167`	`+'\|\|'')'''`
	`168`	`+'FROM pg_proc p JOIN pg_namespace n ON n.oid=p.pronamespace WHERE p.oid=$1'`
	`169`	`+INTO regproc_text`
	`170`	`+USING callback;`
	`171`	`+ELSE`
	`172`	`+regproc_text :=NULL;`
	`173`	`+END IF;`
	`174`	`+PERFORM @extschema@.pathman_set_param(relation,'init_callback', regproc_text);`
`166`	`175`	`END`
`167`	`176`	`$$`
`168`	`177`	`LANGUAGE plpgsql STRICT;`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1051,7 +1051,7 @@ BEGIN`
`1051`	`1051`
`1052`	`1052`	`/* Fetch init_callback from 'params' table*/`
`1053`	`1053`	`WITH stub_callback(stub)as (values (0))`
`1054`		`-SELECTcoalesce(init_callback,NULL)`
	`1054`	`+SELECT init_callback`
`1055`	`1055`	`FROM stub_callback`
`1056`	`1056`	`LEFT JOIN @extschema@.pathman_config_paramsAS params`
`1057`	`1057`	`ONparams.partrel= parent_relid`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -1394,23 +1394,23 @@ make_int_value_struct(int int_val)`
`1394`	`1394`	`/*`
`1395`	`1395`	`* Utility function that converts signature of procedure into regprocedure.`
`1396`	`1396`	`*`
`1397`		`- * Precondition:proname_args != NULL.`
	`1397`	`+ * Precondition:proc_signature != NULL.`
`1398`	`1398`	`*`
`1399`	`1399`	`* Returns InvalidOid if proname_args is not found.`
`1400`	`1400`	`* Raise error if it's incorrect.`
`1401`	`1401`	`*/`
`1402`	`1402`	`staticOid`
`1403`		`-text2regprocedure(text*proname_args)`
	`1403`	`+text2regprocedure(text*proc_signature)`
`1404`	`1404`	`{`
`1405`	`1405`	`FunctionCallInfoDatafcinfo;`
`1406`	`1406`	`Datumresult;`
`1407`	`1407`
`1408`	`1408`	`InitFunctionCallInfoData(fcinfo,NULL,1,InvalidOid,NULL,NULL);`
`1409`	`1409`
`1410`	`1410`	`#ifPG_VERSION_NUM >=90600`
`1411`		`-fcinfo.arg[0]=PointerGetDatum(proname_args);`
	`1411`	`+fcinfo.arg[0]=PointerGetDatum(proc_signature);`
`1412`	`1412`	`#else`
`1413`		`-fcinfo.arg[0]=CStringGetDatum(text_to_cstring(proname_args));`
	`1413`	`+fcinfo.arg[0]=CStringGetDatum(text_to_cstring(proc_signature));`
`1414`	`1414`	`#endif`
`1415`	`1415`	`fcinfo.argnull[0]= false;`
`1416`	`1416`

Comments

(0)