fixing merge conflicts:

wking · Mar 26, 2015 · 0ef5114 · 0ef5114
2 parents 46abec2 + 554089b
commit 0ef5114
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/03-filter.md b/03-filter.md
@@ -56,7 +56,7 @@ For example,
 we can ask for all information from the DR-1 site collected before 1930:
 
 ~~~ {.sql}
-SELECT * FROM Visited WHERE (site="DR-1") AND (dated<"1930-00-00");
+SELECT * FROM Visited WHERE (site="DR-1") AND (dated<="1930-01-01");
 ~~~
 
 |ident|site|dated     |

diff --git a/05-null.md b/05-null.md
@@ -42,7 +42,7 @@ Null doesn't behave like other values.
 If we select the records that come before 1930:
 
 ~~~ {.sql}
-SELECT * FROM Visited WHERE dated<'1930-00-00';
+SELECT * FROM Visited WHERE dated<"1930-01-01";
 ~~~
 
 |ident|site|dated     |
@@ -54,7 +54,7 @@ we get two results,
 and if we select the ones that come during or after 1930:
 
 ~~~ {.sql}
-SELECT * FROM Visited WHERE dated>='1930-00-00';
+SELECT * FROM Visited WHERE dated>="1930-01-01";
 ~~~
 
 |ident|site|dated     |
@@ -68,15 +68,15 @@ SELECT * FROM Visited WHERE dated>='1930-00-00';
 we get five,
 but record #752 isn't in either set of results.
 The reason is that
-`null<'1930-00-00'`
+`null<'1930-01-01'`
 is neither true nor false:
 null means, "We don't know,"
 and if we don't know the value on the left side of a comparison,
 we don't know whether the comparison is true or false.
 Since databases represent "don't know" as null,
-the value of `null<'1930-00-00'`
+the value of `null<'1930-01-01'`
 is actually `null`.
-`null>='1930-00-00'` is also null
+`null>='1930-01-01'` is also null
 because we can't answer to that question either.
 And since the only records kept by a `WHERE`
 are those for which the test is true,

diff --git a/07-join.md b/07-join.md
@@ -230,7 +230,7 @@ SELECT rowid, * FROM Person;
 >
 > ~~~ {.sql}
 > SELECT Site.name FROM Site JOIN Visited
-> ON Site.lat<-49.0 AND Site.name=Visited.site AND Visited.dated>='1932-00-00';
+> ON Site.lat<-49.0 AND Site.name=Visited.site AND Visited.dated>='1932-01-01';
 > ~~~
 
 > ## Who has been where? {.challenge}