Ver código fonte

add metric tablespoons and teaspoons and US Legal cup

Daniel Sheffield 2 anos atrás
pai
commit
ff15d7c407
1 arquivos alterados com 15 adições e 2 exclusões
  1. 15 2
      units.sql

+ 15 - 2
units.sql

@@ -4,12 +4,18 @@ CALL insert_unit ('Pint (US)');
 CALL insert_unit ('Tbsp (US)');
 CALL insert_unit ('tsp (US)');
 CALL insert_unit ('Cup (US)');
+CALL insert_unit ('Cup (US Legal)');
 CALL insert_unit ('Quart (US)');
 CALL insert_unit ('Gallon (US)');
+CALL insert_unit ('tsp (metric)');
+CALL insert_unit ('Tbsp (metric)');
 CALL insert_unit ('Cup (metric)');
 -- using customary cup as per https://en.wikipedia.org/wiki/Cup_(unit)
+CALL insert_unit_conversion ('tsp (metric)', 'mL', 5);
+CALL insert_unit_conversion ('Tbsp (metric)', 'mL', 15);
 CALL insert_unit_conversion ('Cup (metric)', 'mL', 250);
 CALL insert_unit_conversion ('Cup (US)', 'mL', 236.5882365);
+CALL insert_unit_conversion ('Cup (US Legal)', 'mL', 240);
 CALL insert_unit_conversion ('Cup (US)', 'Tbsp (US)', 16);
 CALL insert_unit_conversion ('Cup (US)', 'tsp (US)',  48);
 CALL insert_unit_conversion ('Cup (US)', 'fl. oz. (US)', 8);
@@ -28,7 +34,13 @@ BEGIN
   FOR item IN SELECT * FROM (VALUES
       ('L', 'mL', '', 1000), -- *
       ('mL', 'L', '', 1.0/1000),
+      ('tsp (metric)', 'mL', '', 5), -- *
+      ('Tbsp (metric)', 'mL', '', 15), -- *
       ('Cup (metric)', 'mL', '', 250), -- *
+      ('Cup (US)', 'tsp (metric)', '', 236.5882365/5),
+      ('Cup (US)', 'Tbsp (metric)', '', 236.5882365/15),
+      ('Cup (US Legal)', 'mL', '', 240), -- *
+      ('Cup (US Legal)', 'Tbsp (metric)', '', 16),
       ('L', 'Cup (metric)', '', 4),
       ('Cup (US)', 'Cup (metric)', '', 236.5882365/250),
       ('Cup (US)', 'mL', '', 236.5882365),
@@ -45,9 +57,10 @@ BEGIN
       ('fl. oz. (US)', 'tsp (US)', '', 16*2*3/16),
       ('Quart (US)', 'fl. oz. (US)', '', 32), -- *
       ('fl. oz. (US)', 'Quart (US)', '', 1.0/32),
-      ('Gallon (US)', 'fl. oz. (US)', '', 128), -- *
+      ('Gallon (US)', 'fl. oz. (US)', '', 128),
       ('Gallon (US)', 'Pint (US)', '', 8),
-      ('Gallon (US)', 'Quart (US)', '', 4)
+      ('Gallon (US)', 'Quart (US)', '', 4), -- *
+      ('Gallon (US)', 'mL', '', 4*32*236.5882365/8)
       
     ) AS tests(f,t,p,e) LOOP
     BEGIN