Merge remote-tracking branch 'origin/master' into active-record

Author: eliasjpr

.github/workflows/crystal.yml

@@ -17,13 +17,10 @@ concurrency:
 
 jobs:
   build:
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-latest]
-        crystal: ["1.15.1"]
+    runs-on: ubuntu-latest
+    container:
+      image: crystallang/crystal:1.15.1
 
-    runs-on: ${{ matrix.os }}
     services:
       postgres:
         image: postgres
@@ -39,12 +36,11 @@ jobs:
           --health-timeout=5s
           --health-retries=5
     steps:
-      - name: Download source
-        uses: actions/checkout@v4
-      - name: Install Crystal
-        uses: crystal-lang/install-crystal@v1
-        with:
-          crystal: ${{ matrix.crystal }}
+      - uses: actions/checkout@v4
+      - name: Update package list and install SQLite and development files
+        run: |
+          apt-get update
+          apt-get install -y sqlite3 libsqlite3-dev
       - name: Verify SQLite installation
         run: sqlite3 --version
       - name: Create SQLite databases
@@ -62,7 +58,14 @@ jobs:
       - name: Check formatting
         run: crystal tool format --check
       - name: Check code linting with Ameba
-        run: bin/ameba --fix -f progress
+        run: bin/ameba
+      - name: Wait for Postgres
+        run: |
+          for i in {1..30}; do
+            pg_isready -h postgres -U example && break
+            echo "Waiting for postgres..."
+            sleep 1
+          done
       - name: Run tests
         env:
           DATABASE_URL: postgres://example:example@postgres:5432/example

shard.yml

@@ -1,5 +1,5 @@
 name: cql
-version: 0.0.162
+version: 0.0.176
 authors:
   - Elias Perez <[email protected]>
 crystal: '>= 1.12.2'

spec/integration/adapters/sqlite_schema_spec.cr

@@ -50,6 +50,7 @@ describe CQL::Schema do
       .into(:customers)
       .values(
         name: customer.name,
+        email: customer.email,
         city: customer.city,
         balance: customer.balance
       ).commit
@@ -68,6 +69,7 @@ describe CQL::Schema do
       .into(:customers)
       .values(
         name: customer.name,
+        email: customer.email,
         city: customer.city,
         balance: customer.balance
       ).commit
@@ -78,7 +80,7 @@ describe CQL::Schema do
 
   it "creates a schema" do
     Data.tables.size.should eq(2)
-    Data.tables[:customers].columns.size.should eq(6)
+    Data.tables[:customers].columns.size.should eq(7)
   end
 
   it "add a column to an existing table" do
@@ -90,7 +92,7 @@ describe CQL::Schema do
     end
 
     column_exists.call(:country, :customers).should eq(1)
-    Data.tables[:customers].columns.size.should eq(7)
+    Data.tables[:customers].columns.size.should eq(8)
   end
 
   it "drops a column from an existing table" do
@@ -104,7 +106,7 @@ describe CQL::Schema do
     end
 
     column_exists.call(:city, :customers).should eq(0)
-    Data.tables[:customers].columns.size.should eq(6)
+    Data.tables[:customers].columns.size.should eq(7)
   end
 
   it "adds an index to a table" do

spec/support/schemas/data_schema.cr

@@ -5,6 +5,7 @@ Data = CQL::Schema.define(
   table :customers do
     primary :id, Int32
     column :name, String
+    column :email, String
     column :city, String
     column :balance, Int32
     timestamps