Merge pull request #298 from kamipo/fix_typos

Fix some typos

Author: tenderlove

CHANGELOG.rdoc

@@ -134,7 +134,7 @@
     installed anymore
 
 * Bugfixes
-  * Backup API is conditionaly required so that older libsqlite3 can be used.
+  * Backup API is conditionally required so that older libsqlite3 can be used.
     Thanks Hongli Lai.
   * Fixed segmentation fault when nil is passed to SQLite3::Statement.new
   * Fix extconf's hardcoded path that affected installation on certain systems.

ext/sqlite3/aggregator.c

@@ -10,13 +10,13 @@
  *                 in-flight for this aggregator. */
 static VALUE cAggregatorWrapper;
 
-/* wraps a intance of the "handler" class. Loses its reference at the end of
+/* wraps a instance of the "handler" class. Loses its reference at the end of
  * the xFinal callback.
  *
- * An AggregatorInstance holds the following instnace variables:
+ * An AggregatorInstance holds the following instance variables:
  * -handler_instance: the instance to call `step` and `finalize` on.
  * -exc_status:       status returned by rb_protect.
- *                    != 0 if an exception occurred. If an exception occured
+ *                    != 0 if an exception occurred. If an exception occurred
  *                    `step` and `finalize` won't be called any more. */
 static VALUE cAggregatorInstance;
 
@@ -48,7 +48,7 @@ rb_sqlite3_protected_funcall(VALUE self, ID method, int argc, VALUE *params,
 }
 
 /* called in rb_sqlite3_aggregator_step and rb_sqlite3_aggregator_final. It
- * checks if the exection context already has an associated instance. If it
+ * checks if the execution context already has an associated instance. If it
  * has one, it returns it. If there is no instance yet, it creates one and
  * associates it with the context. */
 static VALUE
@@ -165,8 +165,8 @@ rb_sqlite3_aggregator_final(sqlite3_context * ctx)
   if (exc_status) {
     /* the user should never see this, as Statement.step() will pick up the
      * outstanding exception and raise it instead of generating a new one
-     * for SQLITE_ERROR with message "Ruby Exception occured" */
-    sqlite3_result_error(ctx, "Ruby Exception occured", -1);
+     * for SQLITE_ERROR with message "Ruby Exception occurred" */
+    sqlite3_result_error(ctx, "Ruby Exception occurred", -1);
   }
 
   rb_sqlite3_aggregate_instance_destroy(ctx);

ext/sqlite3/database.c

@@ -710,7 +710,7 @@ static int regular_callback_function(VALUE callback_ary, int count, char **data,
 
 /* Is invoked by calling db.execute_batch2(sql, &block)
  *
- * Executes all statments in a given string separated by semicolons.
+ * Executes all statements in a given string separated by semicolons.
  * If a query is made, all values returned are strings
  * (except for 'NULL' values which return nil),
  * so the user may parse values with a block.

ext/sqlite3/statement.c

@@ -290,7 +290,7 @@ static VALUE bind_param(VALUE self, VALUE key, VALUE value)
 /* call-seq: stmt.reset!
  *
  * Resets the statement. This is typically done internally, though it might
- * occassionally be necessary to manually reset the statement.
+ * occasionally be necessary to manually reset the statement.
  */
 static VALUE reset_bang(VALUE self)
 {
@@ -309,7 +309,7 @@ static VALUE reset_bang(VALUE self)
 /* call-seq: stmt.clear_bindings!
  *
  * Resets the statement. This is typically done internally, though it might
- * occassionally be necessary to manually reset the statement.
+ * occasionally be necessary to manually reset the statement.
  */
 static VALUE clear_bindings_bang(VALUE self)
 {

faq/faq.md

@@ -127,7 +127,7 @@ Placeholders in an SQL statement take any of the following formats:
 Where _n_ is an integer, and _word_ is an alpha-numeric identifier (or
 number). When the placeholder is associated with a number, that number
 identifies the index of the bind variable to replace it with. When it
-is an identifier, it identifies the name of the correponding bind
+is an identifier, it identifies the name of the corresponding bind
 variable. (In the instance of the first format--a single question
 mark--the placeholder is assigned a number one greater than the last
 index used, or 1 if it is the first.)

faq/faq.yml

@@ -128,7 +128,7 @@
     Where _n_ is an integer, and _word_ is an alpha-numeric identifier (or
     number). When the placeholder is associated with a number, that number
     identifies the index of the bind variable to replace it with. When it
-    is an identifier, it identifies the name of the correponding bind
+    is an identifier, it identifies the name of the corresponding bind
     variable. (In the instance of the first format--a single question
     mark--the placeholder is assigned a number one greater than the last
     index used, or 1 if it is the first.)

lib/sqlite3/constants.rb

@@ -37,7 +37,7 @@ module ErrorCode
     EMPTY      = 16   # (Internal Only) Database table is empty
     SCHEMA     = 17   # The database schema changed
     TOOBIG     = 18   # Too much data for one row of a table
-    CONSTRAINT = 19   # Abort due to contraint violation
+    CONSTRAINT = 19   # Abort due to constraint violation
     MISMATCH   = 20   # Data type mismatch
     MISUSE     = 21   # Library used incorrectly
     NOLFS      = 22   # Uses OS features not supported on host

lib/sqlite3/database.rb

@@ -238,7 +238,7 @@ def execute2( sql, *bind_vars )
     # rows.
     #
     # See also #execute_batch2 for additional ways of
-    # executing statments.
+    # executing statements.
     def execute_batch( sql, bind_vars = [], *args )
       # FIXME: remove this stuff later
       unless [Array, Hash].include?(bind_vars.class)
@@ -295,7 +295,7 @@ def execute_batch( sql, bind_vars = [], *args )
     # a block can be passed to parse the values accordingly.
     #
     # See also #execute_batch for additional ways of
-    # executing statments.
+    # executing statements.
     def execute_batch2(sql, &block)
       if block_given?
         result = exec_batch(sql, @results_as_hash)
@@ -308,7 +308,7 @@ def execute_batch2(sql, &block)
     end
 
     # This is a convenience method for creating a statement, binding
-    # paramters to it, and calling execute:
+    # parameters to it, and calling execute:
     #
     #   result = db.query( "select * from foo where a=?", [5])
     #   # is the same as
@@ -537,10 +537,10 @@ def finalize
     #   db.create_aggregate_handler( LengthsAggregateHandler )
     #   puts db.get_first_value( "select lengths(name) from A" )
     def create_aggregate_handler( handler )
-      # This is a compatiblity shim so the (basically pointless) FunctionProxy
+      # This is a compatibility shim so the (basically pointless) FunctionProxy
       # "ctx" object is passed as first argument to both step() and finalize().
       # Now its up to the library user whether he prefers to store his
-      # temporaries as instance varibales or fields in the FunctionProxy.
+      # temporaries as instance variables or fields in the FunctionProxy.
       # The library user still must set the result value with
       # FunctionProxy.result= as there is no backwards compatible way to
       # change this.
@@ -575,7 +575,7 @@ def finalize
     # The functions arity is the arity of the +step+ method.
     def define_aggregator( name, aggregator )
       # Previously, this has been implemented in C. Now this is just yet
-      # another compatiblity shim
+      # another compatibility shim
       proxy = Class.new do
         @template = aggregator
         @name = name

lib/sqlite3/pragmas.rb

@@ -42,11 +42,11 @@ def set_boolean_pragma( name, mode )
     # Requests the given pragma (and parameters), and if the block is given,
     # each row of the result set will be yielded to it. Otherwise, the results
     # are returned as an array.
-    def get_query_pragma( name, *parms, &block ) # :yields: row
-      if parms.empty?
+    def get_query_pragma( name, *params, &block ) # :yields: row
+      if params.empty?
         execute( "PRAGMA #{name}", &block )
       else
-        args = "'" + parms.join("','") + "'"
+        args = "'" + params.join("','") + "'"
         execute( "PRAGMA #{name}( #{args} )", &block )
       end
     end

lib/sqlite3/translator.rb

@@ -43,7 +43,7 @@ def add_translator( type, &block ) # :yields: type, value
     end
 
     # Translate the given string value to a value of the given type. In the
-    # absense of an installed translator block for the given type, the value
+    # absence of an installed translator block for the given type, the value
     # itself is always returned. Further, +nil+ values are never translated,
     # and are always passed straight through regardless of the type parameter.
     def translate( type, value )