Skip to content
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.

Sign up for GitHub

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

Override empty_from_sql for MySQL #3121

Merged
merged 1 commit into from
Jan 9, 2023
Merged

Override empty_from_sql for MySQL #3121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions lib/cloud_controller/db.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,10 @@ def post_load(all_records)
end
end

def empty_from_sql
' FROM DUAL' if self.db.database_type == :mysql
end

@unique_names_in_subquery = nil

class << self
Expand Down
2 changes: 1 addition & 1 deletion middleware/block_v3_only_roles.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ def globally_authenticated?
end

def space_supporter_and_only_space_supporter?(current_user)
return false if VCAP::CloudController::User.
return false if VCAP::CloudController::User.db.select(1).
where do
Sequel.or(
[
Expand Down