@@ -176,7 +176,7 @@ def pull_latest_from_table_or_query(
             FROM (
                 SELECT {a_field_string},
                 ROW_NUMBER() OVER({partition_by_join_key_string} ORDER BY {timestamp_desc_string}) AS _feast_row
-                FROM ({from_expression}) a
+                FROM {from_expression} a
                 WHERE a."{timestamp_field}"
                     BETWEEN toDateTime64('{start_date.replace(tzinfo=None)!s}', 6, '{start_date.tzinfo!s}')
                     AND toDateTime64('{end_date.replace(tzinfo=None)!s}', 6, '{end_date.tzinfo!s}')
 
@@ -100,6 +100,7 @@
     "duckdb": "feast.infra.offline_stores.duckdb.DuckDBOfflineStore",
     "remote": "feast.infra.offline_stores.remote.RemoteOfflineStore",
     "couchbase.offline": "feast.infra.offline_stores.contrib.couchbase_offline_store.couchbase.CouchbaseColumnarOfflineStore",
+    "clickhouse": "feast.infra.offline_stores.contrib.clickhouse_offline_store.clickhouse.ClickhouseOfflineStore",
 }
 
 FEATURE_SERVER_CONFIG_CLASS_FOR_TYPE = {
Original file line number	Diff line number	Diff line change
`@@ -100,6 +100,7 @@`
`100`	`100`	`"duckdb": "feast.infra.offline_stores.duckdb.DuckDBOfflineStore",`
`101`	`101`	`"remote": "feast.infra.offline_stores.remote.RemoteOfflineStore",`
`102`	`102`	`"couchbase.offline": "feast.infra.offline_stores.contrib.couchbase_offline_store.couchbase.CouchbaseColumnarOfflineStore",`
	`103`	`+ "clickhouse": "feast.infra.offline_stores.contrib.clickhouse_offline_store.clickhouse.ClickhouseOfflineStore",`
`103`	`104`	`}`
`104`	`105`
`105`	`106`	`FEATURE_SERVER_CONFIG_CLASS_FOR_TYPE = {`