Merge branch 'master' of github.com:diesel-rs/diesel

Author: mcronce

.github/ISSUE_TEMPLATE.md .github/ISSUE_TEMPLATE/bug_report.md.github/ISSUE_TEMPLATE.md renamed to .github/ISSUE_TEMPLATE/bug_report.md

@@ -1,5 +1,14 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: bug
+assignees: ''
+
+---
+
 <!--
-If you want to report a bug, we added some points below you can fill out. If you want to request a feature, feel free to remove all the irrelevant text. In addition to this [issue tracker](https://github.com/diesel-rs/diesel/issues), you can also talk to Diesel maintainers and users on [Gitter](https://gitter.im/diesel-rs/diesel).
+If you want to report a bug, we added some points below which help us track down the problem faster.
 -->
 
 ## Setup
@@ -33,16 +42,22 @@ If you want to report a bug, we added some points below you can fill out. If you
 ### Steps to reproduce
 
 <!--
-Please include as much of your codebase as needed to reproduce the error.  If the relevant files are large, please consider linking to a public repository or a [Gist](https://gist.github.com/).
+Please include as much of your codebase as needed to reproduce the error.  If the relevant files are large, please consider linking to a public repository or a [Gist](https://gist.github.com/). This includes normally the following parts:
 
-Please post as much of your database schema as necessary. If you are using `infer_schema!`, you can use `diesel print-schema` and post the relevant parts from that.
+* The exact code where your hit the problem
+* Relevant parts your schema, so any `table!` macro calls required for the
+* Any other type definitions involved in the code, which produces your problem
 -->
 
 ## Checklist
 
-- [ ] I have already looked over the [issue tracker](https://github.com/diesel-rs/diesel/issues) for similar issues.
+- [ ] I have already looked over the [issue tracker](https://github.com/diesel-rs/diesel/issues)  and the [disussion forum](https://github.com/diesel-rs/diesel/discussions)  for similar possible closed issues.
+<!--
+If you are unsure if your issue is a duplicate of an existing issue please link the issue in question here
+--> 
 - [ ] This issue can be reproduced on Rust's stable channel. (Your issue will be
   closed if this is not the case)
+- [ ] This issue can be reproduced without requiring a third party crate
 
 <!--
 Thank you for your submission!  You're helping make Diesel more robust 🎉

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,14 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Compiler error while compiling diesel
+    url: https://github.com/diesel-rs/diesel/issues?q=is%3Aissue+ld+returned+1+exit+status+
+    about: Failed to compile diesel? Have a look at existing issues. You've likely miss some required dependency.
+  - name: Simple Questions
+    url: https://gitter.im/diesel-rs/diesel
+    about: If you have a simple question please use our gitter channel.
+  - name: Complex Questions
+    url: https://github.com/diesel-rs/diesel/discussions/categories/q-a
+    about: Do you have a larger question? Ask in our forum.
+  - name: Feature Requests
+    url: https://github.com/diesel-rs/diesel/discussions/categories/ideas
+    about: If you want to suggest a new feature please create a new topic in our discussions forum

.github/workflows/benches.yml

@@ -14,7 +14,6 @@ jobs:
         backend: ["postgres", "sqlite", "mysql"]
     steps:
       - name: Checkout sources
-        if: steps.bench.outputs.triggered == 'true'
         uses: actions/checkout@v2
 
       - name: Install postgres (Linux)
@@ -26,28 +25,76 @@ jobs:
           sudo service postgresql restart && sleep 3
           sudo -u postgres psql -c "ALTER USER postgres PASSWORD 'postgres';"
           sudo service postgresql restart && sleep 3
-          echo '::set-env name=PG_DATABASE_URL::postgres://postgres:postgres@localhost/'
+          echo 'DATABASE_URL=postgres://postgres:postgres@localhost/' >> $GITHUB_ENV
 
       - name: Install sqlite (Linux)
         if: matrix.backend == 'sqlite'
         run: |
           sudo apt-get update
           sudo apt-get install -y libsqlite3-dev
-          echo '::set-env name=SQLITE_DATABASE_URL::/tmp/test.db'
+          echo 'DATABASE_URL=/tmp/test.db' >> $GITHUB_ENV
 
-        
       - name: Install mysql (Linux)
         if: matrix.backend == 'mysql'
         run: |
           sudo apt-get update
           sudo apt-get -y install mysql-server libmysqlclient-dev
           sudo /etc/init.d/mysql start
           mysql -e "create database diesel_test; create database diesel_unit_test; grant all on \`diesel_%\`.* to 'root'@'localhost';" -uroot -proot
-          echo '::set-env name=MYSQL_DATABASE_URL::mysql://root:root@localhost/diesel_test'
+          echo 'DATABASE_URL=mysql://root:root@localhost/diesel_test' >> $GITHUB_ENV
 
-      - name: Run benches
-        uses: jasonwilliams/criterion-compare-action@move_to_actions
+      - name: Install rust toolchain
+        uses: actions-rs/toolchain@v1
         with:
-          cwd: "diesel_bench"
-          token: ${{ secrets.GITHUB_TOKEN }}
-          
+          profile: minimal
+          toolchain: stable
+          override: true
+
+      - name: Install critcmp
+        uses: actions-rs/cargo@v1
+        with:
+          command: install
+          args: critcmp
+
+      - name: Benchmark changes
+        uses: actions-rs/cargo@v1
+        with:
+          command: bench
+          args: --manifest-path diesel_bench/Cargo.toml --no-default-features --features "${{matrix.backend}}" -- --save-baseline changes
+
+      - name: Checkout master
+        run: |
+          git fetch origin
+          git reset --hard origin/master
+
+      - name: Benchmark master
+        uses: actions-rs/cargo@v1
+        with:
+          command: bench
+          args: --manifest-path diesel_bench/Cargo.toml --no-default-features --features "${{matrix.backend}}" -- --save-baseline master
+
+      - name: Critcmp
+        run: |
+          cd diesel_bench
+          critcmp master changes
+          echo "# ${{matrix.backend}}" > output.txt
+          echo "" >> output.txt
+          echo '```' >> output.txt
+          critcmp master changes >> output.txt
+          echo '```' >> output.txt
+
+      # This does not work due to github not allowing to post comments from forked repos
+      # - name: Post the output as comment
+      #   uses: actions/github-script@v3
+      #   with:
+      #     github-token: ${{secrets.GITHUB_TOKEN}}
+      #     script: |
+      #       const fs = require('fs');
+      #       const data = fs.readFileSync('diesel_bench/output.txt', 'utf8');
+
+      #       github.issues.createComment({
+      #         issue_number: context.issue.number,
+      #         owner: context.repo.owner,
+      #         repo: context.repo.repo,
+      #         body: data
+      #       })

.github/workflows/ci.yml

@@ -4,9 +4,8 @@ on:
   push:
     branches:
       - master
-      - '0.[0-9]+.x'
-      - '1.[0-9]+.x'
-
+      - "0.[0-9]+.x"
+      - "1.[0-9]+.x"
 
 name: CI Tests
 
@@ -115,34 +114,24 @@ jobs:
       - name: Install sqlite (MacOS)
         if: runner.os == 'macOS' && matrix.backend == 'sqlite'
         run: |
-          brew uninstall openssl@1.0.2t
-          brew uninstall python@2.7.17
-          brew untap local/openssl
-          brew untap local/python2
-          brew cask install xquartz
           brew update
           brew install sqlite
           echo "SQLITE_DATABASE_URL=/tmp/test.db" >> $GITHUB_ENV
 
       - name: Install mysql (MacOS)
         if: runner.os == 'macOS' && matrix.backend == 'mysql'
         run: |
-          brew uninstall openssl@1.0.2t
-          brew uninstall python@2.7.17
-          brew untap local/openssl
-          brew untap local/python2
-          brew cask install xquartz
           brew update
-          brew install mysql
-          brew services start mysql
-          brew services stop mysql;sleep 3;brew services start mysql
+          brew install mariadb
+          mysql_install_db
+          mysql.server start
           sleep 3
-          macos_mysql_version="$(ls /usr/local/Cellar/mysql)"
-          /usr/local/Cellar/mysql/${macos_mysql_version}/bin/mysql -e "create database diesel_test; create database diesel_unit_test; grant all on \`diesel_%\`.* to 'root'@'localhost';" -uroot
-          echo "MYSQL_DATABASE_URL=mysql://root@localhost/diesel_test" >> $GITHUB_ENV
-          echo "MYSQL_EXAMPLE_DATABASE_URL=mysql://root@localhost/diesel_example" >> $GITHUB_ENV
-          echo "MYSQL_UNIT_TEST_DATABASE_URL=mysql://root@localhost/diesel_unit_test" >> $GITHUB_ENV
-          echo "MYSQLCLIENT_LIB_DIR=/usr/local/Cellar/mysql/${macos_mysql_version}/lib" >> $GITHUB_ENV
+          mysql -e "create database diesel_test; create database diesel_unit_test; grant all on \`diesel_%\`.* to 'runner'@'localhost';" -urunner
+          macos_mysql_version="$(ls /usr/local/Cellar/mariadb)"
+          echo "MYSQL_DATABASE_URL=mysql://runner@localhost/diesel_test" >> $GITHUB_ENV
+          echo "MYSQL_EXAMPLE_DATABASE_URL=mysql://runner@localhost/diesel_example" >> $GITHUB_ENV
+          echo "MYSQL_UNIT_TEST_DATABASE_URL=mysql://runner@localhost/diesel_unit_test" >> $GITHUB_ENV
+          echo "MYSQLCLIENT_LIB_DIR=/usr/local/Cellar/mariadb/${macos_mysql_version}/lib" >> $GITHUB_ENV
 
       - name: Install sqlite (Windows)
         if: runner.os == 'Windows' && matrix.backend == 'sqlite'
@@ -176,8 +165,8 @@ jobs:
         if: runner.os == 'Windows' && matrix.backend == 'mysql'
         shell: cmd
         run: |
-            choco install mysql
-            "C:\tools\mysql\current\bin\mysql" -e "create database diesel_test; create database diesel_unit_test; grant all on `diesel_%`.* to 'root'@'localhost';" -uroot
+          choco install mysql
+          "C:\tools\mysql\current\bin\mysql" -e "create database diesel_test; create database diesel_unit_test; grant all on `diesel_%`.* to 'root'@'localhost';" -uroot
 
       - name: Set variables for mysql (Windows)
         if: runner.os == 'Windows' && matrix.backend == 'mysql'
@@ -307,9 +296,9 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions-rs/toolchain@v1
         with:
-            toolchain: nightly-2020-05-01
-            profile: minimal
-            override: true
+          toolchain: nightly-2020-05-01
+          profile: minimal
+          override: true
       - name: Cache cargo registry
         uses: actions/cache@v2
         with:
@@ -336,10 +325,10 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions-rs/toolchain@v1
         with:
-            toolchain: 1.40.0
-            profile: minimal
-            components: clippy, rustfmt
-            override: true
+          toolchain: 1.40.0
+          profile: minimal
+          components: clippy, rustfmt
+          override: true
       - name: Cache cargo registry
         uses: actions/cache@v2
         with:
@@ -357,6 +346,7 @@ jobs:
         uses: actions-rs/cargo@v1
         with:
           command: clippy
+          args: --all
 
       - name: Check formating
         uses: actions-rs/cargo@v1
@@ -371,9 +361,9 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions-rs/toolchain@v1
         with:
-            toolchain: stable
-            profile: minimal
-            override: true
+          toolchain: stable
+          profile: minimal
+          override: true
       - name: Cache cargo registry
         uses: actions/cache@v2
         with:
@@ -393,15 +383,15 @@ jobs:
           args: --manifest-path diesel_cli/Cargo.toml --no-default-features --features "sqlite-bundled"
 
   minimal_rust_version:
-    name: Check Minimal supported rust version (1.40.0)
+    name: Check Minimal supported rust version (1.48.0)
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
       - uses: actions-rs/toolchain@v1
         with:
-            toolchain: 1.40.0
-            profile: minimal
-            override: true
+          toolchain: 1.48.0
+          profile: minimal
+          override: true
       - name: Cache cargo registry
         uses: actions/cache@v2
         with:
@@ -417,7 +407,7 @@ jobs:
         run: |
           RUSTC_BOOTSTRAP=1 cargo update -Z minimal-versions
 
-      - name: Check building with rust 1.40.0
+      - name: Check building with rust 1.48.0
         uses: actions-rs/cargo@v1
         with:
           command: check

.github/workflows/doc.yml

@@ -39,7 +39,7 @@ jobs:
       uses: actions-rs/cargo@v1
       with:
         command: doc
-        args: --manifest-path diesel/Cargo.toml --features "postgres sqlite mysql extras" --workspace
+        args: --manifest-path diesel/Cargo.toml --features "postgres sqlite mysql extras" --workspace --exclude=diesel_compile_tests
 
     - name: Publish documentation
       if: success()

.gitignore

@@ -1,4 +1,4 @@
 target
 Cargo.lock
 !diesel_cli/Cargo.lock
-.env
+.env