New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Support for mysql schema with spatial types/indexes #27813
Closed
Closed
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
35fcb1e
Support for dumping/loading mysql schema that contains spatial data t…
Vasfed 9ad9a0d
Code style fixes [ci skip]
Vasfed 4a407bc
Use myisam table type for tests to pass on older mysqls
Vasfed 318657b
Support for mysql spatial collection types
Vasfed 6e05b69
Changelog entry for mysql spatial types in schema [ci skip]
Vasfed e45bca8
Expose mysql geometrycollection-like types only via multi-option for …
Vasfed File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
47 changes: 47 additions & 0 deletions
47
activerecord/test/cases/adapters/mysql2/spatial_types_test.rb
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,47 @@ | ||
require "cases/helper" | ||
require "support/schema_dumping_helper" | ||
|
||
class Mysql2SpatialTypesTest < ActiveRecord::Mysql2TestCase | ||
include SchemaDumpingHelper | ||
self.use_transactional_tests = false | ||
|
||
setup do | ||
@connection = ActiveRecord::Base.connection | ||
@connection.create_table("spatial_types", force: true, options: "ENGINE=MyISAM") do |t| | ||
t.geometry :geometry_field | ||
t.polygon :polygon_field, null: false, index: { type: :spatial } | ||
t.point :point_field | ||
t.linestring :linestring_field | ||
|
||
t.geometry :geometry_multi, multi: true | ||
t.polygon :polygon_multi, multi: true | ||
t.point :point_multi, multi: true | ||
t.linestring :linestring_multi, multi: true | ||
end | ||
end | ||
|
||
teardown do | ||
@connection.drop_table "spatial_types", if_exists: true | ||
end | ||
|
||
test "schema dump includes spatial types" do | ||
schema = dump_table_schema "spatial_types" | ||
assert_match %r{t.geometry\s+"geometry_field"$}, schema | ||
assert_match %r{t.polygon\s+"polygon_field",\s+null: false$}, schema | ||
assert_match %r{t.point\s+"point_field"$}, schema | ||
assert_match %r{t.linestring\s+"linestring_field"$}, schema | ||
|
||
assert_match %r{t.geometry\s+"geometry_multi",\s+multi: true$}, schema | ||
assert_match %r{t.polygon\s+"polygon_multi",\s+multi: true$}, schema | ||
assert_match %r{t.point\s+"point_multi",\s+multi: true$}, schema | ||
assert_match %r{t.linestring\s+"linestring_multi",\s+multi: true$}, schema | ||
end | ||
|
||
test "schema dump can be restored" do | ||
schema = dump_table_schema "spatial_types" | ||
@connection.drop_table "spatial_types", if_exists: true | ||
silence_stdout { eval schema } | ||
schema2 = dump_table_schema "spatial_types" | ||
assert_equal schema, schema2 | ||
end | ||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@jeremy can you vet this change?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Mysql returns non-null
Sub_part
for spatial index, but does not allow to set it, thus previous behaviour resulted in a schema dump that could not be loaded back.https://dev.mysql.com/doc/refman/5.7/en/create-index.html :