Fixed mdy functions to use correct offset.

Michael Meskes · Michael Meskes · commit 060229b9d7a4 · 2003-07-24T08:41:07.000Z
diff --git a/src/interfaces/ecpg/ChangeLog b/src/interfaces/ecpg/ChangeLog
@@ -1587,6 +1587,10 @@ Thu Jul 17 09:15:59 CEST 2003
 Fri Jul 18 16:31:10 CEST 2003
 
 	- Added some more compatibility features to the parser.
+	
+Thu Jul 24 10:33:51 CEST 2003
+
+	- Fixed mdy functions to use correct offset.
 	- Set ecpg version to 3.0.0
 	- Set ecpg library to 4.0.0
 	- Set pgtypes library to 1.0.0
diff --git a/src/interfaces/ecpg/pgtypeslib/datetime.c b/src/interfaces/ecpg/pgtypeslib/datetime.c
@@ -100,7 +100,7 @@ PGTYPESdate_julmdy(Date jd, int* mdy)
 {
 	int y, m, d;
 	
-	j2date((int) jd, &y, &m, &d);
+	j2date((int) (jd + date2j(2000, 1, 1)), &y, &m, &d);
 	mdy[0] = m;
 	mdy[1] = d;
 	mdy[2] = y;
@@ -113,7 +113,7 @@ PGTYPESdate_mdyjul(int* mdy, Date *jdate)
 	/* day   is mdy[1] */
 	/* year  is mdy[2] */
 
-	*jdate = (Date) date2j(mdy[2], mdy[0], mdy[1]);
+	*jdate = (Date) (date2j(mdy[2], mdy[0], mdy[1]) - date2j(2000, 1, 1));
 }
 
 int
diff --git a/src/interfaces/ecpg/test/test_informix.pgc b/src/interfaces/ecpg/test/test_informix.pgc
@@ -36,7 +36,7 @@ int main()
 	
 	while (1)
 	{
-		$fetch in c into :i, :j;
+		$fetch forward c into :i, :j;
 		if (sqlca.sqlcode == 100) break;
 		else if (sqlca.sqlcode != 0) printf ("Error: %ld\n", sqlca.sqlcode);
 

Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ PGTYPESdate_julmdy(Date jd, int* mdy)`
`100`	`100`	`{`
`101`	`101`	`int y, m, d;`
`102`	`102`
`103`		`- j2date((int) jd, &y, &m, &d);`
	`103`	`+ j2date((int) (jd + date2j(2000, 1, 1)), &y, &m, &d);`
`104`	`104`	`mdy[0] = m;`
`105`	`105`	`mdy[1] = d;`
`106`	`106`	`mdy[2] = y;`
`@@ -113,7 +113,7 @@ PGTYPESdate_mdyjul(int* mdy, Date *jdate)`
`113`	`113`	`/* day is mdy[1] */`
`114`	`114`	`/* year is mdy[2] */`
`115`	`115`
`116`		`- *jdate = (Date) date2j(mdy[2], mdy[0], mdy[1]);`
	`116`	`+ *jdate = (Date) (date2j(mdy[2], mdy[0], mdy[1]) - date2j(2000, 1, 1));`
`117`	`117`	`}`
`118`	`118`
`119`	`119`	`int`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ int main()`
`36`	`36`
`37`	`37`	`while (1)`
`38`	`38`	`{`
`39`		`- $fetch in c into :i, :j;`
	`39`	`+ $fetch forward c into :i, :j;`
`40`	`40`	`if (sqlca.sqlcode == 100) break;`
`41`	`41`	`else if (sqlca.sqlcode != 0) printf ("Error: %ld\n", sqlca.sqlcode);`
`42`	`42`