Merge master

Author: pramsey

ogr_fdw.c

@@ -1335,7 +1335,12 @@ ogrReadColumnData(OgrFdwState* state)
 	tbl = palloc0(sizeof(OgrFdwTable));
 
 	/* One column for each PgSQL foreign table column */
+#if PG_VERSION_NUM < 120000
 	rel = heap_open(state->foreigntableid, NoLock);
+#else
+	rel = table_open(state->foreigntableid, NoLock);
+#endif /* PG_VERSION_NUM */
+
 	tupdesc = rel->rd_att;
 	state->tupdesc = tupdesc;
 	tbl->ncols = tupdesc->natts;
@@ -1495,7 +1500,12 @@ ogrReadColumnData(OgrFdwState* state)
 		}
 	}
 	pfree(ogr_fields);
+#if PG_VERSION_NUM < 120000
 	heap_close(rel, NoLock);
+#else
+	table_close(rel, NoLock);
+#endif /* PG_VERSION_NUM */
+
 
 	return;
 }
@@ -3003,7 +3013,7 @@ ogrImportForeignSchema(ImportForeignSchemaStmt* stmt, Oid serverOid)
 			stringbuffer_init(&buf);
 
 			err = ogrLayerToSQL(ogr_lyr,
-			                    quote_identifier(server->servername),
+			                    server->servername,
 			                    launder_table_names,
 			                    launder_column_names,
 			                    ogrGetGeometryOid() != BYTEAOID,

ogr_fdw_common.c

@@ -371,7 +371,7 @@ ogrLayerToSQL (const OGRLayerH ogr_lyr, const char *fdw_server,
 	 * Add server name and layer-level options.  We specify remote
 	 * layer name as option
 	 */
-	stringbuffer_aprintf(buf, "\n) SERVER \"%s\"\nOPTIONS (", quote_identifier(fdw_server));
+	stringbuffer_aprintf(buf, "\n) SERVER %s \nOPTIONS (", quote_identifier(fdw_server));
 	stringbuffer_append(buf, "layer ");
 	ogrDeparseStringLiteral(buf, OGR_L_GetName(ogr_lyr));
 	stringbuffer_append(buf, ");\n");