Skip to content

Commit 3559241

Browse files
committed
fix: use class level native_database_type
1 parent 98b6bae commit 3559241

File tree

2 files changed

+17
-17
lines changed

2 files changed

+17
-17
lines changed

lib/active_record/connection_adapters/cockroachdb/schema_statements.rb

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -296,23 +296,6 @@ def type_to_sql(type, limit: nil, precision: nil, scale: nil, array: nil, **) #
296296
sql
297297
end
298298

299-
# override
300-
def native_database_types
301-
# Add spatial types
302-
super.merge(
303-
geography: { name: "geography" },
304-
geometry: { name: "geometry" },
305-
geometry_collection: { name: "geometry_collection" },
306-
line_string: { name: "line_string" },
307-
multi_line_string: { name: "multi_line_string" },
308-
multi_point: { name: "multi_point" },
309-
multi_polygon: { name: "multi_polygon" },
310-
spatial: { name: "geometry" },
311-
st_point: { name: "st_point" },
312-
st_polygon: { name: "st_polygon" }
313-
)
314-
end
315-
316299
# override
317300
def create_table_definition(*args, **kwargs)
318301
CockroachDB::TableDefinition.new(self, *args, **kwargs)

lib/active_record/connection_adapters/cockroachdb_adapter.rb

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,23 @@ def self.spatial_column_options(key)
111111
SPATIAL_COLUMN_OPTIONS[key]
112112
end
113113

114+
def self.native_database_types
115+
return @native_database_types if defined?(@native_database_types)
116+
# Add spatial types
117+
@native_database_types = super.merge(
118+
geography: { name: "geography" },
119+
geometry: { name: "geometry" },
120+
geometry_collection: { name: "geometry_collection" },
121+
line_string: { name: "line_string" },
122+
multi_line_string: { name: "multi_line_string" },
123+
multi_point: { name: "multi_point" },
124+
multi_polygon: { name: "multi_polygon" },
125+
spatial: { name: "geometry" },
126+
st_point: { name: "st_point" },
127+
st_polygon: { name: "st_polygon" }
128+
)
129+
end
130+
114131
def postgis_lib_version
115132
@postgis_lib_version ||= select_value("SELECT PostGIS_Lib_Version()")
116133
end

0 commit comments

Comments
 (0)