scripts bde : passage à la nouvelle base de données (seulement certains)

diff --git a/bde/activites.sh b/bde/activites.sh
index 2d3efd09e56467356690c0a43acb39db10c3e0e4..82ff1114176ceda3428c19bacd45590d72d99b0b 100755 (executable)
--- a/bde/activites.sh
+++ b/bde/activites.sh
@@ -16,4 +16,4 @@ then
     WHERE="WHERE titre ILIKE '%pot%' "
 fi
 
-psql bde -c "SELECT * FROM activites ${WHERE}ORDER BY debut DESC;"
+psql note -c "SELECT * FROM activites ${WHERE}ORDER BY debut DESC;"

diff --git a/bde/transactions.sh b/bde/transactions.sh
index f7d4b0024d3e233b93267109b81bfed89adcd1c6..f2140855795be12680b07142fe29c177d646d6e0 100755 (executable)
--- a/bde/transactions.sh
+++ b/bde/transactions.sh
@@ -4,9 +4,9 @@
 
 export LESS='-S'
 
-psql bde -c "
-   SELECT t.id,t.date,t.quantite,t.montant,t.remarque,t.valide,t.emetteur,t.destinataire,
+psql note -c "
+   SELECT t.id,t.date,t.quantite,t.montant,t.description,t.valide,t.emetteur,t.destinataire,
           adhe.pseudo AS emetteur, adhd.pseudo AS destinataire
-   FROM transactions AS t, adherents AS adhe, adherents AS adhd
-   WHERE $1 in (emetteur, destinataire) AND t.emetteur=adhe.numcbde AND t.destinataire=adhd.numcbde AND valide
+   FROM transactions AS t, comptes AS adhe, comptes AS adhd
+   WHERE $1 in (emetteur, destinataire) AND t.emetteur=adhe.idbde AND t.destinataire=adhd.idbde AND valide
    ORDER BY date DESC;"

diff --git a/bde/trouver.sh b/bde/trouver.sh
index 47dca069ad6ca34a0f3e982b7c50053b17aa29db..920219f8ac206d507e3edce63357edaeb7d0c8ba 100755 (executable)
--- a/bde/trouver.sh
+++ b/bde/trouver.sh
@@ -7,21 +7,21 @@ do
   if [ $i = "--no-mail" ]
     then nomail=1;
   fi;
-  if [ $i = "--numcbde" ]
-    then searchnumcbde=1;
+  if [ $i = "--idbde" ]
+    then searchidcbde=1;
   fi
 done
 
 # Si on n'a *pas* mis --no-mail (too many negations, I know)
 if [ -z "${nomail}" ]
 then
-  adding=" OR email ILIKE '%$1%'"
+  adding=" OR mail ILIKE '%$1%'"
 fi
-# Si on a mis --numcbde, il faut matcher numcbde de manière plus lâche
-if [ "${searchnumcbde}" = "1" ]
+# Si on a mis --idcbde, il faut matcher numcbde de manière plus lâche
+if [ "${searchidcbde}" = "1" ]
 then
   wild="%"
 fi
 
-psql bde -c "SELECT * FROM adherents WHERE pseudo ILIKE '%$1%' OR nom ILIKE '%$1%'
- OR prenom ILIKE '%$1%'${adding} OR CAST(numcbde AS varchar) LIKE '${wild}$1${wild}' ORDER BY nom;"
+psql note -c "SELECT * FROM comptes WHERE pseudo ILIKE '%$1%' OR nom ILIKE '%$1%'
+ OR prenom ILIKE '%$1%'${adding} OR CAST(idbde AS varchar) LIKE '${wild}$1${wild}' ORDER BY nom;"