Merge pull request #35 from buxx/dev/mysql_compatibility

.travis.yml

@@ -1,30 +1,33 @@
 sudo: false
 language: python
-python:
-#  - "3.2"
-#  - "3.3"
-  - "3.4"
+python: "3.4"
+
+env:
+  - DB=postgres
+  - DB=mysql
 
 addons:
   postgresql: "9.3"
+  mysql: "5.5"
 
-# command to install dependencies
-# Note: there's an echo at the end of pip install. It allows to override the default return code which is not 0
-# because some packages need to be ugraded to python3 (invalid python syntax because of python2 source code)
-#
-# pip install -r is run 2 times in order to really install tgapp-resetpassword (to investigate)
-#
 install:
-  - "cd tracim && python setup.py develop; cd -"
-  - "pip install -r install/requirements.txt; echo"
-  - "pip install coveralls"
+  - cd tracim && python setup.py develop; cd -
+  - pip install -r install/requirements.txt; echo
+  - pip install coveralls
 
 before_script:
-  - "psql -c 'create database tracim_test;' -U postgres"
-  - "cp ${TRAVIS_BUILD_DIR}/tracim/development.ini.base ${TRAVIS_BUILD_DIR}/tracim/development.ini"
-#  - "cd ${TRAVIS_BUILD_DIR}/tracim && gearbox setup-app -c ${TRAVIS_BUILD_DIR}/tracim/test.ini"
-  - "cd ${TRAVIS_BUILD_DIR}/tracim && gearbox setup-app"
-#  - "cd ${TRAVIS_BUILD_DIR}/tracim && gearbox migrate -c ${TRAVIS_BUILD_DIR}/tracim/test.ini upgrade"
+  - cp ${TRAVIS_BUILD_DIR}/tracim/development.ini.base ${TRAVIS_BUILD_DIR}/tracim/development.ini
+
+  - sh -c "if [ '$DB' = 'postgres' ]; then psql -c 'create database tracim_test;' -U postgres; fi"
+  - sh -c "if [ '$DB' = 'postgres' ]; then cd ${TRAVIS_BUILD_DIR}/tracim && sed -i \"s/\(sqlalchemy.url *= *\).*/\1postgresql:\/\/postgres:dummy@127.0.0.1:5432\/tracim_test?client_encoding=utf8/\" test.ini; fi"
+  - sh -c "if [ '$DB' = 'postgres' ]; then cd ${TRAVIS_BUILD_DIR}/tracim && sed -i \"s/\(sqlalchemy.url *= *\).*/\1postgresql:\/\/postgres:dummy@127.0.0.1:5432\/tracim_test?client_encoding=utf8/\" development.ini; fi"
+
+  - sh -c "if [ '$DB' = 'mysql' ]; then mysql -e 'CREATE DATABASE tracim_test;'; fi"
+  - sh -c "if [ '$DB' = 'mysql' ]; then cd ${TRAVIS_BUILD_DIR}/tracim && sed -i \"s/\(sqlalchemy.url *= *\).*/\mysql+oursql:\/\/root@localhost\/tracim_test/\" test.ini; fi"
+  - sh -c "if [ '$DB' = 'mysql' ]; then cd ${TRAVIS_BUILD_DIR}/tracim && sed -i \"s/<replace_database_uri_here>/mysql+oursql:\/\/root@localhost\/tracim_test/\" development.ini; fi"
+  - sh -c "if [ '$DB' = 'mysql' ]; then pip install https://launchpad.net/oursql/py3k/py3k-0.9.4/+download/oursql-0.9.4.zip; fi"
+
+  - cd ${TRAVIS_BUILD_DIR}/tracim && gearbox setup-app --debug
 
 # command to run tests
 script: "cd ${TRAVIS_BUILD_DIR}/tracim && nosetests -c ${TRAVIS_BUILD_DIR}/tracim/test.ini -v --with-coverage --cover-package=tracim --cover-erase"

tracim/development.ini.base

@@ -92,7 +92,7 @@ beaker.session.validate_key = 3283411b-1904-4554-b0e1-883863b53080
 # sqlalchemy.url=postgresql://username:password@hostname:port/databasename
 # sqlalchemy.url=mysql://username:password@hostname:port/databasename
 # sqlalchemy.url = postgresql://tracim_user:tracim_user_password@127.0.0.1:5432/tracim?client_encoding=utf8
-sqlalchemy.url = postgresql://postgres:dummy@127.0.0.1:5432/tracim_test?client_encoding=utf8
+sqlalchemy.url = <replace_database_uri_here>
 
 #echo shouldn't be used together with the logging module.
 sqlalchemy.echo = false

tracim/tracim/model/__init__.py

@@ -49,7 +49,6 @@ DBSession = scoped_session(maker)
 convention = {
   "ix": 'ix__%(column_0_label)s',  # Indexes
   "uq": "uq__%(table_name)s__%(column_0_name)s",  # Unique constrains
-  "ck": "ck__%(table_name)s__%(constraint_name)s",  # Other column constrains
   "fk": "fk__%(table_name)s__%(column_0_name)s__%(referred_table_name)s",  # Foreign keys
   "pk": "pk__%(table_name)s"  # Primary keys
 }