Commitabfa8ae

Michael Meskes

committed

Fixed some Informix compat functions so they handle NULL resp. indicators better.

1 parent4afcba0 commitabfa8aeCopy full SHA for abfa8ae

File tree

+30

-0

lines changed

+30

-0

lines changed

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1563,6 +1563,12 @@ Tue Jul 8 12:34:00 CEST 2003`
`1563`	`1563`
`1564`	`1564`	`- Made Informix decimal-ascii conversion honor Informix NULLs.`
`1565`	`1565`	`- Informix variable handling didn't cope well with arrays.`
	`1566`	`+`
	`1567`	`+Wed Jul 9 11:45:02 CEST 2003`
	`1568`	`+`
	`1569`	`+- Made all Informix functions honor Informix NULLs.`
	`1570`	`+- Extended compatibility functions for INFORMIX handling of DECLARE`
	`1571`	`+ statement to work with indicators.`
`1566`	`1572`	`- Set ecpg version to 3.0.0`
`1567`	`1573`	`- Set ecpg library to 4.0.0`
`1568`	`1574`	`- Set pgtypes library to 1.0.0`

Lines changed: 24 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,12 @@ deccall3(Decimal arg1, Decimal arg2, Decimal result, int (ptr)(Numeric *, Nu`
`55`	`55`	`Numerica1,a2,*nres;`
`56`	`56`	`inti;`
`57`	`57`
	`58`	`+if (risnull(CDECIMALTYPE, (char)arg1)\|\|risnull(CDECIMALTYPE, (char)arg2))`
	`59`	`+{`
	`60`	`+rsetnull(CDECIMALTYPE, (char*)result);`
	`61`	`+return0;`
	`62`	`+}`
	`63`	`+`
`58`	`64`	`if ((a1=PGTYPESnumeric_new())==NULL)`
`59`	`65`	`return-1211;`
`60`	`66`
`@@ -191,6 +197,12 @@ deccvdbl(double dbl, Decimal *np)`
`191`	`197`	`Numeric*nres=PGTYPESnumeric_new();`
`192`	`198`	`intresult=1;`
`193`	`199`
	`200`	`+if (risnull(CDOUBLETYPE, (char*)&dbl))`
	`201`	`+{`
	`202`	`+rsetnull(CDECIMALTYPE, (char*)np);`
	`203`	`+return0;`
	`204`	`+}`
	`205`	`+`
`194`	`206`	`if (nres==NULL)`
`195`	`207`	`return-1211;`
`196`	`208`
`@@ -208,6 +220,12 @@ deccvint(int in, Decimal *np)`
`208`	`220`	`Numeric*nres=PGTYPESnumeric_new();`
`209`	`221`	`intresult=1;`
`210`	`222`
	`223`	`+if (risnull(CINTTYPE, (char*)&in))`
	`224`	`+{`
	`225`	`+rsetnull(CDECIMALTYPE, (char*)np);`
	`226`	`+return0;`
	`227`	`+}`
	`228`	`+`
`211`	`229`	`if (nres==NULL)`
`212`	`230`	`return-1211;`
`213`	`231`
`@@ -225,6 +243,12 @@ deccvlong(long lng, Decimal *np)`
`225`	`243`	`Numeric*nres=PGTYPESnumeric_new();`
`226`	`244`	`intresult=1;`
`227`	`245`
	`246`	`+if (risnull(CLONGTYPE, (char*)&lng))`
	`247`	`+{`
	`248`	`+rsetnull(CDECIMALTYPE, (char*)np);`
	`249`	`+return0;`
	`250`	`+}`
	`251`	`+`
`228`	`252`	`if (nres==NULL)`
`229`	`253`	`return-1211;`
`230`	`254`

Comments

(0)