Use quotes when referencing columns

db/migrations/20240818230651_create_notes.cr

@@ -0,0 +1,15 @@
+class CreateNotes::V20240818230651 < Avram::Migrator::Migration::V1
+  def migrate
+    create table_for(Note) do
+      primary_key id : Int64
+      add_timestamps
+      add from : String
+      add read : Bool, default: false
+      add text : String
+    end
+  end
+
+  def rollback
+    drop table_for(Note)
+  end
+end

spec/avram/bool_criteria_spec.cr

@@ -1,7 +1,7 @@
 require "../spec_helper"
 
 private class QueryMe < BaseModel
-  COLUMN_SQL = "users.id, users.created_at, users.updated_at, users.admin"
+  COLUMN_SQL = %("users"."id", "users"."created_at", "users"."updated_at", "users"."admin")
 
   table users do
     column admin : Bool
@@ -11,8 +11,8 @@ end
 describe Bool::Lucky::Criteria do
   describe "is" do
     it "=" do
-      admin.eq(true).to_sql.should eq ["SELECT #{QueryMe::COLUMN_SQL} FROM users WHERE users.admin = $1", "true"]
-      admin.eq(false).to_sql.should eq ["SELECT #{QueryMe::COLUMN_SQL} FROM users WHERE users.admin = $1", "false"]
+      admin.eq(true).to_sql.should eq ["SELECT #{QueryMe::COLUMN_SQL} FROM users WHERE \"users\".\"admin\" = $1", "true"]
+      admin.eq(false).to_sql.should eq ["SELECT #{QueryMe::COLUMN_SQL} FROM users WHERE \"users\".\"admin\" = $1", "false"]
     end
   end
 end

spec/avram/float_criteria_spec.cr

@@ -1,7 +1,7 @@
 require "../spec_helper"
 
 private class QueryMe < BaseModel
-  COLUMN_SQL = "purchases.id, purchases.created_at, purchases.updated_at, purchases.amount"
+  COLUMN_SQL = %("purchases"."id", "purchases"."created_at", "purchases"."updated_at", "purchases"."amount")
 
   table purchases do
     column amount : Float64
@@ -11,19 +11,19 @@ end
 describe Float64::Lucky::Criteria do
   describe "abs" do
     it "uses ABS" do
-      amount.abs.eq(39.99).to_sql.should eq ["SELECT #{QueryMe::COLUMN_SQL} FROM purchases WHERE ABS(purchases.amount) = $1", "39.99"]
+      amount.abs.eq(39.99).to_sql.should eq ["SELECT #{QueryMe::COLUMN_SQL} FROM purchases WHERE ABS(\"purchases\".\"amount\") = $1", "39.99"]
     end
   end
 
   describe "ceil" do
     it "uses CEIL" do
-      amount.ceil.eq(40.0).to_sql.should eq ["SELECT #{QueryMe::COLUMN_SQL} FROM purchases WHERE CEIL(purchases.amount) = $1", "40.0"]
+      amount.ceil.eq(40.0).to_sql.should eq ["SELECT #{QueryMe::COLUMN_SQL} FROM purchases WHERE CEIL(\"purchases\".\"amount\") = $1", "40.0"]
     end
   end
 
   describe "floor" do
     it "uses FLOOR" do
-      amount.floor.eq(39.0).to_sql.should eq ["SELECT #{QueryMe::COLUMN_SQL} FROM purchases WHERE FLOOR(purchases.amount) = $1", "39.0"]
+      amount.floor.eq(39.0).to_sql.should eq ["SELECT #{QueryMe::COLUMN_SQL} FROM purchases WHERE FLOOR(\"purchases\".\"amount\") = $1", "39.0"]
     end
   end
 end

spec/avram/integer_criteria_spec.cr

@@ -1,7 +1,7 @@
 require "../spec_helper"
 
 private class QueryMe < BaseModel
-  COLUMN_SQL = "transactions.id, transactions.created_at, transactions.updated_at, transactions.small_amount, transactions.amount, transactions.big_amount"
+  COLUMN_SQL = %("transactions"."id", "transactions"."created_at", "transactions"."updated_at", "transactions"."small_amount", "transactions"."amount", "transactions"."big_amount")
 
   table transactions do
     column small_amount : Int16
@@ -14,9 +14,9 @@ end
 describe "Int::Lucky::Criteria" do
   describe "abs" do
     it "uses ABS" do
-      small_amount.abs.eq(4).to_sql.should eq ["SELECT #{QueryMe::COLUMN_SQL} FROM transactions WHERE ABS(transactions.small_amount) = $1", "4"]
-      amount.abs.eq(400).to_sql.should eq ["SELECT #{QueryMe::COLUMN_SQL} FROM transactions WHERE ABS(transactions.amount) = $1", "400"]
-      big_amount.abs.eq(40000).to_sql.should eq ["SELECT #{QueryMe::COLUMN_SQL} FROM transactions WHERE ABS(transactions.big_amount) = $1", "40000"]
+      small_amount.abs.eq(4).to_sql.should eq ["SELECT #{QueryMe::COLUMN_SQL} FROM transactions WHERE ABS(\"transactions\".\"small_amount\") = $1", "4"]
+      amount.abs.eq(400).to_sql.should eq ["SELECT #{QueryMe::COLUMN_SQL} FROM transactions WHERE ABS(\"transactions\".\"amount\") = $1", "400"]
+      big_amount.abs.eq(40000).to_sql.should eq ["SELECT #{QueryMe::COLUMN_SQL} FROM transactions WHERE ABS(\"transactions\".\"big_amount\") = $1", "40000"]
     end
   end
 end

spec/avram/model_spec.cr

@@ -91,6 +91,19 @@ describe Avram::Model do
     user.email.to_s.should eq "[email protected]"
   end
 
+  it "allows columns named the same as reserved SQL names" do
+    NoteFactory.create(&.from("Me").text("hi").read(true))
+    note = NoteQuery.new.from("Me").first
+    note.from.should eq("Me")
+    note.text.should eq("hi")
+    note.read?.should eq(true)
+    Note::SaveOperation.update!(note, read: false)
+    note = note.reload
+    note.read?.should eq(false)
+    Note::DeleteOperation.delete!(note)
+    NoteQuery.new.select_count.should eq(0)
+  end
+
   describe "reload" do
     it "can reload a model" do
       user = UserFactory.create &.name("Original Name")

spec/support/factories/note_factory.cr

@@ -0,0 +1,4 @@
+class NoteFactory < BaseFactory
+  def initialize
+  end
+end

spec/support/models/note.cr

@@ -0,0 +1,10 @@
+class Note < BaseModel
+  table do
+    column from : String
+    column read : Bool = false
+    column text : String
+  end
+end
+
+class NoteQuery < Note::BaseQuery
+end

src/avram/base_query_template.cr

@@ -10,7 +10,7 @@ class Avram::BaseQueryTemplate
 
       macro generate_criteria_method(name, type)
         def \{{ name }}
-          \{{ type }}.adapter.criteria(self, "#{table_name}.\{{ name }}")
+          \{{ type }}.adapter.criteria(self, %("#{table_name}"."\{{ name }}"))
         end
       end
 

src/avram/insert.cr

@@ -12,7 +12,7 @@ class Avram::Insert
     if @column_names.empty?
       "*"
     else
-      @column_names.join(", ") { |column| "#{@table}.#{column}" }
+      @column_names.join(", ") { |column| %("#{@table}"."#{column}") }
     end
   end
 
@@ -21,7 +21,7 @@ class Avram::Insert
   end
 
   private def fields : String
-    @params.keys.join(", ")
+    @params.keys.join(", ") { |col| %("#{col}") }
   end
 
   private def values_placeholders : String

src/avram/migrator/columns/base.cr

@@ -52,7 +52,7 @@ abstract class Avram::Migrator::Columns::Base
 
   private def build_add_statement : String
     String.build do |row|
-      row << name.to_s
+      row << %("#{name}")
       row << " "
       row << column_type + as_array_type
       row << null_fragment

src/avram/migrator/columns/primary_keys/base.cr

@@ -6,6 +6,6 @@ abstract class Avram::Migrator::Columns::PrimaryKeys::Base
   abstract def column_type
 
   def build : String
-    %(  #{name} #{column_type} PRIMARY KEY)
+    %(  "#{name}" #{column_type} PRIMARY KEY)
   end
 end

src/avram/migrator/columns/primary_keys/uuid_primary_key.cr

@@ -10,7 +10,7 @@ module Avram::Migrator::Columns::PrimaryKeys
     end
 
     def build : String
-      %(  #{name} #{column_type} PRIMARY KEY DEFAULT gen_random_uuid())
+      %(  "#{name}" #{column_type} PRIMARY KEY DEFAULT gen_random_uuid())
     end
   end
 end

src/avram/query_builder.cr

@@ -268,7 +268,7 @@ class Avram::QueryBuilder
   end
 
   def select(selection : Array(ColumnName)) : self
-    @selections = selection.join(", ") { |column| "#{@table}.#{column}" }
+    @selections = selection.join(", ") { |column| %("#{@table}"."#{column}") }
     self
   end