Remove column versions for user defined/calcite names (#356)

* Remove column versions for user defined named
---------

Signed-off-by: Daniel Henneberger <git@danielhenneberger.com>

sqrl-engines/sqrl-engine-jdbc/src/main/java/com/datasqrl/engine/database/relational/JDBCPhysicalPlan.java

@@ -3,26 +3,18 @@
  */
 package com.datasqrl.engine.database.relational;
 
-import com.datasqrl.engine.PhysicalPlan.StagePlan;
 import com.datasqrl.engine.database.DatabasePhysicalPlan;
 import com.datasqrl.engine.database.QueryTemplate;
-import com.datasqrl.engine.database.relational.ddl.JdbcDDLFactory;
-import com.datasqrl.engine.database.relational.ddl.JdbcDDLServiceLoader;
 import com.datasqrl.engine.database.relational.ddl.SqlDDLStatement;
-import com.datasqrl.io.impl.jdbc.JdbcDataSystemConnector;
-import com.datasqrl.plan.global.IndexDefinition;
-import com.datasqrl.plan.queries.APIQuery;
 import com.datasqrl.plan.queries.IdentifiedQuery;
 import com.datasqrl.serializer.Deserializer;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.Collection;
-import java.util.stream.Collectors;
-import lombok.Value;
-
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
+import lombok.Value;
 
 @Value
 public class JDBCPhysicalPlan implements DatabasePhysicalPlan {

sqrl-examples/mutations/script.sqrl

@@ -1,3 +1,3 @@
 IMPORT schema.createEvent AS event;
 IMPORT string.*;
-event.name := RTRIM(LTRIM(name));
+event.trimmed_name := RTRIM(LTRIM(name));

sqrl-examples/nutshop/customer360-adv/customer360-adv.sqrl

@@ -1,16 +1,16 @@
 IMPORT nutshop-small.Products;
 IMPORT nutshop-small.Orders TIMESTAMP epoch_to_timestamp(time/1000) AS timestamp;
 
-Orders.items.discount := coalesce(discount, 0.0);
+Orders.items.discount0 := coalesce(discount, 0.0);
 
 Customers := SELECT DISTINCT customerid AS id FROM Orders;
 Products := DISTINCT Products ON id ORDER BY updated DESC;
 
 Customers.purchases := JOIN Orders ON Orders.customerid = @.id ORDER BY Orders.time DESC;
 Orders.items.product := JOIN Products ON Products.id = @.productid;
 
-Orders.items.total := quantity * unit_price - discount;
-Orders.totals := SELECT sum(total) as price, sum(discount) as savings FROM @.items;
+Orders.items.total := quantity * unit_price - discount0;
+Orders.totals := SELECT sum(total) as price, sum(discount0) as savings FROM @.items;
 
 Customers.spending_by_month :=
          SELECT endOfmonth(p.timestamp) AS month,

sqrl-examples/nutshop/customer360-api/customer360-api.sqrl

@@ -6,22 +6,22 @@ IMPORT usda-data.nuts;
 Products := DISTINCT Products ON id ORDER BY _ingest_time DESC;
 
 Orders.date := EPOCH_TO_TIMESTAMP(time);
-Orders.items.discount := coalesce(discount, 0.0);
+Orders.items.discount0 := coalesce(discount, 0.0);
 
 -- @api(name="User", query="getusers")
 Customers := SELECT DISTINCT customerid AS id FROM Orders;
 
 Customers.purchases := JOIN Orders ON Orders.customerid = @.id ORDER BY Orders.time DESC;
 Orders.items.product := JOIN Products ON Products.id = @.productid LIMIT 1;
 
-Orders.items.total := quantity * unit_price - discount;
+Orders.items.total := quantity * unit_price - discount0;
 Orders.total := sum(items.total);
-Orders.savings := sum(items.discount);
+Orders.savings := sum(items.discount0);
 
 Customers.spending_by_month :=
          SELECT TRUNCATE_TO_MONTH(date) AS month,
                 sum(total) AS total_spend,
-                sum(discount) AS total_savings
+                sum(discount0) AS total_savings
          FROM @.purchases
          GROUP BY month ORDER BY month DESC;
 

sqrl-examples/nutshop/customer360-ext/customer360-ext.sqrl

@@ -5,21 +5,21 @@ IMPORT usda-data.nuts;
 Products := DISTINCT Products ON id ORDER BY _ingest_time DESC;
 
 Orders.date := EPOCH_TO_TIMESTAMP(time);
-Orders.items.discount := coalesce(discount, 0.0);
+Orders.items.discount0 := coalesce(discount, 0.0);
 
 Customers := SELECT DISTINCT customerid AS id FROM Orders;
 
 Customers.purchases := JOIN Orders ON Orders.customerid = @.id ORDER BY Orders.time DESC;
 Orders.items.product := JOIN Products ON Products.id = @.productid LIMIT 1;
 
-Orders.items.total := quantity * unit_price - discount;
+Orders.items.total := quantity * unit_price - discount0;
 Orders.total := sum(items.total);
-Orders.savings := sum(items.discount);
+Orders.savings := sum(items.discount0);
 
 Customers.spending_by_month :=
          SELECT TRUNCATE_TO_MONTH(date) AS month,
                 sum(total) AS total_spend,
-                sum(discount) AS total_savings
+                sum(discount0) AS total_savings
          FROM @.purchases
          GROUP BY month ORDER BY month DESC;
 

sqrl-examples/nutshop/customer360/nutshopv1-small.sqrl

@@ -5,7 +5,7 @@ IMPORT nutshop-small.Products;
 IMPORT nutshop-small.Orders TIMESTAMP epochToTimestamp(time/1000) AS timestamp;
 
 /* Some order items are missing the discount field - let's clean that up */
-Orders.items.discount := coalesce(discount, 0.0);
+Orders.items.discount0 := coalesce(discount, 0.0);
 
 /* The Customers table are all the `customerid` that have placed an order */
 Customers := SELECT DISTINCT customerid AS id FROM Orders;
@@ -19,9 +19,9 @@ Customers.purchases := JOIN Orders ON Orders.customerid = @.id ORDER BY Orders.t
 Orders.items.product := JOIN Products ON Products.id = @.productid;
 
 /* Add a column to compute the total for each item in an order */
-Orders.items.total := quantity * unit_price - discount;
+Orders.items.total := quantity * unit_price - discount0;
 /* Adds a nested table `totals` in Orders to compute the totals for each Order */
-Orders.totals := SELECT sum(total) as price, sum(discount) as savings FROM @.items;
+Orders.totals := SELECT sum(total) as price, sum(discount0) as savings FROM @.items;
 
 /* Aggregates the purchase history for each customer by month */
 Customers.spending_by_month :=

sqrl-examples/nutshop/customer360/nutshopv2-medium.sqrl

@@ -2,9 +2,9 @@ IMPORT time.*;
 IMPORT nutshop-medium.Products;
 IMPORT nutshop-medium.Orders TIMESTAMP epochToTimestamp(time/1000) AS timestamp;
 
-Orders.items.discount := coalesce(discount, 0.0);
-Orders.items.total := quantity * unit_price - discount;
-Orders.totals := SELECT sum(total) as price, sum(discount) as savings FROM @.items;
+Orders.items.discount0 := coalesce(discount, 0.0);
+Orders.items.total := quantity * unit_price - discount0;
+Orders.totals := SELECT sum(total) as price, sum(discount0) as savings FROM @.items;
 
 Products := DISTINCT Products ON id ORDER BY updated DESC;
 Orders.items.product := JOIN Products ON Products.id = @.productid;

sqrl-examples/nutshop/customer360/nutshopv2-small.sqrl

@@ -2,9 +2,9 @@ IMPORT time.*;
 IMPORT nutshop-compress.Products;
 IMPORT nutshop-compress.Orders TIMESTAMP epochToTimestamp(time/1000) AS timestamp;
 
-Orders.items.discount := coalesce(discount, 0.0);
-Orders.items.total := quantity * unit_price - discount;
-Orders.totals := SELECT sum(total) as price, sum(discount) as savings FROM @.items;
+Orders.items.discount0 := coalesce(discount, 0.0);
+Orders.items.total := quantity * unit_price - discount0;
+Orders.totals := SELECT sum(total) as price, sum(discount0) as savings FROM @.items;
 
 Products := DISTINCT Products ON id ORDER BY updated DESC;
 Orders.items.product := JOIN Products ON Products.id = @.productid;

sqrl-examples/nutshop/customer360/nutshopv3-small.sqrl

@@ -2,9 +2,9 @@ IMPORT time.*;
 IMPORT nutshop-small.Products;
 IMPORT nutshop-small.Orders TIMESTAMP epochToTimestamp(time/1000) AS timestamp;
 
-Orders.items.discount := coalesce(discount, 0.0);
-Orders.items.total := quantity * unit_price - discount;
-Orders.totals := SELECT sum(total) as price, sum(discount) as savings FROM @.items;
+Orders.items.discount0 := coalesce(discount, 0.0);
+Orders.items.total := quantity * unit_price - discount0;
+Orders.totals := SELECT sum(total) as price, sum(discount0) as savings FROM @.items;
 
 Products := DISTINCT Products ON id ORDER BY updated DESC;
 Orders.items.product := JOIN Products ON Products.id = @.productid;

sqrl-examples/nutshop/customer360/v2graphql/nutshopv2-small.sqrl

@@ -2,9 +2,9 @@ IMPORT time.*;
 IMPORT nutshop-compress.Products;
 IMPORT nutshop-compress.Orders TIMESTAMP epochToTimestamp(time/1000) AS timestamp;
 
-Orders.items.discount := coalesce(discount, 0.0);
-Orders.items.total := quantity * unit_price - discount;
-Orders.totals := SELECT sum(total) as price, sum(discount) as savings FROM @.items;
+Orders.items.discount0 := coalesce(discount, 0.0);
+Orders.items.total := quantity * unit_price - discount0;
+Orders.totals := SELECT sum(total) as price, sum(discount0) as savings FROM @.items;
 
 Products := DISTINCT Products ON id ORDER BY updated DESC;
 Orders.items.product := JOIN Products ON Products.id = @.productid;

sqrl-examples/quickstart/quickstart-docs.sqrl

@@ -3,10 +3,10 @@ IMPORT datasqrl.seedshop.Products;
 IMPORT time.*;
 IMPORT datasqrl.seedshop.Customers AS Users TIMESTAMP epochMilliToTimestamp(changed_on) AS timestamp;
 
-Orders.items.discount := discount?0.0;
-Orders.items.total := quantity * unit_price - discount;
+Orders.items.discount0 := discount?0.0;
+Orders.items.total := quantity * unit_price - discount0;
 Orders.totals := SELECT sum(total) as price,
-                  sum(discount) as saving FROM @.items;
+                  sum(discount0) as saving FROM @.items;
 
 -- Replacing users from import
 Users := DISTINCT Users ON id ORDER BY timestamp DESC;
@@ -52,12 +52,12 @@ UsersWithSpending := SELECT u.id, u.email, s.spend AS spend FROM Users u JOIN u.
 HighSpendingUsers := SELECT u.id, u.email FROM Users u JOIN u.order_stats s WHERE s.spend > 1000;
 
 Users.spending_last_week := SELECT sum(i.total) AS spend,
-            sum(i.discount) AS saved
+            sum(i.discount0) AS saved
       FROM @.purchases p JOIN p.items i
       WHERE p.time > now() - INTERVAL 7 DAY;
 
 Users.total_spend := SELECT sum(i.total) AS spend,
-            sum(i.discount) AS saved
+            sum(i.discount0) AS saved
       FROM @ JOIN Orders o ON o.customerid = @.id JOIN o.items i;
 
 RecentTotal := SELECT sum(i.total) AS total, sum(i.quantity) AS quantity

sqrl-examples/quickstart/quickstart-export-err.sqrl

@@ -1,19 +1,19 @@
-IMPORT datasqrl.seedshop.Orders TIMESTAMP time + INTERVAL 8 DAY AS time;
+IMPORT datasqrl.seedshop.Orders TIMESTAMP time + INTERVAL 8 DAY AS timestamp;
 IMPORT datasqrl.seedshop.Products;
 IMPORT time.*;
 IMPORT datasqrl.seedshop.Customers AS Users TIMESTAMP epochMilliToTimestamp(changed_on) AS timestamp;
 
-Orders.items.discount := discount?0.0;
-Orders.items.total := quantity * unit_price - discount;
+Orders.items.discount0 := discount?0.0;
+Orders.items.total := quantity * unit_price - discount0;
 Orders.totals := SELECT sum(total) as price,
-                  sum(discount) as saving FROM @.items;
+                  sum(discount0) as saving FROM @.items;
 
 Users := DISTINCT Users ON id ORDER BY timestamp DESC;
 Users.purchases := JOIN Orders ON Orders.customerid = @.id;
-Users.country := country?'none';
+Users.country0 := country?'none';
 Orders.user := JOIN Users ON @.customerid = Users.id;
 
-Users.spending := SELECT endOfWeek(p.time) AS week,
+Users.spending := SELECT endOfWeek(p.timestamp) AS week,
          sum(t.price) AS spend, sum(t.saving) AS saved
       FROM @.purchases p JOIN p.totals t
       GROUP BY week ORDER BY week DESC;
@@ -33,10 +33,10 @@ Products.ordered_items := JOIN Orders.items i ON i.productid = @.id;
 Products.volume_10day := SELECT u.country, sum(i.quantity) as quantity,
          sum(i.total) as spend, sum(i.quantity * @.weight_in_gram) as weight
       FROM @ JOIN @.ordered_items i JOIN i.parent o JOIN o.user u
-      WHERE o.time > now() - INTERVAL 10 DAY GROUP BY u.country;
+      WHERE o.timestamp > now() - INTERVAL 10 DAY GROUP BY u.country;
 
 --
-Users.order_stats := SELECT min(o.time) as first_order,
+Users.order_stats := SELECT min(o.timestamp) as first_order,
          sum(t.price) as spend, sum(t.saving) as saved, count(1) as num_orders
       FROM @.purchases o JOIN o.totals t;
 

sqrl-examples/quickstart/quickstart-export.sqrl

@@ -1,19 +1,19 @@
-IMPORT datasqrl.seedshop.Orders TIMESTAMP time + INTERVAL 8 DAY AS time;
+IMPORT datasqrl.seedshop.Orders TIMESTAMP time + INTERVAL 8 DAY AS timestamp;
 IMPORT datasqrl.seedshop.Products;
 IMPORT time.*;
 IMPORT mySourcePackage.Customers AS Users TIMESTAMP epochMilliToTimestamp(changed_on) AS timestamp;
 
-Orders.items.discount := discount?0.0;
-Orders.items.total := quantity * unit_price - discount;
+Orders.items.discount0 := discount?0.0;
+Orders.items.total := quantity * unit_price - discount0;
 Orders.totals := SELECT sum(total) as price,
-                  sum(discount) as saving FROM @.items;
+                  sum(discount0) as saving FROM @.items;
 
 Users := DISTINCT Users ON id ORDER BY timestamp DESC;
 Users.purchases := JOIN Orders ON Orders.customerid = @.id;
-Users.country := country?'none';
+Users.country0 := country?'none';
 Orders.user := JOIN Users ON @.customerid = Users.id;
 
-Users.spending := SELECT endOfWeek(p.time) AS week,
+Users.spending := SELECT endOfWeek(p.timestamp) AS week,
          sum(t.price) AS spend, sum(t.saving) AS saved
       FROM @.purchases p JOIN p.totals t
       GROUP BY week ORDER BY week DESC;
@@ -30,10 +30,10 @@ Products := DISTINCT Products ON id ORDER BY updated DESC;
 Orders.items.product := JOIN Products ON Products.id = @.productid;
 Products.ordered_items := JOIN Orders.items i ON i.productid = @.id;
 
-Products.volume_10day := SELECT u.country, sum(i.quantity) as quantity,
+Products.volume_10day := SELECT u.country0 AS country, sum(i.quantity) as quantity,
          sum(i.total) as spend, sum(i.quantity * @.weight_in_gram) as weight
       FROM @ JOIN @.ordered_items i JOIN i.parent o JOIN o.user u
-      WHERE o.time > now() - INTERVAL 10 DAY GROUP BY u.country;
+      WHERE o.timestamp > now() - INTERVAL 10 DAY GROUP BY u.country0;
 
 --
 Users.order_stats := SELECT sum(t.price) as spend, sum(t.saving) as saved,

sqrl-examples/quickstart/quickstart-mutation.sqrl

@@ -1,21 +1,21 @@
-IMPORT datasqrl.seedshop.Orders TIMESTAMP time + INTERVAL 8 DAY AS time;
+IMPORT datasqrl.seedshop.Orders TIMESTAMP time + INTERVAL 8 DAY AS timestamp;
 IMPORT datasqrl.seedshop.Products;
 IMPORT time.*;
 IMPORT mySourcePackage.Customers AS Users TIMESTAMP epochMilliToTimestamp(changed_on) AS timestamp;
 IMPORT seedshop.ProductVisit;
 
-Orders.items.discount := discount?0.0;
-Orders.items.total := quantity * unit_price - discount;
+Orders.items.discount0 := discount?0.0;
+Orders.items.total := quantity * unit_price - discount0;
 Orders.totals := SELECT sum(total) as price,
-                  sum(discount) as saving FROM @.items;
+                  sum(discount0) as saving FROM @.items;
 
 -- Replacing users from import
 Users := DISTINCT Users ON id ORDER BY timestamp DESC;
 Users.purchases := JOIN Orders ON Orders.customerid = @.id;
-Users.country := country?'none';
+Users.country0 := country?'none';
 Orders.user := JOIN Users ON @.customerid = Users.id;
 
-Users.spending := SELECT endOfWeek(p.time) AS week,
+Users.spending := SELECT endOfWeek(p.timestamp) AS week,
          sum(t.price) AS spend, sum(t.saving) AS saved
       FROM @.purchases p JOIN p.totals t
       GROUP BY week ORDER BY week DESC;
@@ -38,7 +38,7 @@ Orders.items.product := JOIN Products ON Products.id = @.productid;
 Products.ordered_items := JOIN Orders.items i ON i.productid = @.id;
 
 -- aggregating by country
-Products.volume_10day := SELECT u.country, sum(i.quantity) as quantity,
+Products.volume_10day := SELECT u.country0 AS country, sum(i.quantity) as quantity,
          sum(i.total) as spend, sum(i.quantity * @.weight_in_gram) as weight
       FROM @ JOIN @.ordered_items i JOIN i.parent o JOIN o.user u
-      WHERE o.time > now() - INTERVAL 10 DAY GROUP BY u.country;
+      WHERE o.timestamp > now() - INTERVAL 10 DAY GROUP BY u.country0;

sqrl-examples/quickstart/quickstart-sqrl.sqrl

@@ -2,10 +2,10 @@ IMPORT datasqrl.seedshop.Orders;
 IMPORT datasqrl.seedshop.Products;
 IMPORT time.endOfWeek;
 
-Orders.items.discount := discount?0.0; -- Data cleaning
-Orders.items.total := quantity * unit_price - discount;
+Orders.items.discount0 := discount?0.0; -- Data cleaning
+Orders.items.total := quantity * unit_price - discount0;
 Orders.totals := SELECT sum(total) as price,
-                  sum(discount) as saving FROM @.items;
+                  sum(discount0) as saving FROM @.items;
 
 Users := SELECT DISTINCT customerid AS id FROM Orders;
 Users.purchases := JOIN Orders ON Orders.customerid = @.id ORDER BY Orders.time; -- time ordering

sqrl-examples/quickstart/quickstart-user.sqrl

@@ -1,20 +1,20 @@
-IMPORT datasqrl.seedshop.Orders TIMESTAMP time + INTERVAL 8 DAY AS time;
+IMPORT datasqrl.seedshop.Orders TIMESTAMP time + INTERVAL 8 DAY AS timestamp;
 IMPORT datasqrl.seedshop.Products;
 IMPORT time.*;
 IMPORT mySourcePackage.Customers AS Users TIMESTAMP epochMilliToTimestamp(changed_on) AS timestamp;
 
-Orders.items.discount := discount?0.0;
-Orders.items.total := quantity * unit_price - discount;
+Orders.items.discount0 := discount?0.0;
+Orders.items.total := quantity * unit_price - discount0;
 Orders.totals := SELECT sum(total) as price,
-                  sum(discount) as saving FROM @.items;
+                  sum(discount0) as saving FROM @.items;
 
 -- Replacing users from import
 Users := DISTINCT Users ON id ORDER BY timestamp DESC;
 Users.purchases := JOIN Orders ON Orders.customerid = @.id;
-Users.country := country?'none';
+Users.country0 := country?'none';
 Orders.user := JOIN Users ON @.customerid = Users.id;
 
-Users.spending := SELECT endOfWeek(p.time) AS week,
+Users.spending := SELECT endOfWeek(p.timestamp) AS week,
          sum(t.price) AS spend, sum(t.saving) AS saved
       FROM @.purchases p JOIN p.totals t
       GROUP BY week ORDER BY week DESC;
@@ -34,7 +34,7 @@ Products.ordered_items := JOIN Orders.items i ON i.productid = @.id;
 --
 
 -- aggregating by country
-Products.volume_10day := SELECT u.country, sum(i.quantity) as quantity,
+Products.volume_10day := SELECT u.country0 AS country, sum(i.quantity) as quantity,
          sum(i.total) as spend, sum(i.quantity * @.weight_in_gram) as weight
       FROM @ JOIN @.ordered_items i JOIN i.parent o JOIN o.user u
-      WHERE o.time > now() - INTERVAL 10 DAY GROUP BY u.country;
+      WHERE o.timestamp > now() - INTERVAL 10 DAY GROUP BY u.country0;