Skip to content

Commit

Permalink
Merge pull request #26 from System-Glitch/develop
Browse files Browse the repository at this point in the history
v2.4.0
  • Loading branch information
System-Glitch authored Jan 3, 2020
2 parents ca97cf1 + 34840e1 commit 2adc2b2
Show file tree
Hide file tree
Showing 76 changed files with 876 additions and 249 deletions.
2 changes: 1 addition & 1 deletion database/database.go
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ func buildConnectionOptions(connection string) string {
)
case "postgres":
return fmt.Sprintf(
"host=%s port=%d user=%s dbname=%s password=%s options='%s'",
"host=%s port=%d user=%s dbname=%s password=%s %s",
config.GetString("dbHost"),
int64(config.Get("dbPort").(float64)),
config.GetString("dbUsername"),
Expand Down
2 changes: 1 addition & 1 deletion database/database_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ func (suite *DatabaseTestSuite) SetupSuite() {

func (suite *DatabaseTestSuite) TestBuildConnectionOptions() {
suite.Equal("goyave:secret@(127.0.0.1:3306)/goyave?charset=utf8&parseTime=true&loc=Local", buildConnectionOptions("mysql"))
suite.Equal("host=127.0.0.1 port=3306 user=goyave dbname=goyave password=secret options='charset=utf8&parseTime=true&loc=Local'", buildConnectionOptions("postgres"))
suite.Equal("host=127.0.0.1 port=3306 user=goyave dbname=goyave password=secret charset=utf8&parseTime=true&loc=Local", buildConnectionOptions("postgres"))
suite.Equal("goyave", buildConnectionOptions("sqlite3"))
suite.Equal("sqlserver://goyave:[email protected]:3306?database=goyave&charset=utf8&parseTime=true&loc=Local", buildConnectionOptions("mssql"))

Expand Down
10 changes: 5 additions & 5 deletions docs/404.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,19 @@
<link rel="icon" type="image/png" sizes="512x512" href="/goyave/goyave_512.png">
<meta property="twitter:title" content="Goyave">
<meta property="twitter:description" content="An Elegant Golang Web Framework">
<meta property="twitter:image:src" content="/goyave_banner.png">
<meta property="twitter:image:src" content="https://system-glitch.github.io/goyave/goyave_banner.png">
<meta property="twitter:card" content="summary_large_image">
<meta property="og:title" content="Goyave">
<meta property="og:type" content="website">
<meta property="og:description" content="An Elegant Golang Web Framework">
<meta property="og:image" content="/goyave/goyave_banner.png">
<meta property="og:image" content="https://system-glitch.github.io/goyave/goyave_banner.png">
<meta property="og:site_name" content="Goyave">

<link rel="preload" href="/goyave/assets/css/0.styles.79261d3a.css" as="style"><link rel="preload" href="/goyave/assets/js/app.a87f9a67.js" as="script"><link rel="preload" href="/goyave/assets/js/4.cda9b5d2.js" as="script"><link rel="prefetch" href="/goyave/assets/js/10.4b24f42f.js"><link rel="prefetch" href="/goyave/assets/js/11.f3b013f5.js"><link rel="prefetch" href="/goyave/assets/js/12.32d040f6.js"><link rel="prefetch" href="/goyave/assets/js/13.55082484.js"><link rel="prefetch" href="/goyave/assets/js/14.809d897a.js"><link rel="prefetch" href="/goyave/assets/js/15.030bde1b.js"><link rel="prefetch" href="/goyave/assets/js/16.ba374be0.js"><link rel="prefetch" href="/goyave/assets/js/17.cbef46ae.js"><link rel="prefetch" href="/goyave/assets/js/18.ab6d63a9.js"><link rel="prefetch" href="/goyave/assets/js/19.3e31903f.js"><link rel="prefetch" href="/goyave/assets/js/2.e98777cd.js"><link rel="prefetch" href="/goyave/assets/js/20.d1873b2b.js"><link rel="prefetch" href="/goyave/assets/js/21.9d3313e3.js"><link rel="prefetch" href="/goyave/assets/js/22.4d390ef0.js"><link rel="prefetch" href="/goyave/assets/js/23.90d636f7.js"><link rel="prefetch" href="/goyave/assets/js/24.61ce605e.js"><link rel="prefetch" href="/goyave/assets/js/25.94ffbd09.js"><link rel="prefetch" href="/goyave/assets/js/26.48dcf7db.js"><link rel="prefetch" href="/goyave/assets/js/27.07a8a51a.js"><link rel="prefetch" href="/goyave/assets/js/28.06b7938d.js"><link rel="prefetch" href="/goyave/assets/js/29.512827f7.js"><link rel="prefetch" href="/goyave/assets/js/3.a964193e.js"><link rel="prefetch" href="/goyave/assets/js/5.05205c34.js"><link rel="prefetch" href="/goyave/assets/js/6.4afdd43b.js"><link rel="prefetch" href="/goyave/assets/js/7.a6f753ea.js"><link rel="prefetch" href="/goyave/assets/js/8.2e8722f8.js"><link rel="prefetch" href="/goyave/assets/js/9.9f5da00b.js">
<link rel="preload" href="/goyave/assets/css/0.styles.79261d3a.css" as="style"><link rel="preload" href="/goyave/assets/js/app.58da958a.js" as="script"><link rel="preload" href="/goyave/assets/js/4.cda9b5d2.js" as="script"><link rel="prefetch" href="/goyave/assets/js/10.6a9d4641.js"><link rel="prefetch" href="/goyave/assets/js/11.f3b013f5.js"><link rel="prefetch" href="/goyave/assets/js/12.44bc0695.js"><link rel="prefetch" href="/goyave/assets/js/13.4786515c.js"><link rel="prefetch" href="/goyave/assets/js/14.3764a769.js"><link rel="prefetch" href="/goyave/assets/js/15.0ac76f37.js"><link rel="prefetch" href="/goyave/assets/js/16.66f5cb96.js"><link rel="prefetch" href="/goyave/assets/js/17.6e41d592.js"><link rel="prefetch" href="/goyave/assets/js/18.2de1d1bf.js"><link rel="prefetch" href="/goyave/assets/js/19.d72d67f2.js"><link rel="prefetch" href="/goyave/assets/js/2.e98777cd.js"><link rel="prefetch" href="/goyave/assets/js/20.ecf0beaa.js"><link rel="prefetch" href="/goyave/assets/js/21.d7b17f63.js"><link rel="prefetch" href="/goyave/assets/js/22.b838cf84.js"><link rel="prefetch" href="/goyave/assets/js/23.8fef9985.js"><link rel="prefetch" href="/goyave/assets/js/24.61ce605e.js"><link rel="prefetch" href="/goyave/assets/js/25.a1ffdd10.js"><link rel="prefetch" href="/goyave/assets/js/26.48dcf7db.js"><link rel="prefetch" href="/goyave/assets/js/27.07a8a51a.js"><link rel="prefetch" href="/goyave/assets/js/28.06b7938d.js"><link rel="prefetch" href="/goyave/assets/js/29.512827f7.js"><link rel="prefetch" href="/goyave/assets/js/3.a964193e.js"><link rel="prefetch" href="/goyave/assets/js/5.8cff6807.js"><link rel="prefetch" href="/goyave/assets/js/6.ad56580a.js"><link rel="prefetch" href="/goyave/assets/js/7.89b74898.js"><link rel="prefetch" href="/goyave/assets/js/8.2e8722f8.js"><link rel="prefetch" href="/goyave/assets/js/9.da1fe802.js">
<link rel="stylesheet" href="/goyave/assets/css/0.styles.79261d3a.css">
</head>
<body>
<div id="app" data-server-rendered="true"><div class="theme-container"><div class="theme-default-content"><h1>404</h1> <blockquote>Looks like we've got some broken links.</blockquote> <a href="/goyave/" class="router-link-active">Take me home.</a></div></div><div class="global-ui"><!----></div></div>
<script src="/goyave/assets/js/app.a87f9a67.js" defer></script><script src="/goyave/assets/js/4.cda9b5d2.js" defer></script>
<div id="app" data-server-rendered="true"><div class="theme-container"><div class="theme-default-content"><h1>404</h1> <blockquote>There's nothing here.</blockquote> <a href="/goyave/" class="router-link-active">Take me home.</a></div></div><div class="global-ui"><!----></div></div>
<script src="/goyave/assets/js/app.58da958a.js" defer></script><script src="/goyave/assets/js/4.cda9b5d2.js" defer></script>
</body>
</html>

Large diffs are not rendered by default.

Loading

0 comments on commit 2adc2b2

Please sign in to comment.