FreshRSS/rssguard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix sql to support mariadb 10.3

Browse Source
This commit is contained in:
Martin Rotter 2022-02-02 08:04:59 +01:00
parent 2d767afea9
commit 392ff2415f
4 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/desktop/com.github.rssguard.appdata.xml
View File

@ -26,7 +26,7 @@
<url type="donation">https://github.com/sponsors/martinrotter</url> <url type="donation">https://github.com/sponsors/martinrotter</url>
<content_rating type="oars-1.1" /> <content_rating type="oars-1.1" />
<releases> <releases>
<release version="4.1.2" date="2022-02-01"/> <release version="4.1.2" date="2022-02-02"/>
</releases> </releases>
<content_rating type="oars-1.0"> <content_rating type="oars-1.0">
<content_attribute id="violence-cartoon">none</content_attribute> <content_attribute id="violence-cartoon">none</content_attribute>

2
resources/sql/db_init_sqlite.sql
View File

@ -1,5 +1,5 @@
CREATE TABLE Information ( CREATE TABLE Information (
inf_key TEXT NOT NULL UNIQUE CHECK (inf_key != ''), inf_key VARCHAR(128) NOT NULL UNIQUE CHECK (inf_key != ''), /* Use VARCHAR as MariaDB 10.3 does no support UNIQUE TEXT columns. */
inf_value TEXT inf_value TEXT
); );
-- ! -- !

3
src/librssguard/core/messagesmodelsqllayer.cpp
View File

@ -103,6 +103,9 @@ QString MessagesModelSqlLayer::orderByClause() const {
? QSL("%1") ? QSL("%1")
: QSL("LOWER(%1)"); : QSL("LOWER(%1)");
//sorts.append(QSL("LENGTH(%1)").arg(order_sql.arg(field_name)) +
// (m_sortOrders[i] == Qt::SortOrder::AscendingOrder ? QSL(" ASC") : QSL(" DESC")));
sorts.append(order_sql.arg(field_name) + sorts.append(order_sql.arg(field_name) +
(m_sortOrders[i] == Qt::SortOrder::AscendingOrder ? QSL(" ASC") : QSL(" DESC"))); (m_sortOrders[i] == Qt::SortOrder::AscendingOrder ? QSL(" ASC") : QSL(" DESC")));
} }

14
src/librssguard/services/abstract/gui/formaccountdetails.ui
View File

@ -10,8 +10,8 @@
<height>450</height> <height>450</height>
</rect> </rect>
</property> </property>
<layout class="QFormLayout" name="formLayout_2"> <layout class="QVBoxLayout" name="verticalLayout">
<item row="0" column="0" colspan="2"> <item>
<widget class="QScrollArea" name="m_scroll"> <widget class="QScrollArea" name="m_scroll">
<property name="frameShape"> <property name="frameShape">
<enum>QFrame::NoFrame</enum> <enum>QFrame::NoFrame</enum>
@ -25,7 +25,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>532</width> <width>532</width>
<height>403</height> <height>402</height>
</rect> </rect>
</property> </property>
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="horizontalLayout">
@ -43,6 +43,12 @@
</property> </property>
<item> <item>
<widget class="QTabWidget" name="m_tabWidget"> <widget class="QTabWidget" name="m_tabWidget">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>1</verstretch>
</sizepolicy>
</property>
<property name="currentIndex"> <property name="currentIndex">
<number>-1</number> <number>-1</number>
</property> </property>
@ -52,7 +58,7 @@
</widget> </widget>
</widget> </widget>
</item> </item>
<item row="1" column="0" colspan="2"> <item>
<widget class="QDialogButtonBox" name="m_buttonBox"> <widget class="QDialogButtonBox" name="m_buttonBox">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>