Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ebean-orm/ebean-datasource
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 9.5
Choose a base ref
...
head repository: ebean-orm/ebean-datasource
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9.6
Choose a head ref
  • 13 commits
  • 14 files changed
  • 3 contributors

Commits on Apr 14, 2025

  1. Configuration menu
    Copy the full SHA
    c072f0a View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2025

  1. Merge pull request #128 from FOCONIS/fix-use-of-properties

    Copy properties instead of setting as default value
    rbygrave authored Apr 15, 2025
    Configuration menu
    Copy the full SHA
    e497938 View commit details
    Browse the repository at this point in the history

Commits on Apr 16, 2025

  1. Configuration menu
    Copy the full SHA
    a44fd3d View commit details
    Browse the repository at this point in the history
  2. Merge pull request #129 from FOCONIS/update-test-containers

    Updated ebean-test-containers to 7.8
    rbygrave authored Apr 16, 2025
    Configuration menu
    Copy the full SHA
    2f3083b View commit details
    Browse the repository at this point in the history

Commits on Apr 17, 2025

  1. Merge customProperties/clientInfo/initSql when loading config from mu…

    …ltiple places
    
    When a config is loaded with loadSettings from different places, the
    behaviour of customProperties/clientInfo/initSql is not consistent
    
    setDefaults did not honor clientInfo / initSql at all.
    
    multiple loadSettings should merge customProps/clientInfo/initSql
    Old behaviour:
    - initSql is always overwritten
    - customProps are overwritten, if value is present in config
      (even if it was empty)
    - clientInfo is only overwrtitten when configured in properties
    
    New behaviour:
    - all of them are merged. So multiple loadSettings will append initSql
      or put all props to clientInfo/customProps
    
    btw: initSql also supports "delimiter $$"
    rPraml committed Apr 17, 2025
    Configuration menu
    Copy the full SHA
    f326508 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    fc342fb View commit details
    Browse the repository at this point in the history
  3. fixed spelling of captureStackTrace

    when copy-pasting (and replacing xxx) it did not work...
    took some time, until I see, that it is all lowercase
    rPraml committed Apr 17, 2025
    Configuration menu
    Copy the full SHA
    06a2d98 View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2025

  1. Configuration menu
    Copy the full SHA
    1f52231 View commit details
    Browse the repository at this point in the history

Commits on Apr 23, 2025

  1. Merge pull request #132 from ebean-orm/feature/poolStatus-totalWaitMi…

    …cros
    
    Add totalAcquireMicros() and totalWaitMicros() to PoolStatus
    rbygrave authored Apr 23, 2025
    Configuration menu
    Copy the full SHA
    fc1295b View commit details
    Browse the repository at this point in the history
  2. Merge pull request #131 from FOCONIS/fix-typo

    fixed spelling of captureStackTrace
    rbygrave authored Apr 23, 2025
    Configuration menu
    Copy the full SHA
    605b515 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #130 from FOCONIS/support-merging-configs

    Merge customProperties/clientInfo/initSql when loading config from multiple places
    rbygrave authored Apr 23, 2025
    Configuration menu
    Copy the full SHA
    5a5bb5e View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    465508a View commit details
    Browse the repository at this point in the history
  5. Version 9.6

    rbygrave committed Apr 23, 2025
    Configuration menu
    Copy the full SHA
    cb2f649 View commit details
    Browse the repository at this point in the history
Loading