diff options
| author | zotlabs <mike@macgirvin.com> | 2017-05-07 14:43:38 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-05-07 14:43:38 -0700 |
| commit | 8c38841a4dbc1a8daca2cfce12a295f467ecbb68 (patch) | |
| tree | 6d8404008829fa4287090b5f229f0150514b6005 | |
| parent | 2c2ee706ac84926ceca21f5a4522034eb1b67d54 (diff) | |
| parent | bd3708870d04bd59d3a632945d1f4ff63640afe8 (diff) | |
| download | volse-hubzilla-8c38841a4dbc1a8daca2cfce12a295f467ecbb68.tar.gz volse-hubzilla-8c38841a4dbc1a8daca2cfce12a295f467ecbb68.tar.bz2 volse-hubzilla-8c38841a4dbc1a8daca2cfce12a295f467ecbb68.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | include/message.php | 2 | ||||
| -rw-r--r-- | install/schema_postgres.sql | 2 | ||||
| -rwxr-xr-x | tests/travis/prepare_mysql.sh | 11 | ||||
| -rwxr-xr-x | tests/travis/prepare_pgsql.sh | 13 |
5 files changed, 23 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml index e1aec9145..53a0f73f7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -103,7 +103,7 @@ before_install: # Install composer dev libs install: - - travis_retry composer install --optimize-autoloader + - travis_retry composer install --optimize-autoloader --no-progress # execute any number of scripts before the test run, custom env's are available as variables before_script: diff --git a/include/message.php b/include/message.php index 61c3e8afd..a394a411d 100644 --- a/include/message.php +++ b/include/message.php @@ -210,8 +210,8 @@ function send_message($uid = 0, $recipient = '', $body = '', $subject = '', $rep intval($channel['channel_id']), dbesc($channel['channel_hash']), dbesc($recipient), - dbesc($subject), dbesc(($mimetype)? $mimetype : 'text/bbcode'), + dbesc($subject), dbesc($body), dbesc($sig), dbesc($jattach), diff --git a/install/schema_postgres.sql b/install/schema_postgres.sql index ae6e41345..2ff3623b7 100644 --- a/install/schema_postgres.sql +++ b/install/schema_postgres.sql @@ -712,7 +712,7 @@ CREATE TABLE "mail" ( "to_xchan" text NOT NULL DEFAULT '', "account_id" bigint NOT NULL DEFAULT '0', "channel_id" bigint NOT NULL DEFAULT '0', - "mail_mimetype char(64) NOT NULL DEFAULT '0', + "mail_mimetype" char(64) NOT NULL DEFAULT '0', "title" text NOT NULL, "body" text NOT NULL, "sig" text NOT NULL, diff --git a/tests/travis/prepare_mysql.sh b/tests/travis/prepare_mysql.sh index 92c720205..b3d84253c 100755 --- a/tests/travis/prepare_mysql.sh +++ b/tests/travis/prepare_mysql.sh @@ -36,4 +36,13 @@ mysql -e "SHOW VARIABLES LIKE 'character_set%';" mysql -e "SELECT @@sql_mode;" # Create Hubzilla database -mysql -e "CREATE DATABASE IF NOT EXISTS hubzilla;" -uroot; +mysql -u root -e "CREATE DATABASE IF NOT EXISTS hubzilla;"; +mysql -u root -e "CREATE USER 'hubzilla'@'localhost' IDENTIFIED BY 'hubzilla';" +mysql -u root -e "GRANT ALL ON hubzilla.* TO 'hubzilla'@'localhost';" + +# Import table structure +mysql -u root hubzilla < ./install/schema_mysql.sql + +# Show databases and tables +mysql -u root -e "SHOW DATABASES;" +mysql -u root -e "USE hubzilla; SHOW TABLES;" diff --git a/tests/travis/prepare_pgsql.sh b/tests/travis/prepare_pgsql.sh index dcd83f3be..63c7388cb 100755 --- a/tests/travis/prepare_pgsql.sh +++ b/tests/travis/prepare_pgsql.sh @@ -30,8 +30,15 @@ echo "Preparing for PostgreSQL ..." # Print out some PostgreSQL information psql --version # Why does this hang further execution of the job? -psql -c "SELECT VERSION();" -U postgres +psql -U postgres -c "SELECT VERSION();" # Create Hubzilla database -psql -c "DROP DATABASE IF EXISTS hubzilla;" -U postgres -psql -c "CREATE DATABASE hubzilla;" -U postgres +psql -U postgres -c "DROP DATABASE IF EXISTS hubzilla;" +psql -U postgres -c "CREATE DATABASE hubzilla;" + +# Import table structure +psql -U postgres -v ON_ERROR_STOP=1 hubzilla < ./install/schema_postgres.sql + +# Show databases and tables +psql -U postgres -l +psql -U postgres -d hubzilla -c "\dt;" |