Database#query should accept nil for backwards compat. Fixes RF #28192

lib/sqlite3/database.rb

@@ -198,7 +198,21 @@ def execute_batch( sql, *bind_vars )
     # returned, or you could have problems with locks on the table. If called
     # with a block, +close+ will be invoked implicitly when the block 
     # terminates.
-    def query( sql, *bind_vars )
+    def query( sql, bind_vars = [], *args )
+
+      if bind_vars.nil? || !args.empty?
+        if args.empty?
+          bind_vars = []
+        else
+          bind_vars = [nil] + args
+        end
+
+        warn(<<-eowarn) if $VERBOSE
+#{caller[0]} is calling SQLite3::Database#query with nil or multiple bind params
+without using an array.  Please switch to passing bind parameters as an array.
+        eowarn
+      end
+
       result = prepare( sql ).execute( *bind_vars )
       if block_given?
         begin

test/test_database.rb

@@ -263,5 +263,9 @@ def test_close_with_open_statements
         @db.close
       end
     end
+
+    def test_execute_with_empty_bind_params
+      assert_equal [['foo']], @db.execute("select 'foo'", [])
+    end
   end
 end