Merge pull request diesel-rs#1946 from weiznich/reenable_building_docs

Reenable publishing docs from master

Author: weiznich

.travis.yml

@@ -1,14 +1,19 @@
 language: rust
-sudo: required
-dist: trusty
+dist: xenial
 rust:
   - stable
   - beta
   - nightly
 cache: cargo
 addons:
   postgresql: '9.5'
+  apt:
+    packages:
+      - libsqlite3-dev
+services:
+  - mysql
 before_script:
+  - pip install 'travis-cargo<0.2' --user
   - export PATH=$HOME/.local/bin:$PATH
   - mysql -e "create database diesel_test; create database diesel_unit_test; grant all on \`diesel_%\`.* to 'travis'@'%';" -uroot
 script:
@@ -74,15 +79,15 @@ env:
   global:
     - TRAVIS_CARGO_NIGHTLY_FEATURE=""
     - secure: NmCM1VNEzid6bROA7tXV1R63n9S9KvY1etXsDzd1608cvjRnG3ZDAWXISbY1BxqrvleElreUJOvz/3TSQCHivpT2ezeyk2sntYtZpw0TWbz1SQMAPNWPTjP3bNQzpmNwfU4p6ui6qIOnQza4JxOu3SZSveNlehDBPkkS+52R7Zw/EPdwi9jTYJArV2+8pnEsQECAdRLttbtA2JBl3hZ4VHfGpHRZyeULn63UzyVbQVzQ3NVhqyQUKTPdpUciQTI3fZEkfaWuLV8QPPa5026/yJEEi2Fsl3r7fyY8ia67k4Zo9THlPVD0YOUlkWuZWwvkxNA8RQSVPv4FidEpwbxG8y6nAra4CjwiEChcpFhZJtrH7ZrXO/tJk7vtc5CFVWUsQtNX92QY1QFdPxwYNBSICLyUN+A+BQURwvQgxdcJsJyQmh5Ed7yuavcAinVq7fPeOyBWcPL5mt17no16aG1rzvXSUnD0aH7F3S3DHkoM9P9iHgJMLk+2YNmJtFescBxCeG8bA7t5bw0kQNH5KUWAD1uYpC9ikB3NVdlc+q17dKTAe4rcYA+sIO+UGudvpmLWT0lXtEMqDfxfCmyICDESs9bNfueCGJEAnfTBNunsJqR7rMUvjNndS2/Ssok6c/0Yfb9X8cM9nI4QLAj/+hClqdYphmpCjuC34bWxFSt/KJI=
-# after_success:
-# - |
-#   if [[ "$TRAVIS_RUST_VERSION" == stable ]]; then
-#     (cd diesel && travis-cargo doc -- --features "postgres sqlite mysql extras")
-#     mkdir diesel/target
-#     mv target/doc diesel/target/doc
-#     echo "docs.diesel.rs" > diesel/target/doc/CNAME
-#     (cd diesel && travis-cargo doc-upload)
-#   fi
+after_success:
+- |
+  if [[ "$TRAVIS_RUST_VERSION" == stable ]]; then
+    (cd diesel && cargo +$TRAVIS_RUST_VERSION doc -- --features "postgres sqlite mysql extras")
+    mkdir diesel/target
+    mv target/doc diesel/target/doc
+    echo "docs.diesel.rs" > diesel/target/doc/CNAME
+    (cd diesel && travis-cargo doc-upload)
+  fi
 branches:
   only:
     - master

azure-pipelines.yml

@@ -246,4 +246,4 @@ jobs:
       displayName: Install build dependencies
     - bash: |
         cargo check --all
-      displayName: Check building with rust 1.27.0
+      displayName: Check building with rust 1.31.0

diesel_tests/tests/joins.rs

@@ -148,7 +148,9 @@ fn left_outer_joins() {
         (sean, Some(seans_second_post)),
         (tess, None),
     ];
-    let source = users::table.left_outer_join(posts::table);
+    let source = users::table
+        .left_outer_join(posts::table)
+        .order_by((users::id.asc(), posts::id.asc()));
     let actual_data: Vec<_> = source.load(&connection).unwrap();
 
     assert_eq!(expected_data, actual_data);
@@ -174,7 +176,8 @@ fn columns_on_right_side_of_left_outer_joins_are_nullable() {
     ];
     let source = users::table
         .left_outer_join(posts::table)
-        .select((users::name, posts::title.nullable()));
+        .select((users::name, posts::title.nullable()))
+        .order_by((users::id.asc(), posts::title.asc()));
     let actual_data: Vec<_> = source.load(&connection).unwrap();
 
     assert_eq!(expected_data, actual_data);
@@ -224,7 +227,8 @@ fn select_multiple_from_right_side_returns_optional_tuple_when_nullable_is_calle
 
     let source = users::table
         .left_outer_join(posts::table)
-        .select((posts::title, posts::body).nullable());
+        .select((posts::title, posts::body).nullable())
+        .order_by((users::id.asc(), posts::id.asc()));
     let actual_data: Vec<_> = source.load(&connection).unwrap();
 
     assert_eq!(expected_data, actual_data);
@@ -256,7 +260,8 @@ fn select_complex_from_left_join() {
 
     let source = users::table
         .left_outer_join(posts::table)
-        .select((users::all_columns, (posts::title, posts::body).nullable()));
+        .select((users::all_columns, (posts::title, posts::body).nullable()))
+        .order_by((users::id.asc(), posts::id.asc()));
     let actual_data: Vec<_> = source.load(&connection).unwrap();
 
     assert_eq!(expected_data, actual_data);
@@ -288,7 +293,8 @@ fn select_right_side_with_nullable_column_first() {
 
     let source = users::table
         .left_outer_join(posts::table)
-        .select((users::all_columns, (posts::body, posts::title).nullable()));
+        .select((users::all_columns, (posts::body, posts::title).nullable()))
+        .order_by((users::id.asc(), posts::id.asc()));
     let actual_data: Vec<_> = source.load(&connection).unwrap();
 
     assert_eq!(expected_data, actual_data);