make the psql tests version insensitive

rdkit · Oct 8, 2021 · fc5ed28 · fc5ed28
1 parent 5bf4757
commit fc5ed28
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/Code/PgSQL/rdkit/expected/json.out b/Code/PgSQL/rdkit/expected/json.out
@@ -1,13 +1,13 @@
-select regexp_replace(mol_to_json('CC'::mol)::text,'"toolkitVersion":".*?"','"toolkitVersion":""');
+select regexp_replace(mol_to_json('CC'::mol)::text,'"toolkitVersion":".*?"','"toolkitVersion":""','g');
                                                                                                                                                          regexp_replace                                                                                                                                                         
 --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
  {"commonchem":{"version":10},"defaults":{"atom":{"z":6,"impHs":0,"chg":0,"nRad":0,"isotope":0,"stereo":"unspecified"},"bond":{"bo":1,"stereo":"unspecified"}},"molecules":[{"atoms":[{"impHs":3},{"impHs":3}],"bonds":[{"atoms":[0,1]}],"extensions":[{"name":"rdkitRepresentation","formatVersion":2,"toolkitVersion":""}]}]}
 (1 row)
 
-select regexp_replace(mol_to_json('C[O,N]'::qmol)::text,'"toolkitVersion":".*?"','"toolkitVersion":""');
-                                                                                                                                                                                                                                                                                                              regexp_replace                                                                                                                                                                                                                                                                                                               
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
- {"commonchem":{"version":10},"defaults":{"atom":{"z":6,"impHs":0,"chg":0,"nRad":0,"isotope":0,"stereo":"unspecified"},"bond":{"bo":1,"stereo":"unspecified"}},"molecules":[{"atoms":[{},{"z":0}],"bonds":[{"atoms":[0,1]}],"extensions":[{"name":"rdkitRepresentation","formatVersion":2,"toolkitVersion":""},{"name":"rdkitQueries","formatVersion":10,"toolkitVersion":"2021.09.1pre","atomQueries":[{"descr":"AtomType","tag":33,"val":6},{"descr":"AtomOr","tag":31,"children":[{"descr":"AtomType","tag":33,"val":8},{"descr":"AtomType","tag":33,"val":7}]}],"bondQueries":[{"descr":"SingleOrAromaticBond","tag":33,"val":1}]}]}]}
+select regexp_replace(mol_to_json('C[O,N]'::qmol)::text,'"toolkitVersion":".*?"','"toolkitVersion":""','g');
+                                                                                                                                                                                                                                                                                                        regexp_replace                                                                                                                                                                                                                                                                                                         
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ {"commonchem":{"version":10},"defaults":{"atom":{"z":6,"impHs":0,"chg":0,"nRad":0,"isotope":0,"stereo":"unspecified"},"bond":{"bo":1,"stereo":"unspecified"}},"molecules":[{"atoms":[{},{"z":0}],"bonds":[{"atoms":[0,1]}],"extensions":[{"name":"rdkitRepresentation","formatVersion":2,"toolkitVersion":""},{"name":"rdkitQueries","formatVersion":10,"toolkitVersion":"","atomQueries":[{"descr":"AtomType","tag":33,"val":6},{"descr":"AtomOr","tag":31,"children":[{"descr":"AtomType","tag":33,"val":8},{"descr":"AtomType","tag":33,"val":7}]}],"bondQueries":[{"descr":"SingleOrAromaticBond","tag":33,"val":1}]}]}]}
 (1 row)
 
 select mol_to_smiles(mol_from_json(mol_to_json('CC'::mol)));

diff --git a/Code/PgSQL/rdkit/sql/json.sql b/Code/PgSQL/rdkit/sql/json.sql
@@ -1,5 +1,5 @@
-select regexp_replace(mol_to_json('CC'::mol)::text,'"toolkitVersion":".*?"','"toolkitVersion":""');
-select regexp_replace(mol_to_json('C[O,N]'::qmol)::text,'"toolkitVersion":".*?"','"toolkitVersion":""');
+select regexp_replace(mol_to_json('CC'::mol)::text,'"toolkitVersion":".*?"','"toolkitVersion":""','g');
+select regexp_replace(mol_to_json('C[O,N]'::qmol)::text,'"toolkitVersion":".*?"','"toolkitVersion":""','g');
 select mol_to_smiles(mol_from_json(mol_to_json('CC'::mol)));
 select mol_to_smarts(mol_from_json(mol_to_json('C[O,N]'::qmol)));
 select mol_to_smarts(qmol_from_json(mol_to_json('C[O,N]'::qmol)));