Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 3 additions & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
# from https://evilmartians.com/chronicles/rubocoping-with-legacy-bring-your-ruby-code-up-to-standard
require:
- standard
- rubocop-minitest

plugins:
- standard-custom
- standard-performance
- rubocop-performance
- rubocop-minitest

inherit_gem:
standard: config/base.yml
Expand Down
3 changes: 1 addition & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ end
group :development do
gem "rdoc", "8.0.0"

gem "rubocop", "1.59.0", require: false
gem "rubocop-minitest", "0.34.5", require: false
gem "standard", "1.33.0", require: false
gem "standard", "1.56.0", require: false
end
2 changes: 1 addition & 1 deletion ext/sqlite3/extconf.rb
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ def configure_packaged_libraries
"-DSQLITE_ENABLE_DBSTAT_VTAB=1"
]
env["CFLAGS"] = [user_cflags, env["CFLAGS"], more_cflags].flatten.join(" ")
recipe.configure_options += env.select { |k, v| ENV_ALLOWLIST.include?(k) }
recipe.configure_options += env.slice(*ENV_ALLOWLIST)
.map { |key, value| "#{key}=#{value.strip}" }
end

Expand Down
4 changes: 1 addition & 3 deletions lib/sqlite3/database.rb
Original file line number Diff line number Diff line change
Expand Up @@ -458,9 +458,7 @@ def create_function name, arity, text_rep = Constants::TextRep::UTF8, &block
#
# See also #create_aggregate_handler for a more object-oriented approach to
# aggregate functions.
def create_aggregate(name, arity, step = nil, finalize = nil,
text_rep = Constants::TextRep::ANY, &block)

def create_aggregate(name, arity, step = nil, finalize = nil, text_rep = Constants::TextRep::ANY, &block)
proxy = Class.new do
def self.step(&block)
define_method(:step_with_ctx, &block)
Expand Down
Loading