Commit74778ce

committed

Return null check if there is only column in expression

1 parent91506a3 commit74778ceCopy full SHA for 74778ce

File tree

+30

-3

lines changed

+30

-3

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ CREATE TABLE test.hash_rel (`
`11`	`11`	`INSERT INTOtest.hash_relVALUES (1,1);`
`12`	`12`	`INSERT INTOtest.hash_relVALUES (2,2);`
`13`	`13`	`INSERT INTOtest.hash_relVALUES (3,3);`
`14`		`-SELECTpathman.create_hash_partitions('test.hash_rel','value + 1',3);`
	`14`	`+SELECTpathman.create_hash_partitions('test.hash_rel','value',3);`
`15`	`15`	`ALTERTABLEtest.hash_rel ALTER COLUMN valueSETNOT NULL;`
`16`	`16`	`SELECTpathman.create_hash_partitions('test.hash_rel','value',3, partition_data:=false);`
`17`	`17`	`EXPLAIN (COSTS OFF)SELECT*FROMtest.hash_rel;`

Lines changed: 28 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1766,6 +1766,34 @@ get_part_expression_info(Oid relid, const char *expr_string,`
`1766`	`1766`	`/* Keep raw expression */`
`1767`	`1767`	`expr_info->raw_expr=get_raw_expression(relid,expr_string,`
`1768`	`1768`	`&query_string,&parsetree);`
	`1769`	`+`
	`1770`	`+/* If expression is just column we check that is not null */`
	`1771`	`+if (IsA(expr_info->raw_expr,ColumnRef))`
	`1772`	`+{`
	`1773`	`+ColumnRefcol= (ColumnRef)expr_info->raw_expr;`
	`1774`	`+if (list_length(col->fields)==1)`
	`1775`	`+{`
	`1776`	`+HeapTupletp;`
	`1777`	`+boolresult;`
	`1778`	`+char*attname=strVal(linitial(col->fields));`
	`1779`	`+`
	`1780`	`+/* check if attribute is nullable */`
	`1781`	`+tp=SearchSysCacheAttName(relid,attname);`
	`1782`	`+if (HeapTupleIsValid(tp))`
	`1783`	`+{`
	`1784`	`+Form_pg_attributeatt_tup= (Form_pg_attribute)GETSTRUCT(tp);`
	`1785`	`+result= !att_tup->attnotnull;`
	`1786`	`+ReleaseSysCache(tp);`
	`1787`	`+}`
	`1788`	`+else`
	`1789`	`+elog(ERROR,"Cannot find type name for attribute \"%s\" "`
	`1790`	`+"of relation \"%s\"",`
	`1791`	`+attname,get_rel_name_or_relid(relid));`
	`1792`	`+`
	`1793`	`+if (result)`
	`1794`	`+elog(ERROR,"partitioning key \"%s\" must be NOT NULL",attname);`
	`1795`	`+}`
	`1796`	`+}`
`1769`	`1797`	`expr_info->expr_datum= (Datum)0;`
`1770`	`1798`
`1771`	`1799`	`/* We don't need pathman activity initialization for this relation yet */`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -57,8 +57,6 @@ PG_FUNCTION_INFO_V1( build_check_constraint_name_attname );`
`57`	`57`
`58`	`58`	`PG_FUNCTION_INFO_V1(validate_relname );`
`59`	`59`	`PG_FUNCTION_INFO_V1(is_date_type );`
`60`		`-PG_FUNCTION_INFO_V1(is_attribute_nullable );`
`61`		`-//PG_FUNCTION_INFO_V1( is_expression_suitable );`
`62`	`60`
`63`	`61`	`PG_FUNCTION_INFO_V1(add_to_pathman_config );`
`64`	`62`	`PG_FUNCTION_INFO_V1(pathman_config_params_trigger_func );`
`@@ -602,6 +600,7 @@ is_date_type(PG_FUNCTION_ARGS)`
`602`	`600`	`PG_RETURN_BOOL(is_date_type_internal(PG_GETARG_OID(0)));`
`603`	`601`	`}`
`604`	`602`
	`603`	`+`
`605`	`604`	`/*`
`606`	`605`	`* ------------------------`
`607`	`606`	`* Useful string builders`

Comments

(0)