Merge pull request #2 from dmvieira/develop

now migrate use before and after migrates once

README.md

@@ -8,7 +8,7 @@ This project aim is organize and control [web2py](https://github.com/web2py/web2
 with version control using version control tags.
 
 So you can assign your versions with tags for some branchs. For example, if you have a dev and a master branch
-you can assign `master-migrate` and `dev-migrate` tags and your migrates for dev and master databases will be
+you can assign `master-migrate` and `develop-migrate` tags and your migrates for dev and master databases will be
 independently controlled.
 
 This is very important if you want a [Continuous Integration](http://en.wikipedia.org/wiki/Continuous_integration)
@@ -53,9 +53,16 @@ Now just use make command:
 
 `make`
 
+If you want more, you can do these tricks:
+* Add to sql foder before migrates sql for eg. prepopulate some table
+* Add to sql folder after migrates sql for eg. data migration
+* Add python scripts inside migrate.py to run some command after migration using your web2py app model
+
+`sql` folder need scripts using names: `before-BRANCH.sql` and `after-BRANCH.sql` like examples inside folder that use develop and master branchs.
+
 Now your first database migration is working and the TAG is now on your version control!
 
-If some errors occur, database will be backed up but tags are NOT RESTRUCTURED!!
+If some errors occur, database will be backed up but tags are NOT RESTRUCTURED and before and after migration scripts are NOT CLEANED!!
 
 For Developers
 ---------------

migrate.sh

@@ -29,10 +29,15 @@ make_migrate(){
 #create web2py paths
 mkdir $DATABASES $APP_PATH/sessions $APP_PATH/errors || true;
 
+#default do not re send to version control
+sendit=0;
 echo "making database backup";
 rds_backup || exit 10;
 echo "executing pre-migrate sqls";
-rds_import pre-migrate.sql || true;
+if [ -s "sql/before-${BRANCH}.sql" ];
+then
+    rds_import sql/before-${BRANCH}.sql && sendit=1 || exit 1;
+fi
 echo "making .tables with old db.py and fake_migrate if tag exists";
 #if tag dont exists then just make first migrate
 if vc_check_tag;
@@ -46,7 +51,7 @@ then
 fi
 echo "executing web2py migrate with deploy db.py";
 export FAKE_MIGRATE_ENV=0;
-#return current web2py folder, branch and commit
+#return current web2py folder, branch and version
 cd ${WEB2PY};
 #just printing status for information
 vc_status;
@@ -57,11 +62,24 @@ vc_status;
 cd ${DIR};
 make_migrate;
 echo "executing pos-migrate sqls";
-rds_import pos-migrate.sql || true;
+if [ -s "sql/after-${BRANCH}.sql" ];
+then
+    rds_import sql/after-${BRANCH}.sql && sendit=1 || exit 1;
+fi
 export MIGRATE_ENV=0;
 #last modifications with databases
-rds_finish;
+rds_finish || echo "error cleaning test server, please use finish by hand";
 echo "redefining tag"
-vc_remove_tag || true;
+vc_remove_tag || "error removing tag";
 vc_add_tag || echo "error adding tag";
+#send to version control again if did before and after migrates
+if [ $sendit -eq 1 ];
+then
+    > sql/before-${BRANCH}.sql || echo "error cleaning before migrate";
+    > sql/after-${BRANCH}.sql || echo "error cleaning after migrate";
+    #return current web2py folder to send new file
+    cd ${WEB2PY};
+    vc_send || echo "error sending again to vc without after and before migrates";
+fi
+
 echo "migrate ok!";

version_control/dummy.sh

@@ -40,4 +40,10 @@ vc_remove_tag()
 vc_add_tag()
 {
     echo "adding tag..."
-}
+}
+
+# send new code to version control
+vc_send()
+{
+    echo "sending new code..."
+}

version_control/git.sh

@@ -43,4 +43,13 @@ vc_add_tag()
 {
     git tag $TAG &&
     git push --tags;
-}
+}
+
+# sending new code to version control
+vc_send()
+{
+    git config --global user.email "[email protected]"
+    git config --global user.name "Test Server"
+    git commit -am "new code without before and after migrates scripts" &&
+    git push origin HEAD;
+}