Skip to content

Commit 78ae86b

Browse files
committed
Rename meta_tables_after_main to group_table_definition
1 parent 3391393 commit 78ae86b

File tree

6 files changed

+22
-19
lines changed

6 files changed

+22
-19
lines changed

CHANGELOG.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
## 0.5.0 2025-07-09
88

99
### Added
10-
* Introduced `:meta_tables_after_main` option as a more flexible replacement for `:indexes_after_tables`.
10+
* Introduced `:group_table_definition` option as a more flexible replacement for `:indexes_after_tables`.
1111
This option places indexes and deferrable constraints after their respective `CREATE TABLE` statements.
1212

1313
### Deprecated
1414
* `:indexes_after_tables` is now deprecated and will be removed in version 1.0.0.
15-
Please migrate to the new `:meta_tables_after_main` option.
15+
Please migrate to the new `:group_table_definition` option.
1616

1717
## 0.4.3 2024-09-22
1818

Gemfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PATH
22
remote: .
33
specs:
4-
activerecord-clean-db-structure (0.5.0)
4+
activerecord-clean-db-structure (0.4.3)
55
activerecord (>= 4.2)
66

77
GEM

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,13 @@ end
4040

4141
## Other options
4242

43-
### meta_tables_after_main
43+
### group_table_definition
4444

45-
You can optionally place indexes and constraints (limited to deferrable ones) after the main tables by setting meta_tables_after_main:
45+
You can optionally place indexes and constraints (limited to deferrable ones) after the main tables by setting group_table_definition:
4646

4747
```ruby
4848
Rails.application.configure do
49-
config.activerecord_clean_db_structure.meta_tables_after_main = true
49+
config.activerecord_clean_db_structure.group_table_definition = true
5050
end
5151
```
5252

lib/activerecord-clean-db-structure/clean_dump.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,10 +131,10 @@ def clean_options
131131

132132
# TODO: Remove support for :indexes_after_tables in version 1.0.0
133133
if options[:indexes_after_tables]
134-
warn "[DEPRECATION] The :indexes_after_tables option is deprecated and will be removed in version 1.0.0. Use :meta_tables_after_main instead."
134+
warn "[DEPRECATION] The :indexes_after_tables option is deprecated and will be removed in version 1.0.0. Use :group_table_definition instead."
135135
end
136136

137-
if options[:indexes_after_tables] || options[:meta_tables_after_main]
137+
if options[:indexes_after_tables] || options[:group_table_definition]
138138
# Extract indexes
139139
indexes =
140140
dump

test/clean_dump_test.rb

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,40 @@
1-
require "test_helper"
1+
require 'test_helper'
22

33
class CleanDumpTest < Minitest::Test
44
def test_basic_case
5-
assert_cleans_dump "data/input.sql", "expectations/default_props.sql"
5+
assert_cleans_dump 'data/input.sql', 'expectations/default_props.sql'
66
end
77

88
def test_ignore_ids
9-
assert_cleans_dump "data/input.sql", "expectations/ignore_ids.sql", ignore_ids: true
9+
assert_cleans_dump 'data/input.sql', 'expectations/ignore_ids.sql', ignore_ids: true
1010
end
1111

1212
def test_order_column_definitions
13-
assert_cleans_dump "data/input.sql", "expectations/order_column_definitions.sql", order_column_definitions: true
13+
assert_cleans_dump 'data/input.sql', 'expectations/order_column_definitions.sql', order_column_definitions: true
1414
end
1515

1616
def test_order_schema_migrations_values
17-
assert_cleans_dump "data/input.sql", "expectations/order_schema_migrations_values.sql", order_schema_migrations_values: true
17+
assert_cleans_dump 'data/input.sql', 'expectations/order_schema_migrations_values.sql',
18+
order_schema_migrations_values: true
1819
end
1920

20-
def test_meta_tables_after_main
21-
assert_cleans_dump "data/input.sql", "expectations/meta_tables_after_main.sql", meta_tables_after_main: true
21+
def test_group_table_definition
22+
assert_cleans_dump 'data/input.sql', 'expectations/group_table_definition.sql', group_table_definition: true
2223
end
2324

2425
def test_keep_extensions_all
25-
assert_cleans_dump "data/input.sql", "expectations/keep_extensions_all.sql", keep_extensions: :all
26+
assert_cleans_dump 'data/input.sql', 'expectations/keep_extensions_all.sql', keep_extensions: :all
2627
end
2728

2829
def test_partitions
29-
assert_cleans_dump "data/partitions.sql", "expectations/partitions.sql"
30+
assert_cleans_dump 'data/partitions.sql', 'expectations/partitions.sql'
3031
end
3132

3233
def test_ignored_schemas
33-
assert_cleans_dump "data/ignored_schemas.sql", "expectations/ignored_schemas_pganalyze.sql", ignore_schemas: ['pganalyze']
34-
assert_cleans_dump "data/ignored_schemas.sql", "expectations/ignored_schemas_myschema.sql", ignore_schemas: ['myschema']
34+
assert_cleans_dump 'data/ignored_schemas.sql', 'expectations/ignored_schemas_pganalyze.sql',
35+
ignore_schemas: ['pganalyze']
36+
assert_cleans_dump 'data/ignored_schemas.sql', 'expectations/ignored_schemas_myschema.sql',
37+
ignore_schemas: ['myschema']
3538
end
3639

3740
private

0 commit comments

Comments
 (0)