From: Norbert Moutarde <norbert.moutarde@nothing2do.eu>
Date: Fri, 5 Jul 2013 11:33:10 +0000 (+0200)
Subject: Merge branch 'master' of https://github.com/Nothing2Do/diary-shell
X-Git-Url: https://git.nothing2do.fr/?a=commitdiff_plain;h=e1150ce8ef285bbbb031c72e5decfd8a54dbe9c1;p=diary-shell

Merge branch 'master' of https://github.com/Nothing2Do/diary-shell

Conflicts:
	alias.sql

unknown
---

e1150ce8ef285bbbb031c72e5decfd8a54dbe9c1
diff --cc alias.sql
index 209b9c5,053eca1..3f54496
--- a/alias.sql
+++ b/alias.sql
@@@ -1,4 -1,4 +1,5 @@@
  INSERT INTO alias (nom, command, argc) VALUES ('ls', 'select id,texte from raw order by date asc;', 0);
 +INSERT INTO alias (nom, command, argc) VALUES ('search', 'select id,texte from raw where texte ~ $1 order by date asc;', 1);
+ INSERT INTO alias (nom, command, argc) VALUES ('search', 'select id,texte from raw where texte ~ $1 order by date asc', 1);
  INSERT INTO alias (nom, command, argc) VALUES ('rm', 'DELETE FROM raw WHERE id =''%1'';', 1);
  INSERT INTO alias (nom, command, argc) VALUES ('alias', 'select nom from alias;', 0);
diff --cc sqldb.cpp
index 85d28f2,85d28f2..315a013
--- a/sqldb.cpp
+++ b/sqldb.cpp
@@@ -205,7 -205,7 +205,7 @@@ bool sqlpg::alias(vector<string> a)
      //cout<<"alias start here\n";
      string cmd;
  
--    cmd="select command,argc from alias where nom='"+a[0]+"' and argc="+toString(a.size()-1)+";";// I need to select a function with argc too !
++    cmd="select command,argc from alias where nom='"+a[0]+"' and argc = '"+toString(a.size()-1)+"';";// I need to select a function with argc too !
      //cout<<"cmd="<<cmd<<endl;
      exec(cmd);
      if (PQntuples(res)<1){