Skip to content

Implement query attributes #1091

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 28, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .ci/config/config.compression.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"SocketPath": "./../../../../../.ci/run/mysql/mysqld.sock",
"PasswordlessUser": "no_password",
"SecondaryDatabase": "testdb2",
"UnsupportedFeatures": "Ed25519,RsaEncryption,CachingSha2Password,Tls12,Tls13,UnixDomainSocket,UuidToBin",
"UnsupportedFeatures": "Ed25519,RsaEncryption,CachingSha2Password,QueryAttributes,Tls12,Tls13,UnixDomainSocket,UuidToBin",
"MySqlBulkLoaderLocalCsvFile": "../../../../TestData/LoadData_UTF8_BOM_Unix.CSV",
"MySqlBulkLoaderLocalTsvFile": "../../../../TestData/LoadData_UTF8_BOM_Unix.TSV"
}
Expand Down
2 changes: 1 addition & 1 deletion .ci/config/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"SocketPath": "./../../../../../.ci/run/mysql/mysqld.sock",
"PasswordlessUser": "no_password",
"SecondaryDatabase": "testdb2",
"UnsupportedFeatures": "Ed25519,RsaEncryption,CachingSha2Password,Tls12,Tls13,UnixDomainSocket,UuidToBin",
"UnsupportedFeatures": "Ed25519,RsaEncryption,CachingSha2Password,QueryAttributes,Tls12,Tls13,UnixDomainSocket,UuidToBin",
"MySqlBulkLoaderLocalCsvFile": "../../../../TestData/LoadData_UTF8_BOM_Unix.CSV",
"MySqlBulkLoaderLocalTsvFile": "../../../../TestData/LoadData_UTF8_BOM_Unix.TSV"
}
Expand Down
16 changes: 13 additions & 3 deletions .ci/docker-run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -55,19 +55,29 @@ for i in `seq 1 120`; do
echo "Creating mysqltest user"
docker exec mysql bash -c 'mysql -uroot -ptest < /etc/mysql/conf.d/init.sql'
if [ $? -ne 0 ]; then continue; fi

if [[ $OMIT_FEATURES != *"Sha256Password"* ]]; then
echo "Creating sha256_password user"
docker exec mysql bash -c 'mysql -uroot -ptest < /etc/mysql/conf.d/init_sha256.sql'
if [ $? -ne 0 ]; then continue; fi
if [ $? -ne 0 ]; then exit $?; fi
fi

if [[ $OMIT_FEATURES != *"CachingSha2Password"* ]]; then
echo "Creating caching_sha2_password user"
docker exec mysql bash -c 'mysql -uroot -ptest < /etc/mysql/conf.d/init_caching_sha2.sql'
if [ $? -ne 0 ]; then continue; fi
if [ $? -ne 0 ]; then exit $?; fi
fi

if [[ $OMIT_FEATURES != *"Ed25519"* ]]; then
echo "Installing auth_ed25519 component"
docker exec mysql bash -c 'mysql -uroot -ptest < /etc/mysql/conf.d/init_ed25519.sql'
if [ $? -ne 0 ]; then continue; fi
if [ $? -ne 0 ]; then exit $?; fi
fi

if [[ $OMIT_FEATURES != *"QueryAttributes"* ]]; then
echo "Installing query_attributes component"
docker exec mysql mysql -uroot -ptest -e "INSTALL COMPONENT 'file://component_query_attributes';"
if [ $? -ne 0 ]; then exit $?; fi
fi

# exit if successful
Expand Down
16 changes: 8 additions & 8 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ jobs:
arguments: 'tests\SideBySide\SideBySide.csproj -c Baseline'
testRunTitle: 'Baseline tests'
env:
DATA__UNSUPPORTEDFEATURES: 'Ed25519,UnixDomainSocket'
DATA__UNSUPPORTEDFEATURES: 'Ed25519,QueryAttributes,UnixDomainSocket'
DATA__CONNECTIONSTRING: 'server=localhost;port=3306;user id=root;password=test;database=mysqltest;ssl mode=none;DefaultCommandTimeout=3600'
DATA__CERTIFICATESPATH: '$(Build.Repository.LocalPath)\.ci\server\certs\'
DATA__MYSQLBULKLOADERLOCALCSVFILE: '$(Build.Repository.LocalPath)\tests\TestData\LoadData_UTF8_BOM_Unix.CSV'
Expand Down Expand Up @@ -148,7 +148,7 @@ jobs:
arguments: '-c Release --no-restore'
testRunTitle: ${{ format('{0}, $(Agent.OS), {1}, {2}', 'mysql:8.0', 'net472/net5.0', 'No SSL') }}
env:
DATA__UNSUPPORTEDFEATURES: 'Ed25519,Tls11,UnixDomainSocket'
DATA__UNSUPPORTEDFEATURES: 'Ed25519,QueryAttributes,Tls11,UnixDomainSocket'
DATA__CONNECTIONSTRING: 'server=localhost;port=3306;user id=mysqltest;password=test;database=mysqltest;ssl mode=none;DefaultCommandTimeout=3600;AllowPublicKeyRetrieval=True;UseCompression=True'

- job: windows_integration_tests_2
Expand Down Expand Up @@ -185,7 +185,7 @@ jobs:
arguments: '-c Release --no-restore'
testRunTitle: ${{ format('{0}, $(Agent.OS), {1}, {2}', 'mysql:8.0', 'netcoreapp3.1/net6.0', 'No SSL') }}
env:
DATA__UNSUPPORTEDFEATURES: 'Ed25519,Tls11,UnixDomainSocket'
DATA__UNSUPPORTEDFEATURES: 'Ed25519,QueryAttributes,Tls11,UnixDomainSocket'
DATA__CONNECTIONSTRING: 'server=localhost;port=3306;user id=mysqltest;password=test;database=mysqltest;ssl mode=none;DefaultCommandTimeout=3600;AllowPublicKeyRetrieval=True'

- job: linux_integration_tests
Expand All @@ -197,22 +197,22 @@ jobs:
matrix:
'MySQL 5.6':
image: 'mysql:5.6'
unsupportedFeatures: 'Ed25519,Json,Sha256Password,LargePackets,CachingSha2Password,ResetConnection,SessionTrack,Tls11,Tls13,UuidToBin'
unsupportedFeatures: 'CachingSha2Password,Ed25519,Json,LargePackets,QueryAttributes,ResetConnection,SessionTrack,Sha256Password,Tls11,Tls13,UuidToBin'
'MySQL 5.7':
image: 'mysql:5.7'
unsupportedFeatures: 'Ed25519,CachingSha2Password,Tls11,Tls13,UuidToBin'
unsupportedFeatures: 'CachingSha2Password,Ed25519,QueryAttributes,Tls11,Tls13,UuidToBin'
'MySQL 8.0':
image: 'mysql:8.0'
unsupportedFeatures: 'Ed25519,Tls11,ZeroDateTime'
'MariaDB 10.2':
image: 'mariadb:10.2'
unsupportedFeatures: 'Ed25519,Json,Sha256Password,CachingSha2Password,RoundDateTime,Tls11,UuidToBin'
unsupportedFeatures: 'CachingSha2Password,Ed25519,Json,RoundDateTime,QueryAttributes,Sha256Password,Tls11,UuidToBin'
'MariaDB 10.3':
image: 'mariadb:10.3-bionic'
unsupportedFeatures: 'Ed25519,Json,Sha256Password,CachingSha2Password,RoundDateTime,Tls11,UuidToBin'
unsupportedFeatures: 'CachingSha2Password,Ed25519,Json,RoundDateTime,QueryAttributes,Sha256Password,Tls11,UuidToBin'
'MariaDB 10.4':
image: 'mariadb:10.4.12'
unsupportedFeatures: 'Json,Sha256Password,CachingSha2Password,RoundDateTime,Tls11,UuidToBin'
unsupportedFeatures: 'CachingSha2Password,Json,RoundDateTime,QueryAttributes,Sha256Password,Tls11,UuidToBin'
steps:
- template: '.ci/integration-tests-steps.yml'
parameters:
Expand Down
19 changes: 19 additions & 0 deletions docs/content/api/MySqlConnector/MySqlAttribute/AttributeName.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

35 changes: 35 additions & 0 deletions docs/content/api/MySqlConnector/MySqlAttribute/MySqlAttribute.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 19 additions & 0 deletions docs/content/api/MySqlConnector/MySqlAttribute/Value.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 28 additions & 0 deletions docs/content/api/MySqlConnector/MySqlAttributeCollection/Add.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 19 additions & 0 deletions docs/content/api/MySqlConnector/MySqlAttributeCollection/Clear.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 19 additions & 0 deletions docs/content/api/MySqlConnector/MySqlAttributeCollection/Count.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 28 additions & 0 deletions docs/content/api/MySqlConnector/MySqlAttributeCollection/Item.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 28 additions & 0 deletions docs/content/api/MySqlConnector/MySqlAttributeCollection/Remove.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

31 changes: 31 additions & 0 deletions docs/content/api/MySqlConnector/MySqlAttributeCollectionType.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading