Skip to content

Commit 9af6467

Browse files
committed
[update] Update Miscellaneous files
1 parent 98e3b3e commit 9af6467

File tree

4 files changed

+96
-42
lines changed

4 files changed

+96
-42
lines changed

.gitattributes

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@
1919
*.pdf diff=astextplain
2020
*.PDF diff=astextplain
2121
*.rtf diff=astextplain
22-
*.RTF diff=astextplain
22+
*.RTF diff=astextplain

.gitignore

+84-31
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,18 @@ local.properties
4242
*.sln.docstates
4343

4444
# Build results
45+
4546
[Dd]ebug/
4647
[Rr]elease/
48+
x64/
49+
build/
50+
[Bb]in/
51+
[Oo]bj/
52+
53+
# MSTest test Results
54+
[Tt]est[Rr]esult*/
55+
[Bb]uild[Ll]og.*
56+
4757
*_i.c
4858
*_p.c
4959
*.ilk
@@ -59,29 +69,47 @@ local.properties
5969
*.tli
6070
*.tlh
6171
*.tmp
72+
*.tmp_proj
73+
*.log
6274
*.vspscc
75+
*.vssscc
6376
.builds
64-
*.dotCover
65-
66-
## TODO: If you have NuGet Package Restore enabled, uncomment this
67-
#packages/
77+
*.pidb
78+
*.log
79+
*.scc
6880

6981
# Visual C++ cache files
7082
ipch/
7183
*.aps
7284
*.ncb
7385
*.opensdf
7486
*.sdf
87+
*.cachefile
7588

7689
# Visual Studio profiler
7790
*.psess
7891
*.vsp
92+
*.vspx
93+
94+
# Guidance Automation Toolkit
95+
*.gpState
7996

8097
# ReSharper is a .NET coding add-in
81-
_ReSharper*
98+
_ReSharper*/
99+
*.[Rr]e[Ss]harper
100+
101+
# TeamCity is a build add-in
102+
_TeamCity*
103+
104+
# DotCover is a Code Coverage Tool
105+
*.dotCover
106+
107+
# NCrunch
108+
*.ncrunch*
109+
.*crunch*.local.xml
82110

83111
# Installshield output folder
84-
[Ee]xpress
112+
[Ee]xpress/
85113

86114
# DocProject is a documentation generator add-in
87115
DocProject/buildhelp/
@@ -94,56 +122,84 @@ DocProject/Help/Html2
94122
DocProject/Help/html
95123

96124
# Click-Once directory
97-
publish
125+
publish/
126+
127+
# Publish Web Output
128+
*.Publish.xml
129+
*.pubxml
130+
*.publishproj
131+
132+
# NuGet Packages Directory
133+
## TODO: If you have NuGet Package Restore enabled, uncomment the next line
134+
#packages/
135+
136+
# Windows Azure Build Output
137+
csx
138+
*.build.csdef
139+
140+
# Windows Store app package directory
141+
AppPackages/
98142

99143
# Others
100-
[Bb]in
101-
[Oo]bj
102-
sql
103-
TestResults
144+
sql/
104145
*.Cache
105-
ClientBin
106-
stylecop.*
146+
ClientBin/
147+
[Ss]tyle[Cc]op.*
107148
~$*
149+
*~
108150
*.dbmdl
109-
Generated_Code #added for RIA/Silverlight projects
151+
*.[Pp]ublish.xml
152+
*.pfx
153+
*.publishsettings
154+
155+
# RIA/Silverlight projects
156+
Generated_Code/
110157

111158
# Backup & report files from converting an old project file to a newer
112159
# Visual Studio version. Backup files are not needed, because we have git ;-)
113160
_UpgradeReport_Files/
114161
Backup*/
115162
UpgradeLog*.XML
163+
UpgradeLog*.htm
116164

165+
# SQL Server files
166+
App_Data/*.mdf
167+
App_Data/*.ldf
117168

118-
119-
############
120-
## Windows
121-
############
169+
#############
170+
## Windows detritus
171+
#############
122172

123173
# Windows image file caches
124174
Thumbs.db
175+
ehthumbs.db
125176

126177
# Folder config file
127178
Desktop.ini
128179

180+
# Recycle Bin used on file shares
181+
$RECYCLE.BIN/
182+
183+
# Mac crap
184+
.DS_Store
185+
129186

130187
#############
131188
## Python
132189
#############
133190

134-
*.py[co]
191+
*.py[cod]
135192

136193
# Packages
137194
*.egg
138195
*.egg-info
139-
dist
140-
build
141-
eggs
142-
parts
143-
bin
144-
var
145-
sdist
146-
develop-eggs
196+
dist/
197+
build/
198+
eggs/
199+
parts/
200+
var/
201+
sdist/
202+
develop-eggs/
147203
.installed.cfg
148204

149205
# Installer logs
@@ -157,7 +213,4 @@ pip-log.txt
157213
*.mo
158214

159215
#Mr Developer
160-
.mr.developer.cfg
161-
162-
# Mac crap
163-
.DS_Store
216+
.mr.developer.cfg

LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[MIT LICENSE]
22

3-
Copyright (c) 2017 Angel Lai, http://medoo.in
3+
Copyright (c) 2017 Angel Lai, https://medoo.in
44

55
Permission is hereby granted, free of charge, to any person obtaining
66
a copy of this software and associated documentation files (the

composer.json

+10-9
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"name": "catfan/medoo",
33
"type": "framework",
4-
"description": "The Lightest PHP database framework to accelerate development",
5-
"keywords": ["database", "lightweight", "PHP framework", "SQL", "MySQL", "MSSQL", "SQLite"],
6-
"homepage": "http://medoo.in",
4+
"description": "The lightest PHP database framework to accelerate development",
5+
"keywords": ["database", "lightweight", "PHP framework", "SQL", "MySQL", "MSSQL", "SQLite", "PostgreSQL", "MariaDB", "Oracle"],
6+
"homepage": "https://medoo.in",
77
"license": "MIT",
88
"authors": [
99
{"name": "Angel Lai", "email": "[email protected]"}
@@ -13,12 +13,13 @@
1313
"ext-pdo": "*"
1414
},
1515
"suggest": {
16-
"ext-pdo_mysql": "For MySQL or MariaDB databases",
17-
"ext-pdo_sqlsrv": "For MSSQL databases on Windows platform",
18-
"ext-pdo_dblib": "For MSSQL or Sybase databases on Linux/UNIX platform",
19-
"ext-pdo_oci": "For Oracle databases",
20-
"ext-pdo_pqsql": "For PostgreSQL databases",
21-
"ext-pdo_sqlite": "For SQLite databases"
16+
"ext-pdo_mysql": "For MySQL or MariaDB database",
17+
"ext-pdo_sqlsrv": "For MSSQL database on Windows platform",
18+
"ext-pdo_dblib": "For MSSQL or Sybase database on Linux/UNIX platform",
19+
"ext-pdo_oci": "For Oracle database",
20+
"ext-pdo_oci8": "For Oracle version 8 database",
21+
"ext-pdo_pqsql": "For PostgreSQL database",
22+
"ext-pdo_sqlite": "For SQLite database"
2223
},
2324
"autoload": {
2425
"psr-4": {

0 commit comments

Comments
 (0)