t-sql 1.2.0__tar.gz → 1.2.1__tar.gz

{t_sql-1.2.0 → t_sql-1.2.1}/.github/workflows/test.yml

@@ -13,6 +13,21 @@ jobs:
       matrix:
         python-version: ["3.14"]
 
+    services:
+      postgres:
+        image: postgres:18
+        env:
+          POSTGRES_PASSWORD: password
+          POSTGRES_USER: postgres
+          POSTGRES_DB: postgres
+        ports:
+          - 5432:5432
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+
     steps:
     - uses: actions/checkout@v4
 
@@ -28,4 +43,6 @@ jobs:
       run: uv sync
 
     - name: Run tests
+      env:
+        DATABASE_URL: postgresql://postgres:password@localhost:5432/postgres
       run: uv run pytest -v

t_sql-1.2.1/.idea/.gitignore

@@ -0,0 +1,8 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Editor-based HTTP Client requests
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml

t_sql-1.2.1/.idea/inspectionProfiles/Project_Default.xml

@@ -0,0 +1,24 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="PyCompatibilityInspection" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="ourVersions">
+        <value>
+          <list size="3">
+            <item index="0" class="java.lang.String" itemvalue="3.11" />
+            <item index="1" class="java.lang.String" itemvalue="3.12" />
+            <item index="2" class="java.lang.String" itemvalue="3.13" />
+          </list>
+        </value>
+      </option>
+    </inspection_tool>
+    <inspection_tool class="PyUnresolvedReferencesInspection" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="ignoredIdentifiers">
+        <list>
+          <option value="base64.binascii" />
+        </list>
+      </option>
+    </inspection_tool>
+  </profile>
+</component>

t_sql-1.2.1/.idea/inspectionProfiles/profiles_settings.xml

@@ -0,0 +1,6 @@
+<component name="InspectionProjectProfileManager">
+  <settings>
+    <option name="USE_PROJECT_PROFILE" value="false" />
+    <version value="1.0" />
+  </settings>
+</component>

t_sql-1.2.1/.idea/misc.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Black">
+    <option name="sdkName" value="uv (tsql)" />
+  </component>
+  <component name="KubernetesApiPersistence">{}</component>
+  <component name="KubernetesApiProvider"><![CDATA[{
+  "isMigrated": true
+}]]></component>
+  <component name="ProjectRootManager" version="2" project-jdk-name="uv (tsql)" project-jdk-type="Python SDK" />
+</project>

t_sql-1.2.1/.idea/tsql.iml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4">
+  <component name="PyDocumentationSettings">
+    <option name="format" value="PLAIN" />
+    <option name="myDocStringFormat" value="Plain" />
+  </component>
+  <component name="TestRunnerService">
+    <option name="PROJECT_TEST_RUNNER" value="py.test" />
+  </component>
+</module>

t_sql-1.2.1/.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>

t_sql-1.2.1/.idea/workspace.xml

@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="AutoImportSettings">
+    <option name="autoReloadType" value="SELECTIVE" />
+  </component>
+  <component name="ChangeListManager">
+    <list default="true" id="059146b3-62bd-4ad4-890d-4356cf237b89" name="Changes" comment="">
+      <change beforePath="$PROJECT_DIR$/pyproject.toml" beforeDir="false" afterPath="$PROJECT_DIR$/pyproject.toml" afterDir="false" />
+    </list>
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+  </component>
+  <component name="GitHubPullRequestSearchHistory">{
+  &quot;lastFilter&quot;: {
+    &quot;state&quot;: &quot;OPEN&quot;,
+    &quot;assignee&quot;: &quot;nhumrich&quot;
+  }
+}</component>
+  <component name="GithubPullRequestsUISettings">{
+  &quot;selectedUrlAndAccountId&quot;: {
+    &quot;url&quot;: &quot;git@github.com:nhumrich/tsql.git&quot;,
+    &quot;accountId&quot;: &quot;f308fc0d-c429-47fb-8e52-74bdc95408d8&quot;
+  }
+}</component>
+  <component name="ProjectColorInfo">{
+  &quot;associatedIndex&quot;: 2
+}</component>
+  <component name="ProjectId" id="33DagtaPqCq8RWQhigWGQcgOtLh" />
+  <component name="ProjectViewState">
+    <option name="compactDirectories" value="true" />
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showLibraryContents" value="true" />
+  </component>
+  <component name="PropertiesComponent">{
+  &quot;keyToString&quot;: {
+    &quot;ModuleVcsDetector.initialDetectionPerformed&quot;: &quot;true&quot;,
+    &quot;Python tests.pytest in test_sqlalchemy_integration.py.executor&quot;: &quot;Debug&quot;,
+    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.TerminalTabsStorage.copyFrom.TerminalArrangementManager.252&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.git.unshallow&quot;: &quot;true&quot;,
+    &quot;git-widget-placeholder&quot;: &quot;main&quot;,
+    &quot;junie.onboarding.icon.badge.shown&quot;: &quot;true&quot;,
+    &quot;last_opened_file_path&quot;: &quot;/home/nhumrich/personal/tsql&quot;,
+    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
+    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
+    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
+    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
+    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
+    &quot;to.speed.mode.migration.done&quot;: &quot;true&quot;,
+    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
+  }
+}</component>
+  <component name="RunManager">
+    <configuration name="pytest in test_sqlalchemy_integration.py" type="tests" factoryName="py.test" temporary="true" nameIsGenerated="true">
+      <module name="tsql" />
+      <option name="ENV_FILES" value="" />
+      <option name="INTERPRETER_OPTIONS" value="" />
+      <option name="PARENT_ENVS" value="true" />
+      <option name="SDK_HOME" value="" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <option name="IS_MODULE_SDK" value="true" />
+      <option name="ADD_CONTENT_ROOTS" value="true" />
+      <option name="ADD_SOURCE_ROOTS" value="true" />
+      <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
+      <option name="_new_keywords" value="&quot;&quot;" />
+      <option name="_new_parameters" value="&quot;&quot;" />
+      <option name="_new_additionalArguments" value="&quot;&quot;" />
+      <option name="_new_target" value="&quot;$PROJECT_DIR$/tests/test_sqlalchemy_integration.py&quot;" />
+      <option name="_new_targetType" value="&quot;PATH&quot;" />
+      <method v="2" />
+    </configuration>
+    <recent_temporary>
+      <list>
+        <item itemvalue="Python tests.pytest in test_sqlalchemy_integration.py" />
+      </list>
+    </recent_temporary>
+  </component>
+  <component name="SharedIndexes">
+    <attachedChunks>
+      <set>
+        <option value="bundled-js-predefined-d6986cc7102b-3aa1da707db6-JavaScript-PY-252.26830.99" />
+        <option value="bundled-python-sdk-164cda30dcd9-0af03a5fa574-com.jetbrains.pycharm.pro.sharedIndexes.bundled-PY-252.26830.99" />
+      </set>
+    </attachedChunks>
+  </component>
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="059146b3-62bd-4ad4-890d-4356cf237b89" name="Changes" comment="" />
+      <created>1758854212149</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1758854212149</updated>
+    </task>
+    <servers />
+  </component>
+  <component name="TypeScriptGeneratedFilesManager">
+    <option name="version" value="3" />
+  </component>
+  <component name="Vcs.Log.Tabs.Properties">
+    <option name="TAB_STATES">
+      <map>
+        <entry key="MAIN">
+          <value>
+            <State />
+          </value>
+        </entry>
+      </map>
+    </option>
+  </component>
+  <component name="com.intellij.coverage.CoverageDataManagerImpl">
+    <SUITE FILE_PATH="coverage/tsql$pytest_in_test_sqlalchemy_integration_py.coverage" NAME="pytest in test_sqlalchemy_integration.py Coverage Results" MODIFIED="1760138305802" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
+  </component>
+</project>

{t_sql-1.2.0 → t_sql-1.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: t-sql
-Version: 1.2.0
+Version: 1.2.1
 Summary: Safe SQL. SQL queries for python t-strings (PEP 750)
 Project-URL: Homepage, https://github.com/nhumrich/tsql
 License-File: LICENSE
@@ -154,11 +154,29 @@ values = {'id': 'abc123', 'name': 'bob', 'email': 'bob@example.com'}
 tsql.insert(table, values)
 # INSERT INTO users (id, name, email) VALUES ('abc123', 'bob', 'bob@example.com')
 
+# insert with ignore_conflict
+tsql.insert(table, values, ignore_conflict=True)
+# INSERT INTO users (id, name, email) VALUES ('abc123', 'bob', 'bob@example.com') ON CONFLICT DO NOTHING RETURNING *
+
+# upsert (insert or update on conflict)
+values = {'id': 'abc123', 'name': 'joe', 'email': 'joe@example.com'}
+tsql.upsert(table, values, conflict_on='id')
+# INSERT INTO users (id, name, email) VALUES ('abc123', 'joe', 'joe@example.com')
+# ON CONFLICT (id) DO UPDATE SET name = EXCLUDED.name, email = EXCLUDED.email RETURNING *
+
+# upsert with multiple conflict columns
+tsql.upsert(table, values, conflict_on=['email', 'name'])
+# ON CONFLICT (email, name) DO UPDATE SET ...
+
 # update values on a single row
 table = 'users'
 values = {'name': 'joe', 'email': 'joe@example.com'}
 tsql.update(table, values, id='abc123')
-# UPDATE users SET name='joe', email='joe@example.com' WHERE id='abc123'
+# UPDATE users SET name='joe', email='joe@example.com' WHERE id='abc123' RETURNING *
+
+# delete a single row
+tsql.delete(table, id='abc123')
+# DELETE FROM users WHERE id = 'abc123'
 ```
 
 # Query Builder
@@ -251,6 +269,54 @@ query = (Posts.select(Posts.title, Users.username)
          .limit(20))
 ```
 
+## Write Operations
+
+The query builder supports INSERT, UPDATE, UPSERT, and DELETE operations:
+
+```python
+# INSERT
+values = {'id': 'abc123', 'username': 'john', 'email': 'john@example.com'}
+query = Users.insert(values)
+sql, params = query.render()
+# INSERT INTO users (id, username, email) VALUES (?, ?, ?) RETURNING *
+
+# INSERT with conflict handling (ignore)
+query = Users.insert(values, ignore_conflict=True)
+sql, params = query.render()
+# INSERT INTO users (id, username, email) VALUES (?, ?, ?) ON CONFLICT DO NOTHING RETURNING *
+
+# UPSERT (INSERT ... ON CONFLICT DO UPDATE)
+values = {'id': 'abc123', 'username': 'john_updated', 'email': 'john@example.com'}
+query = Users.upsert(values, conflict_on='id')
+sql, params = query.render()
+# INSERT INTO users (id, username, email) VALUES (?, ?, ?)
+# ON CONFLICT (id) DO UPDATE SET username=EXCLUDED.username, email=EXCLUDED.email RETURNING *
+
+# UPSERT with multiple conflict columns
+query = Users.upsert(values, conflict_on=['email', 'username'])
+# Can also use Column objects: conflict_on=Users.id or conflict_on=[Users.email, Users.username]
+
+# UPDATE with WHERE conditions
+query = Users.update({'email': 'newemail@example.com'}).where(Users.id == 'abc123')
+sql, params = query.render()
+# UPDATE users SET email=? WHERE users.id = ? RETURNING *
+
+# UPDATE with multiple conditions
+query = (Users.update({'email': 'newemail@example.com'})
+         .where(Users.id == 'abc123')
+         .where(Users.username == 'john'))
+
+# DELETE with WHERE conditions
+query = Users.delete().where(Users.id == 'abc123')
+sql, params = query.render()
+# DELETE FROM users WHERE users.id = ? RETURNING *
+
+# DELETE with multiple conditions
+query = Users.delete().where(Users.id > 100).where(Users.email == None)
+```
+
+All write operations return `RETURNING *` by default to retrieve the affected rows.
+
 ## Advanced Mixed Query (Query Builder + T-Strings)
 
 You can combine the query builder's structured approach with raw t-string conditions for complex logic:

{t_sql-1.2.0 → t_sql-1.2.1}/README.md

@@ -143,11 +143,29 @@ values = {'id': 'abc123', 'name': 'bob', 'email': 'bob@example.com'}
 tsql.insert(table, values)
 # INSERT INTO users (id, name, email) VALUES ('abc123', 'bob', 'bob@example.com')
 
+# insert with ignore_conflict
+tsql.insert(table, values, ignore_conflict=True)
+# INSERT INTO users (id, name, email) VALUES ('abc123', 'bob', 'bob@example.com') ON CONFLICT DO NOTHING RETURNING *
+
+# upsert (insert or update on conflict)
+values = {'id': 'abc123', 'name': 'joe', 'email': 'joe@example.com'}
+tsql.upsert(table, values, conflict_on='id')
+# INSERT INTO users (id, name, email) VALUES ('abc123', 'joe', 'joe@example.com')
+# ON CONFLICT (id) DO UPDATE SET name = EXCLUDED.name, email = EXCLUDED.email RETURNING *
+
+# upsert with multiple conflict columns
+tsql.upsert(table, values, conflict_on=['email', 'name'])
+# ON CONFLICT (email, name) DO UPDATE SET ...
+
 # update values on a single row
 table = 'users'
 values = {'name': 'joe', 'email': 'joe@example.com'}
 tsql.update(table, values, id='abc123')
-# UPDATE users SET name='joe', email='joe@example.com' WHERE id='abc123'
+# UPDATE users SET name='joe', email='joe@example.com' WHERE id='abc123' RETURNING *
+
+# delete a single row
+tsql.delete(table, id='abc123')
+# DELETE FROM users WHERE id = 'abc123'
 ```
 
 # Query Builder
@@ -240,6 +258,54 @@ query = (Posts.select(Posts.title, Users.username)
          .limit(20))
 ```
 
+## Write Operations
+
+The query builder supports INSERT, UPDATE, UPSERT, and DELETE operations:
+
+```python
+# INSERT
+values = {'id': 'abc123', 'username': 'john', 'email': 'john@example.com'}
+query = Users.insert(values)
+sql, params = query.render()
+# INSERT INTO users (id, username, email) VALUES (?, ?, ?) RETURNING *
+
+# INSERT with conflict handling (ignore)
+query = Users.insert(values, ignore_conflict=True)
+sql, params = query.render()
+# INSERT INTO users (id, username, email) VALUES (?, ?, ?) ON CONFLICT DO NOTHING RETURNING *
+
+# UPSERT (INSERT ... ON CONFLICT DO UPDATE)
+values = {'id': 'abc123', 'username': 'john_updated', 'email': 'john@example.com'}
+query = Users.upsert(values, conflict_on='id')
+sql, params = query.render()
+# INSERT INTO users (id, username, email) VALUES (?, ?, ?)
+# ON CONFLICT (id) DO UPDATE SET username=EXCLUDED.username, email=EXCLUDED.email RETURNING *
+
+# UPSERT with multiple conflict columns
+query = Users.upsert(values, conflict_on=['email', 'username'])
+# Can also use Column objects: conflict_on=Users.id or conflict_on=[Users.email, Users.username]
+
+# UPDATE with WHERE conditions
+query = Users.update({'email': 'newemail@example.com'}).where(Users.id == 'abc123')
+sql, params = query.render()
+# UPDATE users SET email=? WHERE users.id = ? RETURNING *
+
+# UPDATE with multiple conditions
+query = (Users.update({'email': 'newemail@example.com'})
+         .where(Users.id == 'abc123')
+         .where(Users.username == 'john'))
+
+# DELETE with WHERE conditions
+query = Users.delete().where(Users.id == 'abc123')
+sql, params = query.render()
+# DELETE FROM users WHERE users.id = ? RETURNING *
+
+# DELETE with multiple conditions
+query = Users.delete().where(Users.id > 100).where(Users.email == None)
+```
+
+All write operations return `RETURNING *` by default to retrieve the affected rows.
+
 ## Advanced Mixed Query (Query Builder + T-Strings)
 
 You can combine the query builder's structured approach with raw t-string conditions for complex logic:

{t_sql-1.2.0 → t_sql-1.2.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "t-sql"
-version = "1.2.0"
+version = "1.2.1"
 description = "Safe SQL. SQL queries for python t-strings (PEP 750)"
 readme = "README.md"
 requires-python = ">=3.14"

{t_sql-1.2.0 → t_sql-1.2.1}/tests/test_asyncpg_integration.py

@@ -1,4 +1,5 @@
 import asyncpg
+import os
 import pytest
 
 import tsql
@@ -6,7 +7,7 @@ import tsql.styles
 
 
 # Test configuration
-DATABASE_URL = "postgresql://postgres:password@localhost:5454/postgres"
+DATABASE_URL = os.getenv("DATABASE_URL", "postgresql://postgres:password@localhost:5454/postgres")
 
 
 @pytest.fixture

{t_sql-1.2.0 → t_sql-1.2.1}/tests/test_injection_protection_validation.py

@@ -1,11 +1,12 @@
 import asyncpg
+import os
 import pytest
 
 import tsql
 import tsql.styles
 
 # Test configuration
-DATABASE_URL = "postgresql://postgres:password@localhost:5454/postgres"
+DATABASE_URL = os.getenv("DATABASE_URL", "postgresql://postgres:password@localhost:5454/postgres")
 
 
 @pytest.fixture

{t_sql-1.2.0 → t_sql-1.2.1}/tests/test_injections_for_escaped.py

@@ -3,12 +3,13 @@ Proof-of-concept test demonstrating that tsql actually prevents SQL injection at
 against a real PostgreSQL database.
 """
 import asyncpg
+import os
 import pytest
 
 import tsql
 import tsql.styles
 
-DATABASE_URL = "postgresql://postgres:password@localhost:5454/postgres"
+DATABASE_URL = os.getenv("DATABASE_URL", "postgresql://postgres:password@localhost:5454/postgres")
 
 
 @pytest.fixture