support for multiple column PRIMARY KEY and UNIQUE constraints

Author: lamg

CHANGELOG.md

@@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.0.3] - 2025-03-03
+
+Added:
+
+- Support for multiple column UNIQUE and PRIMARY KEY constraints
+- Environment variable `migrate_db` sets the default database path, falling back to `<CURRENT_DIR_NAME>.sqlite` if not defined
+
 ## [1.0.2] - 2025-01-11
 
 Changed:

src/Directory.Packages.props

@@ -6,6 +6,7 @@
     <PackageVersion Include="Antlr4.Runtime.Standard" Version="4.13.1" />
     <PackageVersion Include="Antlr4BuildTasks" Version="12.8.0" />
     <PackageVersion Include="Argu" Version="6.2.4" />
+    <PackageVersion Include="dotenv.net" Version="3.2.1" />
     <PackageVersion Include="FSharp.Core" Version="9.0.100" />
     <PackageVersion Include="FsToolkit.ErrorHandling" Version="4.18.0" />
     <PackageVersion Include="Microsoft.Data.Sqlite" Version="9.0.0" />

src/MigLib/DeclarativeMigrations/SqlParser.fs

@@ -93,7 +93,21 @@ type SqlVisitor() =
     let constraints =
       context.table_constraint ()
       |> Array.choose (fun c ->
-        if c.FOREIGN_() <> null then
+        match c with
+        | _ when c.PRIMARY_() <> null ->
+          { constraintName = None
+            columns = c.indexed_column () |> Array.map _.column_name().GetText() |> Array.toList
+            isAutoincrement = false }
+          |> PrimaryKey
+          |> Some
+
+        | _ when c.UNIQUE_() <> null ->
+          c.indexed_column ()
+          |> Array.map _.column_name().GetText()
+          |> Array.toList
+          |> Unique
+          |> Some
+        | _ when c.FOREIGN_() <> null ->
           let columns = c.column_name () |> Array.map _.GetText() |> Array.toList
           let refTable = c.foreign_key_clause().foreign_table().GetText()
 
@@ -108,8 +122,7 @@ type SqlVisitor() =
                 refTable = refTable
                 refColumns = refColumns }
           )
-        else
-          None)
+        | _ -> None)
       |> Array.toList
 
     Table

src/MigLib/Execution/Exec.fs

@@ -40,7 +40,18 @@ let internal dbElements (conn: SqliteConnection) =
   with e ->
     Error(Types.ReadSchemaFailed $"{e.Message}")
 
-let internal getDbFile (dir: DirectoryInfo) = $"{dir.FullName}/{dir.Name}.sqlite"
+[<Literal>]
+let migrateDbEnvVar = "migrate_db"
+
+let internal getDbFile (dir: DirectoryInfo) =
+  dotenv.net.DotEnv.Load()
+
+  let getEnv s =
+    Environment.GetEnvironmentVariable s |> Option.ofObj
+
+  match getEnv migrateDbEnvVar with
+  | Some x -> x
+  | None -> $"{dir.FullName}/{dir.Name}.sqlite"
 
 let internal dbSchema (dbFile: string) =
   result {
@@ -62,11 +73,11 @@ let internal readFile path =
   with e ->
     Error(Types.ReadFileFailed e.Message)
 
-type SqlSource = {name:string; content:string}
+type SqlSource = { name: string; content: string }
 
 let internal parseSqlFiles (sources: SqlSource list) =
   sources
-  |> List.map (fun s -> SqlParser.parse(s.name, s.content))
+  |> List.map (fun s -> SqlParser.parse (s.name, s.content))
   |> Solve.splitResult
   |> function
     | xs, [] ->
@@ -89,11 +100,11 @@ let internal readDirSql (dir: DirectoryInfo) =
   |> List.choose (fun f ->
     if f.Extension = ".sql" then
       let sql = f.OpenText().ReadToEnd()
-      {name = f.FullName; content = sql} |> Some
+      { name = f.FullName; content = sql } |> Some
     else
       None)
 
-let migrationStatementsForDb(dbFile:string, sources: SqlSource list) =
+let migrationStatementsForDb (dbFile: string, sources: SqlSource list) =
   result {
     let! expectedSchema = parseSqlFiles sources
     let! dbSchema = dbSchema dbFile
@@ -102,11 +113,12 @@ let migrationStatementsForDb(dbFile:string, sources: SqlSource list) =
 
 let migrationStatements () =
   let dir = Environment.CurrentDirectory
+
   result {
     let dir = DirectoryInfo dir
     let dbFile = getDbFile dir
     let sources = readDirSql dir
-    return! migrationStatementsForDb(dbFile, sources)
+    return! migrationStatementsForDb (dbFile, sources)
   }
 
 let generateMigrationScript (withColors: bool) =

src/MigLib/MigLib.fsproj

@@ -6,7 +6,7 @@
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
 
     <PackageId>MigLib</PackageId>
-    <Version>1.0.2</Version>
+    <Version>1.0.3</Version>
     <PackageOutputPath>./nupkg</PackageOutputPath>
     <InvariantGlobalization>true</InvariantGlobalization>
     <RootNamespace>migrate</RootNamespace>
@@ -25,30 +25,31 @@
 
   <ItemGroup>
     <Compile Include="AssemblyInfo.fs" />
-    <Compile Include="DeclarativeMigrations\Types.fs"/>
-    <Compile Include="DeclarativeMigrations\SqlParser.fs"/>
-    <Compile Include="DeclarativeMigrations\GenerateSql.fs"/>
-    <Compile Include="DeclarativeMigrations\Solve.fs"/>
-    <Compile Include="DeclarativeMigrations\Migration.fs"/>
-    <Compile Include="Execution\FormatSql.fs"/>
-    <Compile Include="Execution\Exec.fs"/>
+    <Compile Include="DeclarativeMigrations\Types.fs" />
+    <Compile Include="DeclarativeMigrations\SqlParser.fs" />
+    <Compile Include="DeclarativeMigrations\GenerateSql.fs" />
+    <Compile Include="DeclarativeMigrations\Solve.fs" />
+    <Compile Include="DeclarativeMigrations\Migration.fs" />
+    <Compile Include="Execution\FormatSql.fs" />
+    <Compile Include="Execution\Exec.fs" />
     <Compile Include="MigrationLog\ExecAndLog.fs" />
-    <Compile Include="ImportGoose\ImportGoose.fs"/>
+    <Compile Include="ImportGoose\ImportGoose.fs" />
     <Content Include="..\..\README.md" Pack="true" PackagePath="\" />
     <Content Include="..\..\images\logo.png" Pack="true" PackagePath="\" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="FSharp.Core"/>
-    <PackageReference Include="FsToolkit.ErrorHandling"/>
-    <PackageReference Include="Microsoft.Data.Sqlite"/>
-    <PackageReference Include="SqlParserCS"/>
-    <PackageReference Include="SqlPrettify"/>
-    <PackageReference Include="FSharpPlus"/>
+    <PackageReference Include="dotenv.net" />
+    <PackageReference Include="FSharp.Core" />
+    <PackageReference Include="FsToolkit.ErrorHandling" />
+    <PackageReference Include="Microsoft.Data.Sqlite" />
+    <PackageReference Include="SqlParserCS" />
+    <PackageReference Include="SqlPrettify" />
+    <PackageReference Include="FSharpPlus" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\SqliteParserCs\SqliteParserCs.csproj"/>
+    <ProjectReference Include="..\SqliteParserCs\SqliteParserCs.csproj" />
   </ItemGroup>
 
 </Project>

src/mig/mig.fsproj

@@ -10,7 +10,7 @@
     <PackageId>migtool</PackageId>
     <RootNamespace>migrate</RootNamespace>
     <AssemblyName>migrate</AssemblyName>
-    <Version>1.0.2</Version>
+    <Version>1.0.3</Version>
     <PackageOutputPath>./nupkg</PackageOutputPath>
     <InvariantGlobalization>true</InvariantGlobalization>