[Git][noosfero/noosfero][master] 2 commits: hstore: remove obsolete code
Leandro Nunes
gitlab at mg.gitlab.com
Mon May 8 17:06:44 BRT 2017
Leandro Nunes pushed to branch master at Noosfero / noosfero
Commits:
2ad48018 by Rodrigo Souto at 2017-05-08T11:55:07-03:00
hstore: remove obsolete code
- - - - -
9b555d56 by Leandro Nunes at 2017-05-08T20:06:12+00:00
Merge branch 'hstore-removal' into 'master'
hstore: remove obsolete code
See merge request !1205
- - - - -
3 changed files:
- debian/noosfero.postinst
- lib/tasks/test.rake
- script/quick-start
Changes:
=====================================
debian/noosfero.postinst
=====================================
--- a/debian/noosfero.postinst
+++ b/debian/noosfero.postinst
@@ -70,10 +70,6 @@ fi
/etc/init.d/noosfero setup
-# Enable postgresql extensions
-su - postgres -c "psql template1 -c 'CREATE EXTENSION IF NOT EXISTS hstore;'"
-su - postgres -c "psql noosfero -c 'CREATE EXTENSION IF NOT EXISTS hstore;'"
-
# dbconfig-common magic
. /usr/share/dbconfig-common/dpkg/postinst
dbc_go noosfero $@
=====================================
lib/tasks/test.rake
=====================================
--- a/lib/tasks/test.rake
+++ b/lib/tasks/test.rake
@@ -2,7 +2,7 @@ require 'rspec/core/rake_task'
namespace :test do
desc "Run the API tests in test/api"
- Rake::TestTask.new :api do |t|
+ Rake::TestTask.new api: 'db:test:prepare' do |t|
t.libs << 'test'
t.pattern = 'test/api/**/*_test.rb'
t.warning = false
=====================================
script/quick-start
=====================================
--- a/script/quick-start
+++ b/script/quick-start
@@ -100,22 +100,11 @@ while ! sudo -u postgres psql < /dev/null >/dev/null 2>&1; do
sleep 5s
done
-# Enable extensions on template
-sudo su - postgres -c "psql template1 -c 'CREATE EXTENSION IF NOT EXISTS hstore;'"
-if psql -lqt | cut -d \| -f 1 | grep -qw noosfero_development; then
- sudo su - postgres -c "psql noosfero_development -c 'CREATE EXTENSION IF NOT EXISTS hstore;'"
-fi
-if psql -lqt | cut -d \| -f 1 | grep -qw noosfero_test; then
- sudo su - postgres -c "psql noosfero_test -c 'CREATE EXTENSION IF NOT EXISTS hstore;'"
-fi
-
if test -e config/database.yml && test "$force_install" = 'false'; then
say 'Not updating existent database.yml.'
say 'If you wish to automatic reconfigure your database connection and'
say 'recreate the database, you can delete config/database.yml and run'
say 'this script again.'
-
- # Enable extensions on already created databases
else
# create the database with sample data
say 'Configuring Noosfero to use PostgreSQL, with your user.'
View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/132f91d390682fc363cbb7c178726bccdc6c58f1...9b555d568997d9e9951263aa350b3a86fd539135
---
View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/132f91d390682fc363cbb7c178726bccdc6c58f1...9b555d568997d9e9951263aa350b3a86fd539135
You're receiving this email because of your account on gitlab.com.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20170508/849d5c8d/attachment-0001.html>
More information about the Noosfero-dev
mailing list