diff --git a/.github/workflows/rspec.yml b/.github/workflows/rspec.yml index fbae998..4ffb1a6 100644 --- a/.github/workflows/rspec.yml +++ b/.github/workflows/rspec.yml @@ -23,7 +23,7 @@ jobs: matrix: ruby: ["3.0"] gemfile: ["gemfiles/rails7.gemfile"] - db: ["mysql"] + db: ["postgres"] include: - ruby: "2.7" gemfile: "gemfiles/rails6.gemfile" @@ -31,24 +31,24 @@ jobs: - ruby: "3.1" gemfile: "gemfiles/railsmaster.gemfile" db: "postgres" - - ruby: "3.0" - gemfile: "gemfiles/rails7.gemfile" - db: "postgres" - ruby: "2.7" gemfile: "gemfiles/rails6.gemfile" db: "mysql" + - ruby: "3.0" + gemfile: "gemfiles/rails7.gemfile" + db: "mysql" - ruby: "3.1" gemfile: "gemfiles/railsmaster.gemfile" db: "mysql" - ruby: "2.7" gemfile: "gemfiles/rails6.gemfile" db: "sqlite" - - ruby: "3.1" - gemfile: "gemfiles/railsmaster.gemfile" - db: "sqlite" - ruby: "3.0" gemfile: "gemfiles/rails7.gemfile" db: "sqlite" + - ruby: "3.1" + gemfile: "gemfiles/railsmaster.gemfile" + db: "sqlite" services: postgres: image: postgres:14 diff --git a/lib/activerecord_slotted_counters/adapters/sqlite_upsert.rb b/lib/activerecord_slotted_counters/adapters/sqlite_upsert.rb index cadd025..1e7f738 100644 --- a/lib/activerecord_slotted_counters/adapters/sqlite_upsert.rb +++ b/lib/activerecord_slotted_counters/adapters/sqlite_upsert.rb @@ -49,7 +49,11 @@ def bulk_insert(attributes, on_duplicate: nil, unique_by: nil) sql += " RETURNING \"id\"" - klass.connection.exec_query(sql) + klass.connection.exec_query(sql).rows.count + end + + def wrap_column_name(value) + "EXCLUDED.#{value}" end private