ariga · giautm · May 20, 2024 · May 18, 2024 · May 18, 2024 · May 18, 2024
diff --git a/README.md b/README.md
@@ -22,7 +22,7 @@ go get -u ariga.io/atlas-provider-gorm
 
 #### Standalone 
 
-If all of your GORM models exist in a single package, and either embed `gorm.Model` or contain `gorm` struct tags, 
+If all of your GORM models and [views](#views) exist in a single package, and the models either embed `gorm.Model` or contain `gorm` struct tags, 
 you can use the provider directly to load your GORM schema into Atlas.
 
 In your project directory, create a new file named `atlas.hcl` with the following contents:

diff --git a/internal/testdata/migrations/mysql/20240518091603.sql b/internal/testdata/migrations/mysql/20240518091603.sql
@@ -0,0 +1,10 @@
+-- Create "top_pet_owners" view
+CREATE VIEW `top_pet_owners` (
+  `user_id`,
+  `pet_count`
+) AS select `pets`.`user_id` AS `user_id`,count(`pets`.`id`) AS `pet_count` from `pets` group by `pets`.`user_id` order by `pet_count` desc limit 10;
+-- Create "working_aged_users" view
+CREATE VIEW `working_aged_users` (
+  `name`,
+  `age`
+) AS select `users`.`name` AS `name`,`users`.`age` AS `age` from `users` where (`users`.`age` between 18 and 65);
diff --git a/internal/testdata/migrations/mysql/atlas.sum b/internal/testdata/migrations/mysql/atlas.sum
@@ -1,3 +1,4 @@
-h1:EyWYG0960slDir9YpK58ESoedcEsH+CKiFHSuErul/s=
+h1:lKRYkpC/b7av3+2N9ZwAhoInac+KYoj12ZIPaAINpeI=
 20230627123246.sql h1:+bgzC3WJyyIR6Rv/FUvaNXJ1gkbKJlYcEMgp69yORIY=
 20240512024238.sql h1:2kQL4tE/tAhvXuozmRAJ3oXTo1KRz11QosVDw+0va14=
+20240518091603.sql h1:xNClqqRaOjXwg0julpsiPYsmqUcEL/hJel1iqYzi3DM=
diff --git a/internal/testdata/migrations/postgres/20240518091611.sql b/internal/testdata/migrations/postgres/20240518091611.sql
@@ -0,0 +1,18 @@
+-- Create "top_pet_owners" view
+CREATE VIEW "public"."top_pet_owners" (
+  "user_id",
+  "pet_count"
+) AS SELECT pets.user_id,
+    count(pets.id) AS pet_count
+   FROM pets
+  GROUP BY pets.user_id
+  ORDER BY (count(pets.id)) DESC
+ LIMIT 10;
+-- Create "working_aged_users" view
+CREATE VIEW "public"."working_aged_users" (
+  "name",
+  "age"
+) AS SELECT users.name,
+    users.age
+   FROM users
+  WHERE ((users.age >= 18) AND (users.age <= 65));
diff --git a/internal/testdata/migrations/postgres/atlas.sum b/internal/testdata/migrations/postgres/atlas.sum
@@ -1,3 +1,4 @@
-h1:uqmcTXuu1CtyKBXEPvSoc31Grcd1CJSGrp1S1l7aKZA=
+h1:LR1ImLA5ZOcbBr9yHMReTtaRiM6dVScC6Xefy3kpxWI=
 20230627123049.sql h1:1jYJM2+VCr9152vg6gayCrcEvuT/FE7ufOyZ86VLaOE=
 20240512024223.sql h1:RY4w148OJBBr5sXpfBq6B48p/1cFrTEpH4TlwD7mUps=
+20240518091611.sql h1:3Kv6mYS8ML72H6HE5qr/a2gdVUrfWuHVufP/1wl70vE=
diff --git a/internal/testdata/migrations/sqlite/20240518091437.sql b/internal/testdata/migrations/sqlite/20240518091437.sql
@@ -0,0 +1,10 @@
+-- Create "top_pet_owners" view
+CREATE VIEW `top_pet_owners` (
+  `user_id`,
+  `pet_count`
+) AS SELECT user_id, COUNT(id) AS pet_count FROM pets GROUP BY user_id ORDER BY pet_count DESC LIMIT 10;
+-- Create "working_aged_users" view
+CREATE VIEW `working_aged_users` (
+  `name`,
+  `age`
+) AS SELECT name, age FROM `users` WHERE age BETWEEN 18 AND 65;
diff --git a/internal/testdata/migrations/sqlite/atlas.sum b/internal/testdata/migrations/sqlite/atlas.sum
@@ -1,3 +1,4 @@
-h1:PLxrE6aQnCB/DzDmVKw6PWEawC1zPVYEB5fQNJ960C4=
+h1:4HTi5BBlSSs2F/Rg17KQCcuEsVY/dDwyF2yzjThRcd0=
 20230627123228.sql h1:YfwJdN73sWz1G5/0tU2BtGLyzJCfRQr8blTSquUZ+qo=
 20240511123637.sql h1:Kbk3wUzTfBbq8mDdTT08hP93ecNU0y5oTL+O8idEcdQ=
+20240518091437.sql h1:svMANRZuZDvgzqO3iyNLUjrUrK8BTMEB2f0NV3d5sJo=
diff --git a/internal/testdata/migrations/sqlserver/20240518091510.sql b/internal/testdata/migrations/sqlserver/20240518091510.sql
@@ -0,0 +1,10 @@
+-- Create "top_pet_owners" view
+CREATE VIEW [top_pet_owners] (
+  [user_id],
+  [pet_count]
+) AS SELECT user_id, COUNT(id) AS pet_count FROM pets GROUP BY user_id ORDER BY pet_count DESC OFFSET 0 ROWS FETCH NEXT 10 ROWS ONLY;
+-- Create "working_aged_users" view
+CREATE VIEW [working_aged_users] (
+  [name],
+  [age]
+) AS SELECT name, age FROM "users" WHERE age BETWEEN 18 AND 65;
diff --git a/internal/testdata/migrations/sqlserver/atlas.sum b/internal/testdata/migrations/sqlserver/atlas.sum
@@ -1,3 +1,4 @@
-h1:wFBjEJ2HW3DrEa+JbxBrEd/i01JNYWYOFL3R3u9esTs=
+h1:24mg+pUG3Z4l321YP5s1fRPPaAg6sJC8VR62qPXClTw=
 20240124151658.sql h1:KaWALlql7BBV3oPVRT4rn+dvZaolhDmgbTgUPxIhauU=
 20240512024328.sql h1:IBON1V3jlts+AqxRhejN82SE7/BIXSUWM0SQ0pvw4wc=
+20240518091510.sql h1:CCFQHjVI+5dLXCgoPSERCHhyGBZl7QistZlrs1I5170=
diff --git a/main.go b/main.go
@@ -19,6 +19,8 @@ import (
 
 	"github.com/alecthomas/kong"
 	"golang.org/x/tools/go/packages"
+
+	"ariga.io/atlas-provider-gorm/gormschema"
 )
 
 var (
@@ -46,13 +48,27 @@ type LoadCmd struct {
 	out     io.Writer
 }
 
+var viewDefiner = reflect.TypeOf((*gormschema.ViewDefiner)(nil)).Elem()
+
 func (c *LoadCmd) Run() error {
-	cfg := &packages.Config{Mode: packages.NeedName | packages.NeedTypes | packages.NeedTypesInfo | packages.NeedModule | packages.NeedDeps}
-	pkgs, err := packages.Load(cfg, c.Path)
-	if err != nil {
-		return err
+	cfg := &packages.Config{
+		Mode: packages.NeedName | packages.NeedTypes | packages.NeedTypesInfo | packages.NeedModule | packages.NeedDeps,
+	}
+	var models []model
+	switch pkgs, err := packages.Load(cfg, c.Path, viewDefiner.PkgPath()); {
+	case err != nil:
+		return fmt.Errorf("loading package: %w", err)
+	case len(pkgs) != 2:
+		return fmt.Errorf("missing package information for: %s", c.Path)
+	default:
+		schemaPkg, modelsPkg := pkgs[0], pkgs[1]
+		if schemaPkg.PkgPath != viewDefiner.PkgPath() {
+			schemaPkg, modelsPkg = pkgs[1], pkgs[0]
+		}
+		models = gatherModels(modelsPkg, schemaPkg.Types.Scope().
+			Lookup(viewDefiner.Name()).Type().
+			Underlying().(*types.Interface))
 	}
-	models := gatherModels(pkgs)
 	p := Payload{
 		Models:  models,
 		Dialect: c.Dialect,
@@ -140,21 +156,19 @@ type model struct {
 	Name       string
 }
 
-func gatherModels(pkgs []*packages.Package) []model {
+func gatherModels(pkg *packages.Package, view *types.Interface) []model {
 	var models []model
-	for _, pkg := range pkgs {
-		for k, v := range pkg.TypesInfo.Defs {
-			_, ok := v.(*types.TypeName)
-			if !ok || !k.IsExported() {
-				continue
-			}
-			if isGORMModel(k.Obj.Decl) {
-				models = append(models, model{
-					ImportPath: pkg.PkgPath,
-					Name:       k.Name,
-					PkgName:    pkg.Name,
-				})
-			}
+	for k, v := range pkg.TypesInfo.Defs {
+		typ, ok := v.(*types.TypeName)
+		if !ok || !k.IsExported() {
+			continue
+		}
+		if isGORMModel(k.Obj.Decl) || types.Implements(typ.Type(), view) {
+			models = append(models, model{
+				ImportPath: pkg.PkgPath,
+				Name:       k.Name,
+				PkgName:    pkg.Name,
+			})
 		}
 	}
 	// Return models in deterministic order.

diff --git a/main_test.go b/main_test.go
@@ -29,7 +29,9 @@ func TestLoad(t *testing.T) {
 func TestDeterministicOutput(t *testing.T) {
 	expected := "CREATE TABLE `users` (`id` integer,`created_at` datetime,`updated_at` datetime,`deleted_at` datetime,`name` text,`age` integer,PRIMARY KEY (`id`));\n" +
 		"CREATE INDEX `idx_users_deleted_at` ON `users`(`deleted_at`);\n" +
-		"CREATE TABLE `pets` (`id` integer,`created_at` datetime,`updated_at` datetime,`deleted_at` datetime,`name` text,`user_id` integer,PRIMARY KEY (`id`),CONSTRAINT `fk_users_pets` FOREIGN KEY (`user_id`) REFERENCES `users`(`id`));\nCREATE INDEX `idx_pets_deleted_at` ON `pets`(`deleted_at`);\n\n"
+		"CREATE TABLE `pets` (`id` integer,`created_at` datetime,`updated_at` datetime,`deleted_at` datetime,`name` text,`user_id` integer,PRIMARY KEY (`id`),CONSTRAINT `fk_users_pets` FOREIGN KEY (`user_id`) REFERENCES `users`(`id`));\nCREATE INDEX `idx_pets_deleted_at` ON `pets`(`deleted_at`);\n" +
+		"CREATE VIEW top_pet_owners AS SELECT user_id, COUNT(id) AS pet_count FROM pets GROUP BY user_id ORDER BY pet_count DESC LIMIT 10;\n" +
+		"CREATE VIEW working_aged_users AS SELECT name, age FROM `users` WHERE age BETWEEN 18 AND 65;\n\n"
 	cmd := &LoadCmd{
 		Path:    "./internal/testdata/models",
 		Dialect: "sqlite",