From d06654cc0074f4d7ad5d68bd6329f5e1e02d0e4c Mon Sep 17 00:00:00 2001 From: Warren Chu Date: Sat, 19 Dec 2020 13:09:26 -0800 Subject: [PATCH 1/8] updated README file extention --- README.rst => README.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename README.rst => README.md (100%) diff --git a/README.rst b/README.md similarity index 100% rename from README.rst rename to README.md From 2824140a1b72d20951a5d6f19b2a9bdb7ec313cc Mon Sep 17 00:00:00 2001 From: Warren Chu Date: Sat, 19 Dec 2020 13:15:13 -0800 Subject: [PATCH 2/8] updated README.md --- README.md | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 617f2f78..11c5bbd7 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,9 @@ # Project -.. image:: https://img.shields.io/pypi/v/django-mssql-backend.svg - :target: https://pypi.python.org/pypi/django-mssql-backend - Welcome to the MSSQL-Django 3rd party backend project! -*django-mssql-backend* is a fork of -`django-pyodbc-azure ` +*mssql-django* is a fork of +`django-mssql-backend ` This project provides an enterprise database connectivity option for the Django Web Framework, with support for Microsoft SQL Server and Azure SQL Database. From 122e1a5a28c0a7dea55bf37fa1ce8652303ded13 Mon Sep 17 00:00:00 2001 From: Warren Chu Date: Sat, 19 Dec 2020 13:29:36 -0800 Subject: [PATCH 3/8] updated root documentation files --- CONTRIBUTING.md | 15 +++ LICENSE => LICENSE.txt | 0 README.rst | 240 +++++++++++++++++++++++++++++++++++++++++ SECURITY.md | 4 +- 4 files changed, 256 insertions(+), 3 deletions(-) create mode 100644 CONTRIBUTING.md rename LICENSE => LICENSE.txt (100%) create mode 100644 README.rst diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 00000000..a7aa9f0b --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,15 @@ +# Contributing + +## How to contribute + +This project welcomes contributions and suggestions. Most contributions require you to agree to a +Contributor License Agreement (CLA) declaring that you have the right to, and actually do, grant us +the rights to use your contribution. For details, visit https://cla.opensource.microsoft.com. + +When you submit a pull request, a CLA bot will automatically determine whether you need to provide +a CLA and decorate the PR appropriately (e.g., status check, comment). Simply follow the instructions +provided by the bot. You will only need to do this once across all repos using our CLA. + +This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). +For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or +contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments. \ No newline at end of file diff --git a/LICENSE b/LICENSE.txt similarity index 100% rename from LICENSE rename to LICENSE.txt diff --git a/README.rst b/README.rst new file mode 100644 index 00000000..67ffc33e --- /dev/null +++ b/README.rst @@ -0,0 +1,240 @@ +# Project + +.. image:: https://img.shields.io/pypi/v/django-mssql-backend.svg + :target: https://pypi.python.org/pypi/django-mssql-backend + +Welcome to the MSSQL-Django 3rd party backend project! + +*django-mssql-backend* is a fork of +`django-pyodbc-azure ` + +This project provides an enterprise database connectivity option for the Django Web Framework, with support for Microsoft SQL Server and Azure SQL Database. + +We hope you enjoy using the MSSQL-Django 3rd party backend. + +## Features + +- Supports Django 2.2, 3.0 +- Supports Microsoft SQL Server 2008/2008R2, 2012, 2014, 2016, 2017, 2019 +- Passes most of the tests of the Django test suite +- Compatible with + `Micosoft ODBC Driver for SQL Server `__, + `SQL Server Native Client `__, + and `FreeTDS `__ ODBC drivers + +## Dependencies + +- Django 2.2 or newer +- pyodbc 3.0 or newer + +## Installation + +1. Install pyodbc and Django + +2. Install django-mssql-backend :: + + pip install django-mssql-backend + +3. Now you can point the ``ENGINE`` setting in the settings file used by + your Django application or project to the ``'sql_server.pyodbc'`` + module path :: + + 'ENGINE': 'sql_server.pyodbc' + +## Regex Support + +django-mssql-backend supports regex using a CLR .dll file. To install it, run :: + + python manage.py install_regex_clr {database_name} + +## Configuration + +### Standard Django settings + +The following entries in a database-level settings dictionary +in DATABASES control the behavior of the backend: + +- ENGINE + + String. It must be ``"sql_server.pyodbc"``. + +- NAME + + String. Database name. Required. + +- HOST + + String. SQL Server instance in ``"server\instance"`` format. + +- PORT + + String. Server instance port. + An empty string means the default port. + +- USER + + String. Database user name in ``"user"`` format. + If not given then MS Integrated Security will be used. + +- PASSWORD + + String. Database user password. + +- AUTOCOMMIT + + Boolean. Set this to False if you want to disable + Django's transaction management and implement your own. + +and the following entries are also available in the TEST dictionary +for any given database-level settings dictionary: + +- NAME + + String. The name of database to use when running the test suite. + If the default value (``None``) is used, the test database will use + the name "test\_" + ``NAME``. + +- COLLATION + + String. The collation order to use when creating the test database. + If the default value (``None``) is used, the test database is assigned + the default collation of the instance of SQL Server. + +- DEPENDENCIES + + String. The creation-order dependencies of the database. + See the official Django documentation for more details. + +- MIRROR + + String. The alias of the database that this database should + mirror during testing. Default value is ``None``. + See the official Django documentation for more details. + +### OPTIONS + +Dictionary. Current available keys are: + +- driver + + String. ODBC Driver to use (``"ODBC Driver 13 for SQL Server"``, + ``"SQL Server Native Client 11.0"``, ``"FreeTDS"`` etc). + Default is ``"ODBC Driver 13 for SQL Server"``. + +- isolation_level + + String. Sets `transaction isolation level + `__ + for each database session. Valid values for this entry are + ``READ UNCOMMITTED``, ``READ COMMITTED``, ``REPEATABLE READ``, + ``SNAPSHOT``, and ``SERIALIZABLE``. Default is ``None`` which means + no isolation levei is set to a database session and SQL Server default + will be used. + +- dsn + + String. A named DSN can be used instead of ``HOST``. + +- host_is_server + + Boolean. Only relevant if using the FreeTDS ODBC driver under + Unix/Linux. + + By default, when using the FreeTDS ODBC driver the value specified in + the ``HOST`` setting is used in a ``SERVERNAME`` ODBC connection + string component instead of being used in a ``SERVER`` component; + this means that this value should be the name of a *dataserver* + definition present in the ``freetds.conf`` FreeTDS configuration file + instead of a hostname or an IP address. + + But if this option is present and it's value is ``True``, this + special behavior is turned off. + + See http://www.freetds.org/userguide/dsnless.htm for more information. + +- unicode_results + + Boolean. If it is set to ``True``, pyodbc's *unicode_results* feature + is activated and strings returned from pyodbc are always Unicode. + Default value is ``False``. + +- extra_params + + String. Additional parameters for the ODBC connection. The format is + ``"param=value;param=value"``. + +- collation + + String. Name of the collation to use when performing text field + lookups against the database. Default is ``None``; this means no + collation specifier is added to your lookup SQL (the default + collation of your database will be used). For Chinese language you + can set it to ``"Chinese_PRC_CI_AS"``. + +- connection_timeout + + Integer. Sets the timeout in seconds for the database connection process. + Default value is ``0`` which disables the timeout. + +- connection_retries + + Integer. Sets the times to retry the database connection process. + Default value is ``5``. + +- connection_retry_backoff_time + + Integer. Sets the back off time in seconds for reries of + the database connection process. Default value is ``5``. + +- query_timeout + + Integer. Sets the timeout in seconds for the database query. + Default value is ``0`` which disables the timeout. + +### Backend-specific settings +~~~~~~~~~~~~~~~~~~~~~~~~~ + +The following project-level settings also control the behavior of the backend: + +- DATABASE_CONNECTION_POOLING + + Boolean. If it is set to ``False``, pyodbc's connection pooling feature + won't be activated. + +### Example + +Here is an example of the database settings: + +:: + + DATABASES = { + 'default': { + 'ENGINE': 'sql_server.pyodbc', + 'NAME': 'mydb', + 'USER': 'user@myserver', + 'PASSWORD': 'password', + 'HOST': 'myserver.database.windows.net', + 'PORT': '', + + 'OPTIONS': { + 'driver': 'ODBC Driver 13 for SQL Server', + }, + }, + } + + # set this to False if you want to turn off pyodbc's connection pooling + DATABASE_CONNECTION_POOLING = False + +## Limitations + +The following features are currently not supported: + +- Altering a model field from or to AutoField at migration + +## Trademarks + +This project may contain trademarks or logos for projects, products, or services. Authorized use of Microsoft +trademarks or logos is subject to and must follow +[Microsoft's Trademark & Brand Guidelines](https://www.microsoft.com/en-us/legal/intellectualproperty/trademarks/usage/general). +Use of Microsoft trademarks or logos in modified versions of this project must not cause confusion or imply Microsoft sponsorship. +Any use of third-party trademarks or logos are subject to those third-party's policies. \ No newline at end of file diff --git a/SECURITY.md b/SECURITY.md index f7b89984..9dad406d 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -1,6 +1,4 @@ - - -## Security +# Security Microsoft takes the security of our software products and services seriously, which includes all source code repositories managed through our GitHub organizations, which include [Microsoft](https://github.com/Microsoft), [Azure](https://github.com/Azure), [DotNet](https://github.com/dotnet), [AspNet](https://github.com/aspnet), [Xamarin](https://github.com/xamarin), and [our GitHub organizations](https://opensource.microsoft.com/). From 684fc7f386ef8ae58e192ca464f67dc310a1ec6d Mon Sep 17 00:00:00 2001 From: Warren Chu Date: Sat, 19 Dec 2020 13:31:41 -0800 Subject: [PATCH 4/8] removed deprecated CODE_OF_CONDUCT text file --- CODE_OF_CONDUCT => CODE_OF_CONDUCT.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename CODE_OF_CONDUCT => CODE_OF_CONDUCT.md (93%) diff --git a/CODE_OF_CONDUCT b/CODE_OF_CONDUCT.md similarity index 93% rename from CODE_OF_CONDUCT rename to CODE_OF_CONDUCT.md index f9ba8cf6..6257f2e7 100644 --- a/CODE_OF_CONDUCT +++ b/CODE_OF_CONDUCT.md @@ -6,4 +6,4 @@ Resources: - [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/) - [Microsoft Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) -- Contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with questions or concerns +- Contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with questions or concerns \ No newline at end of file From 8031785598d4fa6940fab31592e8044d8c581fe9 Mon Sep 17 00:00:00 2001 From: Warren Chu Date: Sat, 19 Dec 2020 13:32:58 -0800 Subject: [PATCH 5/8] deleted deprecated README file --- README.rst | 240 ----------------------------------------------------- 1 file changed, 240 deletions(-) delete mode 100644 README.rst diff --git a/README.rst b/README.rst deleted file mode 100644 index 67ffc33e..00000000 --- a/README.rst +++ /dev/null @@ -1,240 +0,0 @@ -# Project - -.. image:: https://img.shields.io/pypi/v/django-mssql-backend.svg - :target: https://pypi.python.org/pypi/django-mssql-backend - -Welcome to the MSSQL-Django 3rd party backend project! - -*django-mssql-backend* is a fork of -`django-pyodbc-azure ` - -This project provides an enterprise database connectivity option for the Django Web Framework, with support for Microsoft SQL Server and Azure SQL Database. - -We hope you enjoy using the MSSQL-Django 3rd party backend. - -## Features - -- Supports Django 2.2, 3.0 -- Supports Microsoft SQL Server 2008/2008R2, 2012, 2014, 2016, 2017, 2019 -- Passes most of the tests of the Django test suite -- Compatible with - `Micosoft ODBC Driver for SQL Server `__, - `SQL Server Native Client `__, - and `FreeTDS `__ ODBC drivers - -## Dependencies - -- Django 2.2 or newer -- pyodbc 3.0 or newer - -## Installation - -1. Install pyodbc and Django - -2. Install django-mssql-backend :: - - pip install django-mssql-backend - -3. Now you can point the ``ENGINE`` setting in the settings file used by - your Django application or project to the ``'sql_server.pyodbc'`` - module path :: - - 'ENGINE': 'sql_server.pyodbc' - -## Regex Support - -django-mssql-backend supports regex using a CLR .dll file. To install it, run :: - - python manage.py install_regex_clr {database_name} - -## Configuration - -### Standard Django settings - -The following entries in a database-level settings dictionary -in DATABASES control the behavior of the backend: - -- ENGINE - - String. It must be ``"sql_server.pyodbc"``. - -- NAME - - String. Database name. Required. - -- HOST - - String. SQL Server instance in ``"server\instance"`` format. - -- PORT - - String. Server instance port. - An empty string means the default port. - -- USER - - String. Database user name in ``"user"`` format. - If not given then MS Integrated Security will be used. - -- PASSWORD - - String. Database user password. - -- AUTOCOMMIT - - Boolean. Set this to False if you want to disable - Django's transaction management and implement your own. - -and the following entries are also available in the TEST dictionary -for any given database-level settings dictionary: - -- NAME - - String. The name of database to use when running the test suite. - If the default value (``None``) is used, the test database will use - the name "test\_" + ``NAME``. - -- COLLATION - - String. The collation order to use when creating the test database. - If the default value (``None``) is used, the test database is assigned - the default collation of the instance of SQL Server. - -- DEPENDENCIES - - String. The creation-order dependencies of the database. - See the official Django documentation for more details. - -- MIRROR - - String. The alias of the database that this database should - mirror during testing. Default value is ``None``. - See the official Django documentation for more details. - -### OPTIONS - -Dictionary. Current available keys are: - -- driver - - String. ODBC Driver to use (``"ODBC Driver 13 for SQL Server"``, - ``"SQL Server Native Client 11.0"``, ``"FreeTDS"`` etc). - Default is ``"ODBC Driver 13 for SQL Server"``. - -- isolation_level - - String. Sets `transaction isolation level - `__ - for each database session. Valid values for this entry are - ``READ UNCOMMITTED``, ``READ COMMITTED``, ``REPEATABLE READ``, - ``SNAPSHOT``, and ``SERIALIZABLE``. Default is ``None`` which means - no isolation levei is set to a database session and SQL Server default - will be used. - -- dsn - - String. A named DSN can be used instead of ``HOST``. - -- host_is_server - - Boolean. Only relevant if using the FreeTDS ODBC driver under - Unix/Linux. - - By default, when using the FreeTDS ODBC driver the value specified in - the ``HOST`` setting is used in a ``SERVERNAME`` ODBC connection - string component instead of being used in a ``SERVER`` component; - this means that this value should be the name of a *dataserver* - definition present in the ``freetds.conf`` FreeTDS configuration file - instead of a hostname or an IP address. - - But if this option is present and it's value is ``True``, this - special behavior is turned off. - - See http://www.freetds.org/userguide/dsnless.htm for more information. - -- unicode_results - - Boolean. If it is set to ``True``, pyodbc's *unicode_results* feature - is activated and strings returned from pyodbc are always Unicode. - Default value is ``False``. - -- extra_params - - String. Additional parameters for the ODBC connection. The format is - ``"param=value;param=value"``. - -- collation - - String. Name of the collation to use when performing text field - lookups against the database. Default is ``None``; this means no - collation specifier is added to your lookup SQL (the default - collation of your database will be used). For Chinese language you - can set it to ``"Chinese_PRC_CI_AS"``. - -- connection_timeout - - Integer. Sets the timeout in seconds for the database connection process. - Default value is ``0`` which disables the timeout. - -- connection_retries - - Integer. Sets the times to retry the database connection process. - Default value is ``5``. - -- connection_retry_backoff_time - - Integer. Sets the back off time in seconds for reries of - the database connection process. Default value is ``5``. - -- query_timeout - - Integer. Sets the timeout in seconds for the database query. - Default value is ``0`` which disables the timeout. - -### Backend-specific settings -~~~~~~~~~~~~~~~~~~~~~~~~~ - -The following project-level settings also control the behavior of the backend: - -- DATABASE_CONNECTION_POOLING - - Boolean. If it is set to ``False``, pyodbc's connection pooling feature - won't be activated. - -### Example - -Here is an example of the database settings: - -:: - - DATABASES = { - 'default': { - 'ENGINE': 'sql_server.pyodbc', - 'NAME': 'mydb', - 'USER': 'user@myserver', - 'PASSWORD': 'password', - 'HOST': 'myserver.database.windows.net', - 'PORT': '', - - 'OPTIONS': { - 'driver': 'ODBC Driver 13 for SQL Server', - }, - }, - } - - # set this to False if you want to turn off pyodbc's connection pooling - DATABASE_CONNECTION_POOLING = False - -## Limitations - -The following features are currently not supported: - -- Altering a model field from or to AutoField at migration - -## Trademarks - -This project may contain trademarks or logos for projects, products, or services. Authorized use of Microsoft -trademarks or logos is subject to and must follow -[Microsoft's Trademark & Brand Guidelines](https://www.microsoft.com/en-us/legal/intellectualproperty/trademarks/usage/general). -Use of Microsoft trademarks or logos in modified versions of this project must not cause confusion or imply Microsoft sponsorship. -Any use of third-party trademarks or logos are subject to those third-party's policies. \ No newline at end of file From 83a4e77c92962dd93ca6ceabfb913d07e4b55252 Mon Sep 17 00:00:00 2001 From: Warren Chu Date: Sat, 19 Dec 2020 14:06:41 -0800 Subject: [PATCH 6/8] added Microsoft source code license comments to top of python files --- manage.py | 3 +++ setup.py | 3 +++ sql_server/pyodbc/__init__.py | 3 +++ sql_server/pyodbc/base.py | 3 +++ sql_server/pyodbc/client.py | 3 +++ sql_server/pyodbc/compiler.py | 3 +++ sql_server/pyodbc/creation.py | 3 +++ sql_server/pyodbc/features.py | 3 +++ sql_server/pyodbc/functions.py | 3 +++ sql_server/pyodbc/introspection.py | 3 +++ sql_server/pyodbc/management/commands/install_regex_clr.py | 3 +++ sql_server/pyodbc/operations.py | 3 +++ sql_server/pyodbc/schema.py | 3 +++ testapp/models.py | 3 +++ testapp/settings.py | 3 +++ testapp/tests/test_constraints.py | 3 +++ testapp/tests/test_expressions.py | 3 +++ testapp/tests/test_fields.py | 3 +++ 18 files changed, 54 insertions(+) diff --git a/manage.py b/manage.py index 6e9e8c42..a57ed35e 100755 --- a/manage.py +++ b/manage.py @@ -1,3 +1,6 @@ +# Copyright (c) Microsoft Corporation. +# Licensed under the MIT license. + #!/usr/bin/env python import os import sys diff --git a/setup.py b/setup.py index 57f920c6..551fa884 100644 --- a/setup.py +++ b/setup.py @@ -1,3 +1,6 @@ +# Copyright (c) Microsoft Corporation. +# Licensed under the MIT license. + from setuptools import find_packages, setup CLASSIFIERS = [ diff --git a/sql_server/pyodbc/__init__.py b/sql_server/pyodbc/__init__.py index 48058e1c..90b3e85a 100644 --- a/sql_server/pyodbc/__init__.py +++ b/sql_server/pyodbc/__init__.py @@ -1 +1,4 @@ +# Copyright (c) Microsoft Corporation. +# Licensed under the MIT license. + import sql_server.pyodbc.functions # noqa diff --git a/sql_server/pyodbc/base.py b/sql_server/pyodbc/base.py index 2d6c7d59..17c27da2 100644 --- a/sql_server/pyodbc/base.py +++ b/sql_server/pyodbc/base.py @@ -1,3 +1,6 @@ +# Copyright (c) Microsoft Corporation. +# Licensed under the MIT license. + """ MS SQL Server database backend for Django. """ diff --git a/sql_server/pyodbc/client.py b/sql_server/pyodbc/client.py index 1247f406..a1acb03d 100644 --- a/sql_server/pyodbc/client.py +++ b/sql_server/pyodbc/client.py @@ -1,3 +1,6 @@ +# Copyright (c) Microsoft Corporation. +# Licensed under the MIT license. + import re import subprocess diff --git a/sql_server/pyodbc/compiler.py b/sql_server/pyodbc/compiler.py index 86fecb3e..28d1fbd2 100644 --- a/sql_server/pyodbc/compiler.py +++ b/sql_server/pyodbc/compiler.py @@ -1,3 +1,6 @@ +# Copyright (c) Microsoft Corporation. +# Licensed under the MIT license. + import types from itertools import chain diff --git a/sql_server/pyodbc/creation.py b/sql_server/pyodbc/creation.py index 61745b57..0f67daaa 100644 --- a/sql_server/pyodbc/creation.py +++ b/sql_server/pyodbc/creation.py @@ -1,3 +1,6 @@ +# Copyright (c) Microsoft Corporation. +# Licensed under the MIT license. + import binascii import os diff --git a/sql_server/pyodbc/features.py b/sql_server/pyodbc/features.py index 6563b9d9..816f9078 100644 --- a/sql_server/pyodbc/features.py +++ b/sql_server/pyodbc/features.py @@ -1,3 +1,6 @@ +# Copyright (c) Microsoft Corporation. +# Licensed under the MIT license. + from django.db.backends.base.features import BaseDatabaseFeatures from django.utils.functional import cached_property diff --git a/sql_server/pyodbc/functions.py b/sql_server/pyodbc/functions.py index 65239244..c717aa20 100644 --- a/sql_server/pyodbc/functions.py +++ b/sql_server/pyodbc/functions.py @@ -1,3 +1,6 @@ +# Copyright (c) Microsoft Corporation. +# Licensed under the MIT license. + from django import VERSION from django.db.models import BooleanField from django.db.models.functions import Cast diff --git a/sql_server/pyodbc/introspection.py b/sql_server/pyodbc/introspection.py index 4b92f9e6..3f794cbd 100644 --- a/sql_server/pyodbc/introspection.py +++ b/sql_server/pyodbc/introspection.py @@ -1,3 +1,6 @@ +# Copyright (c) Microsoft Corporation. +# Licensed under the MIT license. + import pyodbc as Database from django.db.backends.base.introspection import ( diff --git a/sql_server/pyodbc/management/commands/install_regex_clr.py b/sql_server/pyodbc/management/commands/install_regex_clr.py index 6aef0508..6cd86cfa 100644 --- a/sql_server/pyodbc/management/commands/install_regex_clr.py +++ b/sql_server/pyodbc/management/commands/install_regex_clr.py @@ -1,3 +1,6 @@ +# Copyright (c) Microsoft Corporation. +# Licensed under the MIT license. + # Add regex support in SQLServer # Code taken from django-mssql (see https://bitbucket.org/Manfre/django-mssql) diff --git a/sql_server/pyodbc/operations.py b/sql_server/pyodbc/operations.py index 6abeb1d3..2c85258b 100644 --- a/sql_server/pyodbc/operations.py +++ b/sql_server/pyodbc/operations.py @@ -1,3 +1,6 @@ +# Copyright (c) Microsoft Corporation. +# Licensed under the MIT license. + import datetime import uuid import warnings diff --git a/sql_server/pyodbc/schema.py b/sql_server/pyodbc/schema.py index 090a1fdb..e6078701 100644 --- a/sql_server/pyodbc/schema.py +++ b/sql_server/pyodbc/schema.py @@ -1,3 +1,6 @@ +# Copyright (c) Microsoft Corporation. +# Licensed under the MIT license. + import binascii import datetime diff --git a/testapp/models.py b/testapp/models.py index c87f797b..85a571d3 100644 --- a/testapp/models.py +++ b/testapp/models.py @@ -1,3 +1,6 @@ +# Copyright (c) Microsoft Corporation. +# Licensed under the MIT license. + import uuid from django.db import models diff --git a/testapp/settings.py b/testapp/settings.py index 07106562..1be4076c 100644 --- a/testapp/settings.py +++ b/testapp/settings.py @@ -1,3 +1,6 @@ +# Copyright (c) Microsoft Corporation. +# Licensed under the MIT license. + import dj_database_url DATABASES = { diff --git a/testapp/tests/test_constraints.py b/testapp/tests/test_constraints.py index 523a2c85..635fa1b1 100644 --- a/testapp/tests/test_constraints.py +++ b/testapp/tests/test_constraints.py @@ -1,3 +1,6 @@ +# Copyright (c) Microsoft Corporation. +# Licensed under the MIT license. + from django.db.utils import IntegrityError from django.test import TestCase, skipUnlessDBFeature diff --git a/testapp/tests/test_expressions.py b/testapp/tests/test_expressions.py index 90623753..e89a0def 100644 --- a/testapp/tests/test_expressions.py +++ b/testapp/tests/test_expressions.py @@ -1,3 +1,6 @@ +# Copyright (c) Microsoft Corporation. +# Licensed under the MIT license. + from unittest import skipUnless from django import VERSION diff --git a/testapp/tests/test_fields.py b/testapp/tests/test_fields.py index d4978ffb..da26132b 100644 --- a/testapp/tests/test_fields.py +++ b/testapp/tests/test_fields.py @@ -1,3 +1,6 @@ +# Copyright (c) Microsoft Corporation. +# Licensed under the MIT license. + from django.test import TestCase from ..models import UUIDModel From eea0c40adaf5ae116718c813adad04811df66aed Mon Sep 17 00:00:00 2001 From: Warren Chu Date: Sat, 19 Dec 2020 19:05:24 -0800 Subject: [PATCH 7/8] added project name to LICENSE doc --- LICENSE.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/LICENSE.txt b/LICENSE.txt index 8ddd1788..bdf74cb2 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,3 +1,5 @@ +Project Name: mssql-django + MIT License Copyright (c) Microsoft Corporation. From d53925a8410218c62294880cc862ecf609454e12 Mon Sep 17 00:00:00 2001 From: Warren Chu Date: Sat, 19 Dec 2020 19:09:43 -0800 Subject: [PATCH 8/8] updated README doc to specify security reporting instructions --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 11c5bbd7..4ffe09a2 100644 --- a/README.md +++ b/README.md @@ -242,6 +242,10 @@ This project has adopted the [Microsoft Open Source Code of Conduct](https://ope For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments. +## Security Reporting Instructions + +For security reporting instructions please refer to the SECURITY.md file in this repository. + ## Trademarks This project may contain trademarks or logos for projects, products, or services. Authorized use of Microsoft