Un-camelcase collating sequence names

As with .Autoincrement, let the standard be to merely capitalize the
raw, uppercased value. This is a breaking change and .NoCase and .RTrim
must be changed to .Nocase and .Rtrim.

Let's also better document RTRIM.

Signed-off-by: Stephen Celis <[email protected]>

Author: stephencelis

Documentation/Index.md

@@ -322,8 +322,11 @@ The `column` function is used for a single column definition. It takes an [expre
   - `collate` adds a `COLLATE` clause to `Expression<String>` (and `Expression<String?>`) column definitions with [a collating sequence](https://www.sqlite.org/datatype3.html#collation) defined in the `Collation` enumeration.
 
     ``` swift
-    t.column(email, collate: .NoCase)
+    t.column(email, collate: .Nocase)
     // "email" TEXT NOT NULL COLLATE "NOCASE"
+
+    t.column(name, collate: .Rtrim)
+    // "name" TEXT COLLATE "RTRIM"
     ```
 
   - `references` adds a `REFERENCES` clause to `Expression<Int64>` (and `Expression<Int64?>`) column definitions and accepts a table (`Query`) or namespaced column expression. (See the `foreignKey` function under [Table Constraints](#table-constraints) for non-integer foreign key support.)
@@ -953,8 +956,11 @@ The `alter` function shares several of the same [`column` function parameters](#
   - `collate` adds a `COLLATE` clause to `Expression<String>` (and `Expression<String?>`) column definitions with [a collating sequence](https://www.sqlite.org/datatype3.html#collation) defined in the `Collation` enumeration.
 
     ``` swift
-    t.column(email, collate: .NoCase)
+    t.column(email, collate: .Nocase)
     // email TEXT NOT NULL COLLATE "NOCASE"
+
+    t.column(name, collate: .Rtrim)
+    // name TEXT COLLATE "RTRIM"
     ```
 
   - `references` adds a `REFERENCES` clause to `Int64` (and `Int64?`) column definitions and accepts a table or namespaced column expression. (See the `foreignKey` function under [Table Constraints](#table-constraints) for non-integer foreign key support.)

SQLite Tests/ExpressionTests.swift

@@ -296,14 +296,13 @@ class ExpressionTests: XCTestCase {
 
     func test_collateOperator_withStringExpression_buildsCollationExpression() {
         ExpectExecutionMatches("('A' COLLATE \"BINARY\")", collate(.Binary, stringA))
-        ExpectExecutionMatches("('B' COLLATE \"NOCASE\")", collate(.NoCase, stringB))
-        ExpectExecutionMatches("('A' COLLATE \"RTRIM\")", collate(.RTrim, stringA))
+        ExpectExecutionMatches("('B' COLLATE \"NOCASE\")", collate(.Nocase, stringB))
+        ExpectExecutionMatches("('A' COLLATE \"RTRIM\")", collate(.Rtrim, stringA))
 
-        let NoDiacritic = "NODIACRITIC"
-        db.create(collation: NoDiacritic) { lhs, rhs in
+        db.create(collation: "NODIACRITIC") { lhs, rhs in
             return lhs.compare(rhs, options: .DiacriticInsensitiveSearch)
         }
-        ExpectExecutionMatches("('A' COLLATE \"NODIACRITIC\")", collate(.Custom(NoDiacritic), stringA))
+        ExpectExecutionMatches("('A' COLLATE \"NODIACRITIC\")", collate(.Custom("NODIACRITIC"), stringA))
 }
 
     func test_cast_buildsCastingExpressions() {

SQLite Tests/SchemaTests.swift

@@ -96,7 +96,7 @@ class SchemaTests: XCTestCase {
     func test_createTable_stringColumn_collation_buildsCollateClause() {
         ExpectExecution(db, "CREATE TABLE \"users\" (\"email\" TEXT NOT NULL COLLATE NOCASE)",
             db.create(table: users) { t in
-                t.column(email, collate: .NoCase)
+                t.column(email, collate: .Nocase)
             }
         )
     }
@@ -309,11 +309,11 @@ class SchemaTests: XCTestCase {
         let columnB = Expression<String?>("column_b")
 
         ExpectExecution(db, "ALTER TABLE \"users\" ADD COLUMN \"column_a\" TEXT NOT NULL DEFAULT '' COLLATE \"NOCASE\"",
-            db.alter(table: users, add: columnA, defaultValue: "", collate: .NoCase)
+            db.alter(table: users, add: columnA, defaultValue: "", collate: .Nocase)
         )
 
         ExpectExecution(db, "ALTER TABLE \"users\" ADD COLUMN \"column_b\" TEXT COLLATE \"NOCASE\"",
-            db.alter(table: users, add: columnB, collate: .NoCase)
+            db.alter(table: users, add: columnB, collate: .Nocase)
         )
     }
 

SQLite/Expression.swift

@@ -286,9 +286,9 @@ public enum Collation {
 
     case Binary
 
-    case NoCase
+    case Nocase
 
-    case RTrim
+    case Rtrim
 
     case Custom(String)
 
@@ -300,9 +300,9 @@ extension Collation: Printable {
         switch self {
         case Binary:
             return "BINARY"
-        case NoCase:
+        case Nocase:
             return "NOCASE"
-        case RTrim:
+        case Rtrim:
             return "RTRIM"
         case Custom(let collation):
             return collation