Fix CI result

mkgrgis · mkgrgis · commit e3023fd2b7cc · 2025-04-11T09:47:53.000+03:00
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -24,8 +24,8 @@ jobs:
   test:
     needs: detect-pgversion
     env:
-      SQLITE_VERSION : "3490000"
-      SQLITE_YEAR: "2025"
+      SQLITE_VERSION : "3460000"
+      SQLITE_YEAR: "2024"
       POSTGIS_VERSION : "3.4.2"
       HTTP_PROXY: ""
       HTTPS_PROXY: ""
diff --git a/deparse.c b/deparse.c
@@ -2303,7 +2303,6 @@ sqlite_deparse_column_ref(StringInfo buf, int varno, int varattno, PlannerInfo *
 			if (strcmp(def->defname, "column_name") == 0)
 			{
 				colname = defGetString(def);
-<<<<<<< HEAD
 				elog(DEBUG1, "column name = %s\n", colname);
 				break;
 			}
@@ -2313,11 +2312,6 @@ sqlite_deparse_column_ref(StringInfo buf, int varno, int varattno, PlannerInfo *
 				elog(DEBUG4, "column type = %s", coltype);
 				colaff = sqlite_affinity_code(coltype);
 			}
-=======
-				elog(DEBUG3, "sqlite_fdw : %s, column_name opt = %s\n", __func__, colname);
-				break;
-			}
->>>>>>> 9764c26 (Add initial SpatiaLite ↔ PostGIS support (#96))
 		}
 
 		/*

Original file line number	Diff line number	Diff line change
`@@ -2303,7 +2303,6 @@ sqlite_deparse_column_ref(StringInfo buf, int varno, int varattno, PlannerInfo *`
`2303`	`2303`	`if (strcmp(def->defname, "column_name") == 0)`
`2304`	`2304`	`{`
`2305`	`2305`	`colname = defGetString(def);`
`2306`		`-<<<<<<< HEAD`
`2307`	`2306`	`elog(DEBUG1, "column name = %s\n", colname);`
`2308`	`2307`	`break;`
`2309`	`2308`	`}`
`@@ -2313,11 +2312,6 @@ sqlite_deparse_column_ref(StringInfo buf, int varno, int varattno, PlannerInfo *`
`2313`	`2312`	`elog(DEBUG4, "column type = %s", coltype);`
`2314`	`2313`	`colaff = sqlite_affinity_code(coltype);`
`2315`	`2314`	`}`
`2316`		`-=======`
`2317`		`- elog(DEBUG3, "sqlite_fdw : %s, column_name opt = %s\n", __func__, colname);`
`2318`		`- break;`
`2319`		`- }`
`2320`		`->>>>>>> 9764c26 (Add initial SpatiaLite ↔ PostGIS support (#96))`
`2321`	`2315`	`}`
`2322`	`2316`
`2323`	`2317`	`/*`