Update drogon version to v1.0.0-beta10

drogonframework · Nov 4, 2019 · 0133e47 · 0133e47
1 parent fc8abad
commit 0133e47
Show file tree

Hide file tree

Showing 10 changed files with 30 additions and 17 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -15,7 +15,7 @@ set(DROGON_MINOR_VERSION 0)
 set(DROGON_PATCH_VERSION 0)
 set(DROGON_VERSION
     ${DROGON_MAJOR_VERSION}.${DROGON_MINOR_VERSION}.${DROGON_PATCH_VERSION})
-set(PRE_RELEASE_STRING "beta9")
+set(PRE_RELEASE_STRING "beta10")
 
 # Offer the user the choice of overriding the installation directories
 set(INSTALL_LIB_DIR lib CACHE PATH "Installation directory for libraries")

diff --git a/ChangeLog.md b/ChangeLog.md
@@ -4,6 +4,21 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+## [1.0.0-beta10] - 2019-11-04
+
+### API change list
+
+- None
+
+### Changed
+
+- Add the headers configuration option for static files
+
+### Fixed
+
+- Fix(compilation on alpine): Replace u_short alias.
+
+
 ## [1.0.0-beta9] - 2019-10-28
 
 ### API change list
@@ -207,7 +222,9 @@ All notable changes to this project will be documented in this file.
 
 ## [1.0.0-beta1] - 2019-06-11
 
-[Unreleased]: https://github.com/an-tao/drogon/compare/v1.0.0-beta9...HEAD
+[Unreleased]: https://github.com/an-tao/drogon/compare/v1.0.0-beta10...HEAD
+
+[1.0.0-beta10]: https://github.com/an-tao/drogon/compare/v1.0.0-beta9...v1.0.0-beta10
 
 [1.0.0-beta9]: https://github.com/an-tao/drogon/compare/v1.0.0-beta8...v1.0.0-beta9
 

diff --git a/orm_lib/inc/drogon/orm/ResultIterator.h b/orm_lib/inc/drogon/orm/ResultIterator.h
@@ -112,8 +112,8 @@ class ConstReverseResultIterator : private ConstResultIterator
     using iterator_type::difference_type;
     using iterator_type::iterator_category;
     using iterator_type::pointer;
-    using iterator_type::value_type;
     using iterator_type::reference;
+    using iterator_type::value_type;
 
     ConstReverseResultIterator(const ConstReverseResultIterator &rhs)
         : ConstResultIterator(rhs)

diff --git a/orm_lib/src/Result.cc b/orm_lib/src/Result.cc
@@ -141,7 +141,7 @@ bool Result::isNull(Result::SizeType row, Result::RowSizeType column) const
     return _resultPtr->isNull(row, column);
 }
 Result::FieldSizeType Result::getLength(Result::SizeType row,
-                                          Result::RowSizeType column) const
+                                        Result::RowSizeType column) const
 {
     return _resultPtr->getLength(row, column);
 }

diff --git a/orm_lib/src/ResultImpl.h b/orm_lib/src/ResultImpl.h
@@ -33,8 +33,7 @@ class ResultImpl : public trantor::NonCopyable, public Result
     virtual RowSizeType columnNumber(const char colName[]) const = 0;
     virtual const char *getValue(SizeType row, RowSizeType column) const = 0;
     virtual bool isNull(SizeType row, RowSizeType column) const = 0;
-    virtual FieldSizeType getLength(SizeType row,
-                                      RowSizeType column) const = 0;
+    virtual FieldSizeType getLength(SizeType row, RowSizeType column) const = 0;
     virtual const std::string &sql() const
     {
         return _query;

diff --git a/orm_lib/src/mysql_impl/MysqlResultImpl.cc b/orm_lib/src/mysql_impl/MysqlResultImpl.cc
@@ -60,7 +60,7 @@ bool MysqlResultImpl::isNull(SizeType row, RowSizeType column) const
     return getValue(row, column) == NULL;
 }
 Result::FieldSizeType MysqlResultImpl::getLength(SizeType row,
-                                                   RowSizeType column) const
+                                                 RowSizeType column) const
 {
     if (_rowsNum == 0 || _fieldNum == 0)
         return 0;

diff --git a/orm_lib/src/postgresql_impl/PostgreSQLResultImpl.cc b/orm_lib/src/postgresql_impl/PostgreSQLResultImpl.cc
@@ -67,9 +67,8 @@ bool PostgreSQLResultImpl::isNull(SizeType row, RowSizeType column) const
 {
     return PQgetisnull(_result.get(), int(row), int(column)) != 0;
 }
-Result::FieldSizeType PostgreSQLResultImpl::getLength(
-    SizeType row,
-    RowSizeType column) const
+Result::FieldSizeType PostgreSQLResultImpl::getLength(SizeType row,
+                                                      RowSizeType column) const
 {
     return PQgetlength(_result.get(), int(row), int(column));
 }

diff --git a/orm_lib/src/postgresql_impl/PostgreSQLResultImpl.h b/orm_lib/src/postgresql_impl/PostgreSQLResultImpl.h
@@ -41,7 +41,7 @@ class PostgreSQLResultImpl : public ResultImpl
                                  RowSizeType column) const override;
     virtual bool isNull(SizeType row, RowSizeType column) const override;
     virtual FieldSizeType getLength(SizeType row,
-                                      RowSizeType column) const override;
+                                    RowSizeType column) const override;
     virtual int oid(RowSizeType column) const override;
 
   private:

diff --git a/orm_lib/src/sqlite3_impl/Sqlite3ResultImpl.cc b/orm_lib/src/sqlite3_impl/Sqlite3ResultImpl.cc
@@ -35,8 +35,7 @@ Result::SizeType Sqlite3ResultImpl::affectedRows() const noexcept
 {
     return _affectedRows;
 }
-Result::RowSizeType Sqlite3ResultImpl::columnNumber(
-    const char colName[]) const
+Result::RowSizeType Sqlite3ResultImpl::columnNumber(const char colName[]) const
 {
     auto name = std::string(colName);
     std::transform(name.begin(), name.end(), name.begin(), tolower);
@@ -47,8 +46,7 @@ Result::RowSizeType Sqlite3ResultImpl::columnNumber(
     }
     throw std::string("there is no column named ") + colName;
 }
-const char *Sqlite3ResultImpl::getValue(SizeType row,
-                                        RowSizeType column) const
+const char *Sqlite3ResultImpl::getValue(SizeType row, RowSizeType column) const
 {
     auto col = _result[row][column];
     return col ? col->c_str() : nullptr;
@@ -58,7 +56,7 @@ bool Sqlite3ResultImpl::isNull(SizeType row, RowSizeType column) const
     return !_result[row][column];
 }
 Result::FieldSizeType Sqlite3ResultImpl::getLength(SizeType row,
-                                                     RowSizeType column) const
+                                                   RowSizeType column) const
 {
     auto col = _result[row][column];
     return col ? col->length() : 0;

diff --git a/orm_lib/src/sqlite3_impl/Sqlite3ResultImpl.h b/orm_lib/src/sqlite3_impl/Sqlite3ResultImpl.h
@@ -42,7 +42,7 @@ class Sqlite3ResultImpl : public ResultImpl
                                  RowSizeType column) const override;
     virtual bool isNull(SizeType row, RowSizeType column) const override;
     virtual FieldSizeType getLength(SizeType row,
-                                      RowSizeType column) const override;
+                                    RowSizeType column) const override;
     virtual unsigned long long insertId() const noexcept override;
 
   private: