Skip to content

Commit

Permalink
v6.0.4 (#720)
Browse files Browse the repository at this point in the history
* fix: improve model ID field customization (#604)

Updates places where `"id"` was hardcoded instead of using `model.IDField()`.

* Ensure uninitialized map is initialized when unmarshaling json
Add tests for this scenario

* exclude migration_table_name from connection string

* add test for OptionsString

* Add support for pointer FKs when preloading a belongs_to association (#602)

* feat: support context-aware tablenames (#614)

This patch adds a feature which enables pop to pass down the connection context to the model's TableName() function by implementing TableName(ctx context.Context) string. The context can be used to dynamically generate tablenames which can be important for prefixed or generic tables and other use cases.

* Bump pg deps (#616)

* Reset to development

* bumping pgx and pgconn versions

Co-authored-by: Stanislas Michalak <[email protected]>
Co-authored-by: Larry M Jordan <[email protected]>

* Latest from master (#620)

* Latest from development (#617)

* fix: improve model ID field customization (#604)

Updates places where `"id"` was hardcoded instead of using `model.IDField()`.

* Ensure uninitialized map is initialized when unmarshaling json
Add tests for this scenario

* exclude migration_table_name from connection string

* add test for OptionsString

* Add support for pointer FKs when preloading a belongs_to association (#602)

* feat: support context-aware tablenames (#614)

This patch adds a feature which enables pop to pass down the connection context to the model's TableName() function by implementing TableName(ctx context.Context) string. The context can be used to dynamically generate tablenames which can be important for prefixed or generic tables and other use cases.

* Bump pg deps (#616)

* Reset to development

* bumping pgx and pgconn versions

Co-authored-by: Stanislas Michalak <[email protected]>
Co-authored-by: Larry M Jordan <[email protected]>

Co-authored-by: Patrik <[email protected]>
Co-authored-by: Michael Montgomery <[email protected]>
Co-authored-by: kyrozetera <[email protected]>
Co-authored-by: Reggie Riser <[email protected]>
Co-authored-by: hackerman <[email protected]>
Co-authored-by: Stanislas Michalak <[email protected]>
Co-authored-by: Larry M Jordan <[email protected]>

* adding goreleaser syntaz (#619)

Co-authored-by: Patrik <[email protected]>
Co-authored-by: Michael Montgomery <[email protected]>
Co-authored-by: kyrozetera <[email protected]>
Co-authored-by: Reggie Riser <[email protected]>
Co-authored-by: hackerman <[email protected]>
Co-authored-by: Stanislas Michalak <[email protected]>
Co-authored-by: Larry M Jordan <[email protected]>

* Resolve issues in UPDATE and DELETE when using schemas (#618)

* Resolve MySQL issues and improve test migrations
* Bump CockroachDB to maintained and supported versions
Version 2.1 has reached EoL in 2019

Signed-off-by: aeneasr <[email protected]>

* Use `PaginatorPageKey` and `PaginatorPerPageKey` variables (#615)

* update pagination_test

* Pass Time structure into timestamp update functions. (#625)

Closes #624

* Allow nullable JSONB and resolve MySQL regression (#639)

* Allow passing args to `Order` (#630)

* Added connection maximum idle time configuration (#635)

This PR add the possibility to configure the connection maximum idle time (https://golang.org/pkg/database/sql/#DB.SetConnMaxIdleTime).

Closes #632

BREAKING CHANGE: Requires Go 1.15 from now on.

* Bump sqlite to 3.35.4 / 1.14.7 (#642)

* Update pg, pgx, sqlx (#643)

- `jackc/pgx` to  version `v4.11.0`.
- `jmoiron/sqlx` to version`v1.3.3`
- `lib/pq` to version`v1.10.1`

* Fix Inner has many associations when passing on multiple arguments (#633)

* Fix Inner has many associations when passing on multiple arguments for inner fields

* Fix broken tests

* clean up extractFieldAndInnerFields function

Co-authored-by: hackerman <[email protected]>
Co-authored-by: Antonio Pagano <[email protected]>

* Remove many to many TX condition for EagerPreload (#645)

* Remove the need to use Tx when loading many to many associations

* replace TX access to create a new tx.Store.Transaction() object

* Added fix/tests for has_many with pointer foreign key (#647)

Co-authored-by: Antonio Pagano <[email protected]>

* Export WhereID, Alias, WhereNamedID (#637)

This patch export some model convenience functions which are useful when constructing queries outside of pop: custom updates, deletes, inserts, ...

Signed-off-by: aeneasr <[email protected]>

Co-authored-by: Antonio Pagano <[email protected]>

* fix: log model values everywhere (#656)

Some SQL logs were missing the values as argument. This adds all places

* Add delete to query builder (#658)

This allows writing delete queries without knowing the exact primary key or for composite keys.
`Destroy` only allows to delete by primary key, but there are many cases where you want to delete multiple rows or by some other query than the ID.

See #29

* Sort down migrations (#657)

Basically, just reversing the up migration order does not work, as that puts "all" migrations before specific ones. Therefore, I added implemented the proper `Less` function for down migrations explicitly.

Related #533

Co-authored-by: hackerman <[email protected]>

* Preserve eager information when validating models (#664) (#665)

Co-authored-by: Karl Haas <[email protected]>

* Migrate from packr to fs (#667)

* Updating Pgx (#660)

* adding goreleaser syntaz

* updating pgx now really

* Migrate from packr to fs

* Migrate to v6

* Use old build tags

* Update error handling

* Fix error after rebase

* Fix error handling

* Fix filenames for embed Go 1.16 usage

Co-authored-by: Antonio Pagano <[email protected]>

* Task merging master (#669)

* v5.3.4 (#644)

* fix: improve model ID field customization (#604)

Updates places where `"id"` was hardcoded instead of using `model.IDField()`.

* Ensure uninitialized map is initialized when unmarshaling json
Add tests for this scenario

* exclude migration_table_name from connection string

* add test for OptionsString

* Add support for pointer FKs when preloading a belongs_to association (#602)

* feat: support context-aware tablenames (#614)

This patch adds a feature which enables pop to pass down the connection context to the model's TableName() function by implementing TableName(ctx context.Context) string. The context can be used to dynamically generate tablenames which can be important for prefixed or generic tables and other use cases.

* Bump pg deps (#616)

* Reset to development

* bumping pgx and pgconn versions

Co-authored-by: Stanislas Michalak <[email protected]>
Co-authored-by: Larry M Jordan <[email protected]>

* Latest from master (#620)

* Latest from development (#617)

* fix: improve model ID field customization (#604)

Updates places where `"id"` was hardcoded instead of using `model.IDField()`.

* Ensure uninitialized map is initialized when unmarshaling json
Add tests for this scenario

* exclude migration_table_name from connection string

* add test for OptionsString

* Add support for pointer FKs when preloading a belongs_to association (#602)

* feat: support context-aware tablenames (#614)

This patch adds a feature which enables pop to pass down the connection context to the model's TableName() function by implementing TableName(ctx context.Context) string. The context can be used to dynamically generate tablenames which can be important for prefixed or generic tables and other use cases.

* Bump pg deps (#616)

* Reset to development

* bumping pgx and pgconn versions

Co-authored-by: Stanislas Michalak <[email protected]>
Co-authored-by: Larry M Jordan <[email protected]>

Co-authored-by: Patrik <[email protected]>
Co-authored-by: Michael Montgomery <[email protected]>
Co-authored-by: kyrozetera <[email protected]>
Co-authored-by: Reggie Riser <[email protected]>
Co-authored-by: hackerman <[email protected]>
Co-authored-by: Stanislas Michalak <[email protected]>
Co-authored-by: Larry M Jordan <[email protected]>

* adding goreleaser syntaz (#619)

Co-authored-by: Patrik <[email protected]>
Co-authored-by: Michael Montgomery <[email protected]>
Co-authored-by: kyrozetera <[email protected]>
Co-authored-by: Reggie Riser <[email protected]>
Co-authored-by: hackerman <[email protected]>
Co-authored-by: Stanislas Michalak <[email protected]>
Co-authored-by: Larry M Jordan <[email protected]>

* Resolve issues in UPDATE and DELETE when using schemas (#618)

* Resolve MySQL issues and improve test migrations
* Bump CockroachDB to maintained and supported versions
Version 2.1 has reached EoL in 2019

Signed-off-by: aeneasr <[email protected]>

* Use `PaginatorPageKey` and `PaginatorPerPageKey` variables (#615)

* update pagination_test

* Pass Time structure into timestamp update functions. (#625)

Closes #624

* Allow nullable JSONB and resolve MySQL regression (#639)

* Allow passing args to `Order` (#630)

* Added connection maximum idle time configuration (#635)

This PR add the possibility to configure the connection maximum idle time (https://golang.org/pkg/database/sql/#DB.SetConnMaxIdleTime).

Closes #632

BREAKING CHANGE: Requires Go 1.15 from now on.

* Bump sqlite to 3.35.4 / 1.14.7 (#642)

* Update pg, pgx, sqlx (#643)

- `jackc/pgx` to  version `v4.11.0`.
- `jmoiron/sqlx` to version`v1.3.3`
- `lib/pq` to version`v1.10.1`

* Fix Inner has many associations when passing on multiple arguments (#633)

* Fix Inner has many associations when passing on multiple arguments for inner fields

* Fix broken tests

* clean up extractFieldAndInnerFields function

Co-authored-by: hackerman <[email protected]>
Co-authored-by: Antonio Pagano <[email protected]>

* Remove many to many TX condition for EagerPreload (#645)

* Remove the need to use Tx when loading many to many associations

* replace TX access to create a new tx.Store.Transaction() object

* Added fix/tests for has_many with pointer foreign key (#647)

Co-authored-by: Antonio Pagano <[email protected]>

Co-authored-by: Patrik <[email protected]>
Co-authored-by: Michael Montgomery <[email protected]>
Co-authored-by: kyrozetera <[email protected]>
Co-authored-by: Reggie Riser <[email protected]>
Co-authored-by: hackerman <[email protected]>
Co-authored-by: Stanislas Michalak <[email protected]>
Co-authored-by: Larry M Jordan <[email protected]>
Co-authored-by: Brian Buchholz <[email protected]>
Co-authored-by: Mike Pontillo <[email protected]>
Co-authored-by: Benjamin Blattberg <[email protected]>
Co-authored-by: Jonathan Duck <[email protected]>
Co-authored-by: Arthur Knoepflin <[email protected]>

* Updating Pgx (#660)

* adding goreleaser syntaz

* updating pgx now really

* tidying

Co-authored-by: Patrik <[email protected]>
Co-authored-by: Michael Montgomery <[email protected]>
Co-authored-by: kyrozetera <[email protected]>
Co-authored-by: Reggie Riser <[email protected]>
Co-authored-by: hackerman <[email protected]>
Co-authored-by: Stanislas Michalak <[email protected]>
Co-authored-by: Larry M Jordan <[email protected]>
Co-authored-by: Brian Buchholz <[email protected]>
Co-authored-by: Mike Pontillo <[email protected]>
Co-authored-by: Benjamin Blattberg <[email protected]>
Co-authored-by: Jonathan Duck <[email protected]>
Co-authored-by: Arthur Knoepflin <[email protected]>

* Replace removed  command

The  command has been removed from the CLI. This patch introduces a new mechanism to reliably dump the SQL schema for CockroachDB.

* Resolve `EagerPreload` panic caused for pointer references

Resolves a panic where `EagerPreload` tried to set `reflect.Struct` for a `reflect.Pointer` on 1.. associations.

Signed-off-by: aeneasr <[email protected]>

* Resolve `EagerPreload` panic caused by NullUUID

Resolves a panic where `EagerPreload` was trying to set UUID into NullUUID.

Signed-off-by: aeneasr <[email protected]>

* Support pointers in n+1 `Eager` loading

Resolves an issue where n+1 eager associations would error with a double pointer in `associations.ForStruct`.

Signed-off-by: aeneasr <[email protected]>

* Improve error message of associations.ForStruct

Signed-off-by: aeneasr <[email protected]>

* Add test cases for `IsZeroOfUnderlyingType`

Signed-off-by: aeneasr <[email protected]>

* Resolve an obscure bug where empty structs got loaded for NULL foreign keys

Closes #139

Signed-off-by: aeneasr <[email protected]>

* Resolve association regression in finders.go

Signed-off-by: aeneasr <[email protected]>

* Use dedicated migrations for preloading regression test

Signed-off-by: aeneasr <[email protected]>

* Fix code regression

Signed-off-by: aeneasr <[email protected]>

* Fix test code regressions

Signed-off-by: aeneasr <[email protected]>

* Fix sql migration order

Signed-off-by: aeneasr <[email protected]>

* Resolve order issue in test

* Ignore order when testing for nil values in test

* Pass Context during exec in create. (#688)

* feat: support embedded struct fields (#691)

* test: use `T.TempDir` to create temporary test directory

This commit replaces `ioutil.TempDir` with `t.TempDir` in tests. The
directory created by `t.TempDir` is automatically removed when the test
and all its subtests complete.

Prior to this commit, temporary directory created using `ioutil.TempDir`
needs to be removed manually by calling `os.RemoveAll`, which is omitted
in some tests. The error handling boilerplate e.g.
	defer func() {
		if err := os.RemoveAll(dir); err != nil {
			t.Fatal(err)
		}
	}
is also tedious, but `t.TempDir` handles this for us nicely.

Reference: https://pkg.go.dev/testing#T.TempDir
Signed-off-by: Eng Zer Jun <[email protected]>

* task: adding next version number

* fix: associations for embedded fields

* test: add other fields to duplicate type, because of some kind of query builder cache

* feat: implement UpdateQuery

This commit introduces a new function, UpdateQuery, that enables updating all
rows matched by a query. It can be used for conditional updates.

* feat: allow customizing the time used for CreatedAt/UpdatedAt

* feat: allow using SQLite without built tag via include (#662)

* preparing go1.18 support (package specific workflow)

* feat: darwin arm64 binary (#690)

* feat: arm64 binary

* v6.0.2 (#704)

* fix: improve model ID field customization (#604)

Updates places where `"id"` was hardcoded instead of using `model.IDField()`.

* Ensure uninitialized map is initialized when unmarshaling json
Add tests for this scenario

* exclude migration_table_name from connection string

* add test for OptionsString

* Add support for pointer FKs when preloading a belongs_to association (#602)

* feat: support context-aware tablenames (#614)

This patch adds a feature which enables pop to pass down the connection context to the model's TableName() function by implementing TableName(ctx context.Context) string. The context can be used to dynamically generate tablenames which can be important for prefixed or generic tables and other use cases.

* Bump pg deps (#616)

* Reset to development

* bumping pgx and pgconn versions

Co-authored-by: Stanislas Michalak <[email protected]>
Co-authored-by: Larry M Jordan <[email protected]>

* Latest from master (#620)

* Latest from development (#617)

* fix: improve model ID field customization (#604)

Updates places where `"id"` was hardcoded instead of using `model.IDField()`.

* Ensure uninitialized map is initialized when unmarshaling json
Add tests for this scenario

* exclude migration_table_name from connection string

* add test for OptionsString

* Add support for pointer FKs when preloading a belongs_to association (#602)

* feat: support context-aware tablenames (#614)

This patch adds a feature which enables pop to pass down the connection context to the model's TableName() function by implementing TableName(ctx context.Context) string. The context can be used to dynamically generate tablenames which can be important for prefixed or generic tables and other use cases.

* Bump pg deps (#616)

* Reset to development

* bumping pgx and pgconn versions

Co-authored-by: Stanislas Michalak <[email protected]>
Co-authored-by: Larry M Jordan <[email protected]>

Co-authored-by: Patrik <[email protected]>
Co-authored-by: Michael Montgomery <[email protected]>
Co-authored-by: kyrozetera <[email protected]>
Co-authored-by: Reggie Riser <[email protected]>
Co-authored-by: hackerman <[email protected]>
Co-authored-by: Stanislas Michalak <[email protected]>
Co-authored-by: Larry M Jordan <[email protected]>

* adding goreleaser syntaz (#619)

Co-authored-by: Patrik <[email protected]>
Co-authored-by: Michael Montgomery <[email protected]>
Co-authored-by: kyrozetera <[email protected]>
Co-authored-by: Reggie Riser <[email protected]>
Co-authored-by: hackerman <[email protected]>
Co-authored-by: Stanislas Michalak <[email protected]>
Co-authored-by: Larry M Jordan <[email protected]>

* Resolve issues in UPDATE and DELETE when using schemas (#618)

* Resolve MySQL issues and improve test migrations
* Bump CockroachDB to maintained and supported versions
Version 2.1 has reached EoL in 2019

Signed-off-by: aeneasr <[email protected]>

* Use `PaginatorPageKey` and `PaginatorPerPageKey` variables (#615)

* update pagination_test

* Pass Time structure into timestamp update functions. (#625)

Closes #624

* Allow nullable JSONB and resolve MySQL regression (#639)

* Allow passing args to `Order` (#630)

* Added connection maximum idle time configuration (#635)

This PR add the possibility to configure the connection maximum idle time (https://golang.org/pkg/database/sql/#DB.SetConnMaxIdleTime).

Closes #632

BREAKING CHANGE: Requires Go 1.15 from now on.

* Bump sqlite to 3.35.4 / 1.14.7 (#642)

* Update pg, pgx, sqlx (#643)

- `jackc/pgx` to  version `v4.11.0`.
- `jmoiron/sqlx` to version`v1.3.3`
- `lib/pq` to version`v1.10.1`

* Fix Inner has many associations when passing on multiple arguments (#633)

* Fix Inner has many associations when passing on multiple arguments for inner fields

* Fix broken tests

* clean up extractFieldAndInnerFields function

Co-authored-by: hackerman <[email protected]>
Co-authored-by: Antonio Pagano <[email protected]>

* Remove many to many TX condition for EagerPreload (#645)

* Remove the need to use Tx when loading many to many associations

* replace TX access to create a new tx.Store.Transaction() object

* Added fix/tests for has_many with pointer foreign key (#647)

Co-authored-by: Antonio Pagano <[email protected]>

* Export WhereID, Alias, WhereNamedID (#637)

This patch export some model convenience functions which are useful when constructing queries outside of pop: custom updates, deletes, inserts, ...

Signed-off-by: aeneasr <[email protected]>

Co-authored-by: Antonio Pagano <[email protected]>

* fix: log model values everywhere (#656)

Some SQL logs were missing the values as argument. This adds all places

* Add delete to query builder (#658)

This allows writing delete queries without knowing the exact primary key or for composite keys.
`Destroy` only allows to delete by primary key, but there are many cases where you want to delete multiple rows or by some other query than the ID.

See #29

* Sort down migrations (#657)

Basically, just reversing the up migration order does not work, as that puts "all" migrations before specific ones. Therefore, I added implemented the proper `Less` function for down migrations explicitly.

Related #533

Co-authored-by: hackerman <[email protected]>

* Preserve eager information when validating models (#664) (#665)

Co-authored-by: Karl Haas <[email protected]>

* Migrate from packr to fs (#667)

* Updating Pgx (#660)

* adding goreleaser syntaz

* updating pgx now really

* Migrate from packr to fs

* Migrate to v6

* Use old build tags

* Update error handling

* Fix error after rebase

* Fix error handling

* Fix filenames for embed Go 1.16 usage

Co-authored-by: Antonio Pagano <[email protected]>

* Task merging master (#669)

* v5.3.4 (#644)

* fix: improve model ID field customization (#604)

Updates places where `"id"` was hardcoded instead of using `model.IDField()`.

* Ensure uninitialized map is initialized when unmarshaling json
Add tests for this scenario

* exclude migration_table_name from connection string

* add test for OptionsString

* Add support for pointer FKs when preloading a belongs_to association (#602)

* feat: support context-aware tablenames (#614)

This patch adds a feature which enables pop to pass down the connection context to the model's TableName() function by implementing TableName(ctx context.Context) string. The context can be used to dynamically generate tablenames which can be important for prefixed or generic tables and other use cases.

* Bump pg deps (#616)

* Reset to development

* bumping pgx and pgconn versions

Co-authored-by: Stanislas Michalak <[email protected]>
Co-authored-by: Larry M Jordan <[email protected]>

* Latest from master (#620)

* Latest from development (#617)

* fix: improve model ID field customization (#604)

Updates places where `"id"` was hardcoded instead of using `model.IDField()`.

* Ensure uninitialized map is initialized when unmarshaling json
Add tests for this scenario

* exclude migration_table_name from connection string

* add test for OptionsString

* Add support for pointer FKs when preloading a belongs_to association (#602)

* feat: support context-aware tablenames (#614)

This patch adds a feature which enables pop to pass down the connection context to the model's TableName() function by implementing TableName(ctx context.Context) string. The context can be used to dynamically generate tablenames which can be important for prefixed or generic tables and other use cases.

* Bump pg deps (#616)

* Reset to development

* bumping pgx and pgconn versions

Co-authored-by: Stanislas Michalak <[email protected]>
Co-authored-by: Larry M Jordan <[email protected]>

Co-authored-by: Patrik <[email protected]>
Co-authored-by: Michael Montgomery <[email protected]>
Co-authored-by: kyrozetera <[email protected]>
Co-authored-by: Reggie Riser <[email protected]>
Co-authored-by: hackerman <[email protected]>
Co-authored-by: Stanislas Michalak <[email protected]>
Co-authored-by: Larry M Jordan <[email protected]>

* adding goreleaser syntaz (#619)

Co-authored-by: Patrik <[email protected]>
Co-authored-by: Michael Montgomery <[email protected]>
Co-authored-by: kyrozetera <[email protected]>
Co-authored-by: Reggie Riser <[email protected]>
Co-authored-by: hackerman <[email protected]>
Co-authored-by: Stanislas Michalak <[email protected]>
Co-authored-by: Larry M Jordan <[email protected]>

* Resolve issues in UPDATE and DELETE when using schemas (#618)

* Resolve MySQL issues and improve test migrations
* Bump CockroachDB to maintained and supported versions
Version 2.1 has reached EoL in 2019

Signed-off-by: aeneasr <[email protected]>

* Use `PaginatorPageKey` and `PaginatorPerPageKey` variables (#615)

* update pagination_test

* Pass Time structure into timestamp update functions. (#625)

Closes #624

* Allow nullable JSONB and resolve MySQL regression (#639)

* Allow passing args to `Order` (#630)

* Added connection maximum idle time configuration (#635)

This PR add the possibility to configure the connection maximum idle time (https://golang.org/pkg/database/sql/#DB.SetConnMaxIdleTime).

Closes #632

BREAKING CHANGE: Requires Go 1.15 from now on.

* Bump sqlite to 3.35.4 / 1.14.7 (#642)

* Update pg, pgx, sqlx (#643)

- `jackc/pgx` to  version `v4.11.0`.
- `jmoiron/sqlx` to version`v1.3.3`
- `lib/pq` to version`v1.10.1`

* Fix Inner has many associations when passing on multiple arguments (#633)

* Fix Inner has many associations when passing on multiple arguments for inner fields

* Fix broken tests

* clean up extractFieldAndInnerFields function

Co-authored-by: hackerman <[email protected]>
Co-authored-by: Antonio Pagano <[email protected]>

* Remove many to many TX condition for EagerPreload (#645)

* Remove the need to use Tx when loading many to many associations

* replace TX access to create a new tx.Store.Transaction() object

* Added fix/tests for has_many with pointer foreign key (#647)

Co-authored-by: Antonio Pagano <[email protected]>

Co-authored-by: Patrik <[email protected]>
Co-authored-by: Michael Montgomery <[email protected]>
Co-authored-by: kyrozetera <[email protected]>
Co-authored-by: Reggie Riser <[email protected]>
Co-authored-by: hackerman <[email protected]>
Co-authored-by: Stanislas Michalak <[email protected]>
Co-authored-by: Larry M Jordan <[email protected]>
Co-authored-by: Brian Buchholz <[email protected]>
Co-authored-by: Mike Pontillo <[email protected]>
Co-authored-by: Benjamin Blattberg <[email protected]>
Co-authored-by: Jonathan Duck <[email protected]>
Co-authored-by: Arthur Knoepflin <[email protected]>

* Updating Pgx (#660)

* adding goreleaser syntaz

* updating pgx now really

* tidying

Co-authored-by: Patrik <[email protected]>
Co-authored-by: Michael Montgomery <[email protected]>
Co-authored-by: kyrozetera <[email protected]>
Co-authored-by: Reggie Riser <[email protected]>
Co-authored-by: hackerman <[email protected]>
Co-authored-by: Stanislas Michalak <[email protected]>
Co-authored-by: Larry M Jordan <[email protected]>
Co-authored-by: Brian Buchholz <[email protected]>
Co-authored-by: Mike Pontillo <[email protected]>
Co-authored-by: Benjamin Blattberg <[email protected]>
Co-authored-by: Jonathan Duck <[email protected]>
Co-authored-by: Arthur Knoepflin <[email protected]>

* Replace removed  command

The  command has been removed from the CLI. This patch introduces a new mechanism to reliably dump the SQL schema for CockroachDB.

* Resolve `EagerPreload` panic caused for pointer references

Resolves a panic where `EagerPreload` tried to set `reflect.Struct` for a `reflect.Pointer` on 1.. associations.

Signed-off-by: aeneasr <[email protected]>

* Resolve `EagerPreload` panic caused by NullUUID

Resolves a panic where `EagerPreload` was trying to set UUID into NullUUID.

Signed-off-by: aeneasr <[email protected]>

* Support pointers in n+1 `Eager` loading

Resolves an issue where n+1 eager associations would error with a double pointer in `associations.ForStruct`.

Signed-off-by: aeneasr <[email protected]>

* Improve error message of associations.ForStruct

Signed-off-by: aeneasr <[email protected]>

* Add test cases for `IsZeroOfUnderlyingType`

Signed-off-by: aeneasr <[email protected]>

* Resolve an obscure bug where empty structs got loaded for NULL foreign keys

Closes #139

Signed-off-by: aeneasr <[email protected]>

* Resolve association regression in finders.go

Signed-off-by: aeneasr <[email protected]>

* Use dedicated migrations for preloading regression test

Signed-off-by: aeneasr <[email protected]>

* Fix code regression

Signed-off-by: aeneasr <[email protected]>

* Fix test code regressions

Signed-off-by: aeneasr <[email protected]>

* Fix sql migration order

Signed-off-by: aeneasr <[email protected]>

* Resolve order issue in test

* Ignore order when testing for nil values in test

* Pass Context during exec in create. (#688)

* feat: support embedded struct fields (#691)

* test: use `T.TempDir` to create temporary test directory

This commit replaces `ioutil.TempDir` with `t.TempDir` in tests. The
directory created by `t.TempDir` is automatically removed when the test
and all its subtests complete.

Prior to this commit, temporary directory created using `ioutil.TempDir`
needs to be removed manually by calling `os.RemoveAll`, which is omitted
in some tests. The error handling boilerplate e.g.
	defer func() {
		if err := os.RemoveAll(dir); err != nil {
			t.Fatal(err)
		}
	}
is also tedious, but `t.TempDir` handles this for us nicely.

Reference: https://pkg.go.dev/testing#T.TempDir
Signed-off-by: Eng Zer Jun <[email protected]>

* task: adding next version number

Co-authored-by: Patrik <[email protected]>
Co-authored-by: Michael Montgomery <[email protected]>
Co-authored-by: kyrozetera <[email protected]>
Co-authored-by: Reggie Riser <[email protected]>
Co-authored-by: hackerman <[email protected]>
Co-authored-by: Stanislas Michalak <[email protected]>
Co-authored-by: Larry M Jordan <[email protected]>
Co-authored-by: Brian Buchholz <[email protected]>
Co-authored-by: Mike Pontillo <[email protected]>
Co-authored-by: Benjamin Blattberg <[email protected]>
Co-authored-by: Jonathan Duck <[email protected]>
Co-authored-by: Arthur Knoepflin <[email protected]>
Co-authored-by: karlhaas <[email protected]>
Co-authored-by: Karl Haas <[email protected]>
Co-authored-by: Matthias Fasching <[email protected]>
Co-authored-by: Martin Eigenbrodt <[email protected]>
Co-authored-by: Eng Zer Jun <[email protected]>

* play time

* chore: updates

* chore: reset formatting

Co-authored-by: Antonio Pagano <[email protected]>
Co-authored-by: Patrik <[email protected]>
Co-authored-by: Michael Montgomery <[email protected]>
Co-authored-by: kyrozetera <[email protected]>
Co-authored-by: Reggie Riser <[email protected]>
Co-authored-by: hackerman <[email protected]>
Co-authored-by: Stanislas Michalak <[email protected]>
Co-authored-by: Larry M Jordan <[email protected]>
Co-authored-by: Brian Buchholz <[email protected]>
Co-authored-by: Mike Pontillo <[email protected]>
Co-authored-by: Benjamin Blattberg <[email protected]>
Co-authored-by: Jonathan Duck <[email protected]>
Co-authored-by: Arthur Knoepflin <[email protected]>
Co-authored-by: karlhaas <[email protected]>
Co-authored-by: Karl Haas <[email protected]>
Co-authored-by: Matthias Fasching <[email protected]>
Co-authored-by: Martin Eigenbrodt <[email protected]>
Co-authored-by: Eng Zer Jun <[email protected]>

* task: adding release-env in the gitignore

* task: its release-env

* task: adding .release-env to the release-dry-run make

* task: changing the order of release steps

* task:changing the token

* feature: supporting sqlite :memory: and mode=memory on the sqlite driver (#717)

* feat: expose connection transactions with context and options

* task: adding vscode to the ignore list

Co-authored-by: Patrik <[email protected]>
Co-authored-by: Michael Montgomery <[email protected]>
Co-authored-by: kyrozetera <[email protected]>
Co-authored-by: Reggie Riser <[email protected]>
Co-authored-by: hackerman <[email protected]>
Co-authored-by: Stanislas Michalak <[email protected]>
Co-authored-by: Larry M Jordan <[email protected]>
Co-authored-by: Brian Buchholz <[email protected]>
Co-authored-by: Mike Pontillo <[email protected]>
Co-authored-by: Benjamin Blattberg <[email protected]>
Co-authored-by: Jonathan Duck <[email protected]>
Co-authored-by: Arthur Knoepflin <[email protected]>
Co-authored-by: karlhaas <[email protected]>
Co-authored-by: Karl Haas <[email protected]>
Co-authored-by: Matthias Fasching <[email protected]>
Co-authored-by: Martin Eigenbrodt <[email protected]>
Co-authored-by: Eng Zer Jun <[email protected]>
Co-authored-by: Grant Zvolsky <[email protected]>
Co-authored-by: Andrew Hobson <[email protected]>
Co-authored-by: Yonghwan SO <[email protected]>
Co-authored-by: Joey Freeland <[email protected]>
  • Loading branch information
22 people authored May 27, 2022
2 parents 0fdefb2 + 65fd526 commit d146f1b
Show file tree
Hide file tree
Showing 5 changed files with 119 additions and 23 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ testdata/migrations/schema.sql
vendor/
.env
.release-env
.vscode/

# test data
cockroach-data/
20 changes: 13 additions & 7 deletions connection.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package pop

import (
"context"
"database/sql"
"errors"
"fmt"
"sync/atomic"
Expand Down Expand Up @@ -185,21 +186,26 @@ func (c *Connection) Rollback(fn func(tx *Connection)) error {

// NewTransaction starts a new transaction on the connection
func (c *Connection) NewTransaction() (*Connection, error) {
return c.NewTransactionContextOptions(c.Context(), nil)
}

// NewTransactionContext starts a new transaction on the connection using the provided context
func (c *Connection) NewTransactionContext(ctx context.Context) (*Connection, error) {
return c.NewTransactionContextOptions(ctx, nil)
}

// NewTransactionContextOptions starts a new transaction on the connection using the provided context and transaction options
func (c *Connection) NewTransactionContextOptions(ctx context.Context, options *sql.TxOptions) (*Connection, error) {
var cn *Connection
if c.TX == nil {
tx, err := c.Store.Transaction()
tx, err := c.Store.TransactionContextOptions(ctx, options)
if err != nil {
return cn, fmt.Errorf("couldn't start a new transaction: %w", err)
}
var store store = tx

// Rewrap the store if it was a context store
if cs, ok := c.Store.(contextStore); ok {
store = contextStore{store: store, ctx: cs.ctx}
}
cn = &Connection{
ID: randx.String(30),
Store: store,
Store: contextStore{store: tx, ctx: ctx},
Dialect: c.Dialect,
TX: tx,
}
Expand Down
45 changes: 45 additions & 0 deletions connection_test.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
//go:build sqlite
// +build sqlite

package pop

import (
"context"
"testing"

"github.com/stretchr/testify/require"
Expand Down Expand Up @@ -52,3 +54,46 @@ func Test_Connection_Open_BadDriver(t *testing.T) {
err = c.Open()
r.Error(err)
}

func Test_Connection_Transaction(t *testing.T) {
r := require.New(t)
ctx := context.WithValue(context.Background(), "test", "test")

c, err := NewConnection(&ConnectionDetails{
URL: "sqlite://file::memory:?_fk=true",
})
r.NoError(err)
r.NoError(c.Open())
c = c.WithContext(ctx)

t.Run("func=NewTransaction", func(t *testing.T) {
r := require.New(t)
tx, err := c.NewTransaction()
r.NoError(err)

// has transaction and context
r.NotNil(tx.TX)
r.Nil(c.TX)
r.Equal(ctx, tx.Context())

// does not start a new transaction
ntx, err := tx.NewTransaction()
r.Equal(tx, ntx)

r.NoError(tx.TX.Rollback())
})

t.Run("func=NewTransactionContext", func(t *testing.T) {
r := require.New(t)
nctx := context.WithValue(ctx, "nested", "test")
tx, err := c.NewTransactionContext(nctx)
r.NoError(err)

// has transaction and context
r.NotNil(tx.TX)
r.Nil(c.TX)
r.Equal(nctx, tx.Context())

r.NoError(tx.TX.Rollback())
})
}
24 changes: 17 additions & 7 deletions dialect_sqlite.go
Original file line number Diff line number Diff line change
Expand Up @@ -182,22 +182,32 @@ func (m *sqlite) locker(l *sync.Mutex, fn func() error) error {
}

func (m *sqlite) CreateDB() error {
_, err := os.Stat(m.ConnectionDetails.Database)
durl := m.ConnectionDetails.Database

// Checking whether the url specifies in-memory mode
// as specified in https://github.com/mattn/go-sqlite3#faq
if strings.Contains(durl, ":memory:") || strings.Contains(durl, "mode=memory") {
log(logging.Info, "in memory db selected, no database file created.")

return nil
}

_, err := os.Stat(durl)
if err == nil {
return fmt.Errorf("could not create SQLite database '%s'; database exists", m.ConnectionDetails.Database)
return fmt.Errorf("could not create SQLite database '%s'; database exists", durl)
}
dir := filepath.Dir(m.ConnectionDetails.Database)
dir := filepath.Dir(durl)
err = os.MkdirAll(dir, 0766)
if err != nil {
return fmt.Errorf("could not create SQLite database '%s': %w", m.ConnectionDetails.Database, err)
return fmt.Errorf("could not create SQLite database '%s': %w", durl, err)
}
f, err := os.Create(m.ConnectionDetails.Database)
f, err := os.Create(durl)
if err != nil {
return fmt.Errorf("could not create SQLite database '%s': %w", m.ConnectionDetails.Database, err)
return fmt.Errorf("could not create SQLite database '%s': %w", durl, err)
}
_ = f.Close()

log(logging.Info, "created database '%s'", m.ConnectionDetails.Database)
log(logging.Info, "created database '%s'", durl)
return nil
}

Expand Down
52 changes: 43 additions & 9 deletions dialect_sqlite_test.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build sqlite
// +build sqlite

package pop
Expand Down Expand Up @@ -144,18 +145,51 @@ func Test_ConnectionDetails_FinalizeOSPath(t *testing.T) {

func TestSqlite_CreateDB(t *testing.T) {
r := require.New(t)
dir := t.TempDir()
p := filepath.Join(dir, "testdb.sqlite")
cd := &ConnectionDetails{
Dialect: "sqlite",
Database: p,
}

cd := &ConnectionDetails{Dialect: "sqlite"}
dialect, err := newSQLite(cd)
r.NoError(err)
r.NoError(dialect.CreateDB())

// Creating DB twice should produce an error
r.EqualError(dialect.CreateDB(), fmt.Sprintf("could not create SQLite database '%s'; database exists", p))
t.Run("CreateFile", func(t *testing.T) {
dir := t.TempDir()
cd.Database = filepath.Join(dir, "testdb.sqlite")

r.NoError(dialect.CreateDB())
r.FileExists(cd.Database)
})

t.Run("MemoryDB_tag", func(t *testing.T) {
dir := t.TempDir()
cd.Database = filepath.Join(dir, "file::memory:?cache=shared")

r.NoError(dialect.CreateDB())
r.NoFileExists(cd.Database)
})

t.Run("MemoryDB_only", func(t *testing.T) {
dir := t.TempDir()
cd.Database = filepath.Join(dir, ":memory:")

r.NoError(dialect.CreateDB())
r.NoFileExists(cd.Database)
})

t.Run("MemoryDB_param", func(t *testing.T) {
dir := t.TempDir()
cd.Database = filepath.Join(dir, "file:foobar?mode=memory&cache=shared")

r.NoError(dialect.CreateDB())
r.NoFileExists(cd.Database)
})

t.Run("CreateFile_ExistingDB", func(t *testing.T) {
dir := t.TempDir()
cd.Database = filepath.Join(dir, "testdb.sqlite")

r.NoError(dialect.CreateDB())
r.EqualError(dialect.CreateDB(), fmt.Sprintf("could not create SQLite database '%s'; database exists", cd.Database))
})

}

func TestSqlite_NewDriver(t *testing.T) {
Expand Down

0 comments on commit d146f1b

Please sign in to comment.