Bring Tutorials in line with latest API

tomjaguarpaw · Apr 21, 2018 · 5b5fc34 · 5b5fc34
1 parent a32c2f3
commit 5b5fc34
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/Doc/Tutorial/TutorialBasic.lhs b/Doc/Tutorial/TutorialBasic.lhs
@@ -42,7 +42,7 @@ Opaleye assumes that a Postgres database already exists.  Currently
 there is no support for creating databases or tables, though these
 features may be added later according to demand.
 
-A table is defined with the `Table` constructor.  The syntax is
+A table is defined with the `table` function.  The syntax is
 simple.  You specify the types of the columns, the name of the table
 and the names of the columns in the underlying database, and whether
 the columns are required or optional.

diff --git a/Doc/Tutorial/TutorialBasicMonomorphic.lhs b/Doc/Tutorial/TutorialBasicMonomorphic.lhs
@@ -44,7 +44,7 @@ Opaleye assumes that a Postgres database already exists.  Currently
 there is no support for creating databases or tables, though these
 features may be added later according to demand.
 
-A table is defined with the `Table` constructor.  The syntax is
+A table is defined with the `table` function.  The syntax is
 simple.  You specify the types of the columns, the name of the table
 and the names of the columns in the underlying database, and whether
 the columns are required or optional.
@@ -270,8 +270,8 @@ Note: In `widgetTable` and `aggregateWidgets` we see more explicit
 uses of our Template Haskell derived code.  We use the 'pWidget'
 "adaptor" to specify how columns are aggregated.  Note that this is
 yet another example of avoiding a headache by keeping your datatype
-fully polymorphic, because the 'count' aggregator changes a 'Wire
-String' into a 'Wire Int64'.
+fully polymorphic, because the 'count' aggregator changes a 'Column
+String' into a 'Column Int64'.
 
 Outer join
 ==========

diff --git a/Doc/Tutorial/TutorialBasicTypeFamilies.lhs b/Doc/Tutorial/TutorialBasicTypeFamilies.lhs
@@ -18,6 +18,8 @@
 >                          showSqlForPostgres, Unpackspec,
 >                          PGInt4, PGInt8, PGText, PGDate, PGFloat8)
 >
+> import           Control.Applicative     ((<$>), (<*>), Applicative)
+>
 > import qualified Data.Profunctor         as P
 > import qualified Data.Profunctor.Product as PP
 > import           Data.Profunctor.Product (p3)
@@ -43,7 +45,7 @@ Opaleye assumes that a Postgres database already exists.  Currently
 there is no support for creating databases or tables, though these
 features may be added later according to demand.
 
-A table is defined with the `Table` constructor.  The syntax is
+A table is defined with the `table` function.  The syntax is
 simple.  You specify the types of the columns, the name of the table
 and the names of the columns in the underlying database, and whether
 the columns are required or optional.
@@ -68,7 +70,7 @@ manipulation tutorial you can see an example of when they might differ.
 
 By default, the table `"personTable"` is looked up in PostgreSQL's
 default `"public"` schema. If we wanted to specify a different schema we
-could have used the `tableWithSchema` constructor instead of `table`.
+could have used the `tableWithSchema` function instead of `table`.
 
 To query a table we use `queryTable`.
 
@@ -286,8 +288,8 @@ Note: In `widgetTable` and `aggregateWidgets` we see more explicit
 uses of our Template Haskell derived code.  We use the 'pWidget'
 "adaptor" to specify how columns are aggregated.  Note that this is
 yet another example of avoiding a headache by keeping your datatype
-fully polymorphic, because the 'count' aggregator changes a 'Wire
-String' into a 'Wire Int64'.
+fully polymorphic, because the 'count' aggregator changes a 'Column
+String' into a 'Column Int64'.
 
 Outer join
 ==========