Skip to content

Fix parsing of raw table name from SQL with extra parentheses #1270

New issue

Have a question about this project? Sign up for a free account to open an issue and contact its maintainers and the community.

Sign up for

By clicking “Sign up for ”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on ? Sign in to your account

Merged
merged 2 commits into from
Dec 12, 2024
Merged

Fix parsing of raw table name from SQL with extra parentheses #1270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ed1e9fc
Fix parsing of raw table name from SQL with extra parentheses
aidanharanDec 12, 2024
d66c998
Update CHANGELOG.md
aidanharanDec 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
##

#### Fixed

- [#1270](https://.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1270) Fix parsing of raw table name from SQL with extra parentheses

## v7.2.3

#### Fixed
Expand Down
2 changes: 1 addition & 1 deletion lib/active_record/connection_adapters/sqlserver/schema_statements.rb
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -690,7 +690,7 @@ def get_raw_table_name(sql)
elsif s.match?(/^\s*UPDATE\s+.*/i)
s.match(/UPDATE\s+([^\(\s]+)\s*/i)[1]
else
s.match(/FROM\s+((\[[^\(\]]+\])|[^\(\s]+)\s*/i)[1]
s.match(/FROM[\s|\(]+((\[[^\(\]]+\])|[^\(\s]+)\s*/i)[1]
end.strip
end

Expand Down
6 changes: 6 additions & 0 deletions test/cases/schema_test_sqlserver.rb
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -101,5 +101,11 @@ class SchemaTestSQLServer < ActiveRecord::TestCase
assert_equal "[with].[select notation]", connection.send(:get_raw_table_name, "INSERT INTO [with].[select notation] SELECT * FROM [table_name]")
end
end

describe 'CREATE VIEW statements' do
it do
assert_equal "test_table_as", connection.send(:get_raw_table_name, "CREATE VIEW test_views ( test_table_a_id, test_table_b_id ) AS SELECT test_table_as.id as test_table_a_id, test_table_bs.id as test_table_b_id FROM (test_table_as with(nolock) LEFT JOIN test_table_bs with(nolock) ON (test_table_as.id = test_table_bs.test_table_a_id))")
end
end
end
end