Merge branch 'fix-schema' into 'master'

* fix 148 migration for pgsql not setting default value of

See merge request tt-rss/tt-rss!121

4 files changed, 4 insertions, 2 deletions

diff --git a/classes/Config.php b/classes/Config.php
index 5098bfe68..ca64eb269 100644
--- a/classes/Config.php
+++ b/classes/Config.php
@@ -6,7 +6,7 @@ class Config {
 	const T_STRING = 2;
 	const T_INT = 3;
 
-	const SCHEMA_VERSION = 148;
+	const SCHEMA_VERSION = 149;
 
 	/** override default values, defined below in _DEFAULTS[], prefixing with _ENVVAR_PREFIX:
 	 *
diff --git a/sql/mysql/migrations/148.sql b/sql/mysql/migrations/148.sql
index 8b1378917..ab290eb4c 100644
--- a/sql/mysql/migrations/148.sql
+++ b/sql/mysql/migrations/148.sql
@@ -1 +1 @@
-
+select 1;
diff --git a/sql/mysql/migrations/149.sql b/sql/mysql/migrations/149.sql
new file mode 100644
index 000000000..ab290eb4c
--- /dev/null
+++ b/sql/mysql/migrations/149.sql
@@ -0,0 +1 @@
+select 1;
diff --git a/sql/pgsql/migrations/149.sql b/sql/pgsql/migrations/149.sql
new file mode 100644
index 000000000..60ef770dd
--- /dev/null
+++ b/sql/pgsql/migrations/149.sql
@@ -0,0 +1 @@
+alter table ttrss_feeds alter column auth_pass set default '';